diff --git a/.mention-bot b/.mention-bot new file mode 100644 index 00000000000..36e38ed82b9 --- /dev/null +++ b/.mention-bot @@ -0,0 +1,6 @@ +{ + // users in this list will never be mentioned by mention-bot + "userBlacklist": [ + "civodul" + ] +} diff --git a/default.nix b/default.nix index e2227b13bbb..12c3cf87618 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -let requiredVersion = "1.10"; in +let requiredVersion = import ./lib/minver.nix; in if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.nixVersion == 1 then diff --git a/doc/configuration.xml b/doc/configuration.xml new file mode 100644 index 00000000000..ce25bbfce77 --- /dev/null +++ b/doc/configuration.xml @@ -0,0 +1,109 @@ + + +<filename>~/.nixpkgs/config.nix</filename>: global configuration + +Nix packages can be configured to allow or deny certain options. + +To apply the configuration edit +~/.nixpkgs/config.nix and set it like + + +{ + allowUnfree = true; +} + + +and will allow the Nix package manager to install unfree licensed packages. + +The configuration as listed also applies to NixOS under + set. + + + + + Allow installing of packages that are distributed under + unfree license by setting allowUnfree = + true; or deny them by setting it to + false. + + Same can be achieved by setting the environment variable: + + +$ export NIXPKGS_ALLOW_UNFREE=1 + + + + + + + Whenever unfree packages are not allowed, single packages + can still be allowed by a predicate function that accepts package + as an argument and should return a boolean: + + +allowUnfreePredicate = (pkg: ...); + + + Example to allow flash player only: + + +allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "flashplayer-" pkg.name); + + + + + + + Whenever unfree packages are not allowed, packages can still + be whitelisted by their license: + + +whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ]; + + + + + + In addition to whitelisting licenses which are denied by the + allowUnfree setting, you can also explicitely + deny installation of packages which have a certain license: + + +blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ]; + + + + + + +A complete list of licenses can be found in the file +lib/licenses.nix of the nix package tree. + + + + +
Modify +packages via <literal>packageOverrides</literal> + +You can define a function called +packageOverrides in your local +~/.nixpkgs/config to overide nix packages. It +must be a function that takes pkgs as an argument and return modified +set of packages. + + +{ + packageOverrides = pkgs: rec { + foo = pkgs.foo.override { ... }; + }; +} + + + + +
+ + + diff --git a/doc/functions.xml b/doc/functions.xml index 39010f8ab14..e2bc751e140 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -88,6 +88,13 @@ in ...
<pkg>.overrideDerivation + + Do not use this function in Nixpkgs. Because it breaks + package abstraction and doesn’t provide error checking for + function arguments, it is only intended for ad-hoc customisation + (such as in ~/.nixpkgs/config.nix). + + The function overrideDerivation is usually available for all the derivations in the nixpkgs expression (pkgs). diff --git a/doc/language-support.xml b/doc/language-support.xml index 9a88ea4fa6f..f0d5dbd3e64 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -1,4 +1,3 @@ - diff --git a/doc/meta.xml b/doc/meta.xml index 98031612523..ea8a363f0fd 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -33,7 +33,7 @@ the package. The value of a meta-attribute must be a string. command-line using nix-env: -$ nix-env -qa hello --meta --json +$ nix-env -qa hello --json { "hello": { "meta": { diff --git a/doc/packageconfig.xml b/doc/packageconfig.xml deleted file mode 100644 index 4e0fcc3b6a4..00000000000 --- a/doc/packageconfig.xml +++ /dev/null @@ -1,88 +0,0 @@ - - -<filename>~/.nixpkgs/config.nix</filename>: global configuration - - - Nix packages can be configured to allow or deny certain options. - - - - To apply the configuration edit ~/.nixpkgs/config.nix - and set it like -{ - allowUnfree = true; -} - and will allow the Nix package manager to install unfree licensed packages. - - The configuration as listed also applies to NixOS under set. - - - - - - Allow installing of packages that are distributed under unfree license by setting - allowUnfree = true; - or deny them by setting it to false. - - - Same can be achieved by setting the environment variable: - $ export NIXPKGS_ALLOW_UNFREE=1 - - - - - - Whenever unfree packages are not allowed, single packages can - still be allowed by a predicate function that accepts package - as an argument and should return a boolean: - allowUnfreePredicate = (pkg: ...); - - Example to allow flash player only: - allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "flashplayer-" pkg.name); - - - - - - Whenever unfree packages are not allowed, packages can still be - whitelisted by their license: - whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ]; - - - - - - In addition to whitelisting licenses which are denied by the - allowUnfree setting, you can also explicitely - deny installation of packages which have a certain license: - blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ]; - - - - - - A complete list of licenses can be found in the file - lib/licenses.nix of the nix package tree. - - -
Modify -packages via <literal>packageOverrides</literal> - - - - You can define a function called packageOverrides - in your local ~/.nixpkgs/config to overide nix - packages. It must be a function that takes pkgs as an argument and - return modified set of packages. - - { - packageOverrides = pkgs: rec { - foo = pkgs.foo.override { ... }; - }; -} - -
- - diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml index fe331d08250..0fd1954c528 100644 --- a/doc/submitting-changes.xml +++ b/doc/submitting-changes.xml @@ -270,7 +270,7 @@ Additional information. -If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. Keep an eye on the staging evaluations here. +If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. Keep an eye on the staging evaluations here. If any fixes for staging happen to be already in master, then master can be merged into staging. diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 05d51784782..596b8a49a10 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -92,7 +92,7 @@ eikek = "Eike Kettner "; elasticdog = "Aaron Bull Schaefer "; ellis = "Ellis Whitehead "; - emery = "Emery Hemingway "; + ehmry = "Emery Hemingway "; enolan = "Echo Nolan "; epitrochoid = "Mabry Cervin "; ericbmerritt = "Eric Merritt "; @@ -182,7 +182,7 @@ malyn = "Michael Alyn Miller "; manveru = "Michael Fellinger "; marcweber = "Marc Weber "; - markWot = "Markus Wotringer ''; + in + mkOptionType { + name = "one of ${concatMapStringsSep ", " show values}"; + check = flip elem values; + merge = mergeOneOption; + }; either = t1: t2: mkOptionType { name = "${t1.name} or ${t2.name}"; diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index c6d77529dd4..6be1300e513 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -1,97 +1,142 @@ -#! /run/current-system/sw/bin/perl -w +#! /usr/bin/env nix-shell +#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 nixUnstable + +# This command uploads tarballs to tarballs.nixos.org, the +# content-addressed cache used by fetchurl as a fallback for when +# upstream tarballs disappear or change. Usage: +# +# 1) To upload a single file: +# +# $ copy-tarballs.pl --file /path/to/tarball.tar.gz +# +# 2) To upload all files obtained via calls to fetchurl in a Nix derivation: +# +# $ copy-tarballs.pl --expr '(import {}).hello' use strict; -use XML::Simple; +use warnings; use File::Basename; use File::Path; -use File::Copy 'cp'; -use IPC::Open2; +use JSON; +use Net::Amazon::S3; use Nix::Store; -my $myDir = dirname($0); +# S3 setup. +my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die; +my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die; -my $tarballsCache = $ENV{'NIX_TARBALLS_CACHE'} // "/tarballs"; +my $s3 = Net::Amazon::S3->new( + { aws_access_key_id => $aws_access_key_id, + aws_secret_access_key => $aws_secret_access_key, + retry => 1, + }); -my $xml = `nix-instantiate --eval-only --xml --strict ''`; -die "$0: evaluation failed\n" if $? != 0; +my $bucket = $s3->bucket("nixpkgs-tarballs") or die; -my $data = XMLin($xml) or die; - -mkpath($tarballsCache); -mkpath("$tarballsCache/md5"); -mkpath("$tarballsCache/sha1"); -mkpath("$tarballsCache/sha256"); - -foreach my $file (@{$data->{list}->{attrs}}) { - my $url = $file->{attr}->{url}->{string}->{value}; - my $algo = $file->{attr}->{type}->{string}->{value}; - my $hash = $file->{attr}->{hash}->{string}->{value}; - - if ($url !~ /^http:/ && $url !~ /^https:/ && $url !~ /^ftp:/ && $url !~ /^mirror:/) { - print STDERR "skipping $url (unsupported scheme)\n"; - next; - } - - $url =~ /([^\/]+)$/; - my $fn = $1; - - if (!defined $fn) { - print STDERR "skipping $url (no file name)\n"; - next; - } - - if ($fn =~ /[&?=%]/ || $fn =~ /^\./) { - print STDERR "skipping $url (bad character in file name)\n"; - next; - } - - if ($fn !~ /[a-zA-Z]/) { - print STDERR "skipping $url (no letter in file name)\n"; - next; - } - - if ($fn !~ /[0-9]/) { - print STDERR "skipping $url (no digit in file name)\n"; - next; - } - - if ($fn !~ /[-_\.]/) { - print STDERR "skipping $url (no dash/dot/underscore in file name)\n"; - next; - } - - my $dstPath = "$tarballsCache/$fn"; - - next if -e $dstPath; - - print "downloading $url to $dstPath...\n"; - - next if $ENV{DRY_RUN}; - - $ENV{QUIET} = 1; - $ENV{PRINT_PATH} = 1; - my $fh; - my $pid = open($fh, "-|", "nix-prefetch-url", "--type", $algo, $url, $hash) or die; - waitpid($pid, 0) or die; - if ($? != 0) { - print STDERR "failed to fetch $url: $?\n"; - next; - } - <$fh>; my $storePath = <$fh>; chomp $storePath; - - die unless -e $storePath; - - cp($storePath, $dstPath) or die; - - my $md5 = hashFile("md5", 0, $storePath) or die; - symlink("../$fn", "$tarballsCache/md5/$md5"); - - my $sha1 = hashFile("sha1", 0, $storePath) or die; - symlink("../$fn", "$tarballsCache/sha1/$sha1"); - - my $sha256 = hashFile("sha256", 0, $storePath) or die; - symlink("../$fn", "$tarballsCache/sha256/$sha256"); - - $sha256 = hashFile("sha256", 1, $storePath) or die; - symlink("../$fn", "$tarballsCache/sha256/$sha256"); +sub alreadyMirrored { + my ($algo, $hash) = @_; + return defined $bucket->get_key("$algo/$hash"); +} + +sub uploadFile { + my ($fn, $name) = @_; + + my $md5_16 = hashFile("md5", 0, $fn) or die; + my $sha1_16 = hashFile("sha1", 0, $fn) or die; + my $sha256_32 = hashFile("sha256", 1, $fn) or die; + my $sha256_16 = hashFile("sha256", 0, $fn) or die; + my $sha512_32 = hashFile("sha512", 1, $fn) or die; + my $sha512_16 = hashFile("sha512", 0, $fn) or die; + + my $mainKey = "sha512/$sha512_16"; + + # Upload the file as sha512/. + print STDERR "uploading $fn to $mainKey...\n"; + $bucket->add_key_filename($mainKey, $fn, { 'x-amz-meta-original-name' => $name }) + or die "failed to upload $fn to $mainKey\n"; + + # Create redirects from the other hash types. + sub redirect { + my ($name, $dest) = @_; + #print STDERR "linking $name to $dest...\n"; + $bucket->add_key($name, "", { 'x-amz-website-redirect-location' => "/" . $dest }) + or die "failed to create redirect from $name to $dest\n"; + } + redirect "md5/$md5_16", $mainKey; + redirect "sha1/$sha1_16", $mainKey; + redirect "sha256/$sha256_32", $mainKey; + redirect "sha256/$sha256_16", $mainKey; + redirect "sha512/$sha512_32", $mainKey; +} + +my $op = $ARGV[0] // ""; + +if ($op eq "--file") { + my $fn = $ARGV[1] // die "$0: --file requires a file name\n"; + if (alreadyMirrored("sha512", hashFile("sha512", 0, $fn))) { + print STDERR "$fn is already mirrored\n"; + } else { + uploadFile($fn, basename $fn); + } +} + +elsif ($op eq "--expr") { + + # Evaluate find-tarballs.nix. + my $expr = $ARGV[1] // die "$0: --expr requires a Nix expression\n"; + my $pid = open(JSON, "-|", "nix-instantiate", "--eval-only", "--json", "--strict", + "", + "--arg", "expr", $expr); + my $stdout = ; + waitpid($pid, 0); + die "$0: evaluation failed\n" if $?; + close JSON; + + my $fetches = decode_json($stdout); + + print STDERR "evaluation returned ", scalar(@{$fetches}), " tarballs\n"; + + # Check every fetchurl call discovered by find-tarballs.nix. + my $mirrored = 0; + my $have = 0; + foreach my $fetch (@{$fetches}) { + my $url = $fetch->{url}; + my $algo = $fetch->{type}; + my $hash = $fetch->{hash}; + + if ($url !~ /^http:/ && $url !~ /^https:/ && $url !~ /^ftp:/ && $url !~ /^mirror:/) { + print STDERR "skipping $url (unsupported scheme)\n"; + next; + } + + if (alreadyMirrored($algo, $hash)) { + $have++; + next; + } + + print STDERR "mirroring $url...\n"; + + next if $ENV{DRY_RUN}; + + # Download the file using nix-prefetch-url. + $ENV{QUIET} = 1; + $ENV{PRINT_PATH} = 1; + my $fh; + my $pid = open($fh, "-|", "nix-prefetch-url", "--type", $algo, $url, $hash) or die; + waitpid($pid, 0) or die; + if ($? != 0) { + print STDERR "failed to fetch $url: $?\n"; + next; + } + <$fh>; my $storePath = <$fh>; chomp $storePath; + + uploadFile($storePath, $url); + $mirrored++; + } + + print STDERR "mirrored $mirrored files, already have $have files\n"; +} + +else { + die "Syntax: $0 --file FILENAME | --expr EXPR\n"; } diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 5d0cb19aba4..2dd17d9df88 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -4,9 +4,11 @@ with import ../.. { }; with lib; +{ expr ? removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" ] }: + let - root = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" ]; + root = expr; uniqueUrls = map (x: x.file) (genericClosure { startSet = map (file: { key = file.url; inherit file; }) urls; @@ -15,7 +17,10 @@ let urls = map (drv: { url = head drv.urls; hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies; - fetchurlDependencies = filter (drv: drv.outputHash or "" != "" && drv ? urls) dependencies; + fetchurlDependencies = + filter + (drv: drv.outputHash or "" != "" && drv.outputHashMode == "flat" && drv.postFetch or "" == "" && drv ? urls) + dependencies; dependencies = map (x: x.value) (genericClosure { startSet = map keyDrv (derivationsIn' root); diff --git a/maintainers/scripts/vanity.sh b/maintainers/scripts/vanity.sh index fd8f78ac5ef..c5665ab862a 100755 --- a/maintainers/scripts/vanity.sh +++ b/maintainers/scripts/vanity.sh @@ -12,7 +12,7 @@ git_data="$(echo "$raw_git_log" | grep 'Author:' | # Also there are a few manual entries maintainers="$(cat "$(dirname "$0")/../../lib/maintainers.nix" | grep '=' | sed -re 's/\\"/''/g; - s/ *([^ =]*) *= *" *(.*[^ ]) *[<](.*)[>] *".*/\1\t\2\t\3/')" + s/[ ]*([^ =]*)[ ]*=[ ]*" *(.*[^ ]) *[<](.*)[>] *".*/\1\t\2\t\3/')" git_lines="$( ( echo "$git_data"; cat "$(dirname "$0")/vanity-manual-equalities.txt") | sort |uniq)" diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index c9b31afdfcf..cf6e4ace413 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -104,6 +104,15 @@ nginx.override { You can (still) use the html-tidy package, which got updated to a stable release from this new upstream. + + + extraDeviceOptions argument is removed + from bumblebee package. Instead there are + now two separate arguments: extraNvidiaDeviceOptions + and extraNouveauDeviceOptions for setting + extra X11 options for nvidia and nouveau drivers, respectively. + +
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index e76f15f2337..cbda3434893 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -96,6 +96,15 @@ in example = "http://127.0.0.1:3128"; }; + allProxy = lib.mkOption { + type = types.nullOr types.str; + default = cfg.proxy.default; + description = '' + This option specifies the all_proxy environment variable. + ''; + example = "http://127.0.0.1:3128"; + }; + noProxy = lib.mkOption { type = types.nullOr types.str; default = null; @@ -183,6 +192,8 @@ in rsync_proxy = cfg.proxy.rsyncProxy; } // optionalAttrs (cfg.proxy.ftpProxy != null) { ftp_proxy = cfg.proxy.ftpProxy; + } // optionalAttrs (cfg.proxy.allProxy != null) { + all_proxy = cfg.proxy.allProxy; } // optionalAttrs (cfg.proxy.noProxy != null) { no_proxy = cfg.proxy.noProxy; }; diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index e2202e1e17d..b10846ac18a 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -2,10 +2,20 @@ with lib; let + cfg = config.hardware.bumblebee; + kernel = config.boot.kernelPackages; - bumblebee = if config.hardware.bumblebee.connectDisplay - then pkgs.bumblebee_display - else pkgs.bumblebee; + + useNvidia = cfg.driver == "nvidia"; + + bumblebee = pkgs.bumblebee.override { + inherit useNvidia; + useDisplayDevice = cfg.connectDisplay; + }; + + primus = pkgs.primus.override { + inherit useNvidia; + }; in @@ -29,6 +39,7 @@ in type = types.str; description = ''Group for bumblebee socket''; }; + hardware.bumblebee.connectDisplay = mkOption { default = false; type = types.bool; @@ -40,26 +51,30 @@ in Only nvidia driver is supported so far. ''; }; + + hardware.bumblebee.driver = mkOption { + default = "nvidia"; + type = types.enum [ "nvidia" "nouveau" ]; + description = '' + Set driver used by bumblebeed. Supported are nouveau and nvidia. + ''; + }; }; config = mkIf config.hardware.bumblebee.enable { boot.blacklistedKernelModules = [ "nouveau" "nvidia" ]; boot.kernelModules = [ "bbswitch" ]; - boot.extraModulePackages = [ kernel.bbswitch kernel.nvidia_x11 ]; + boot.extraModulePackages = [ kernel.bbswitch ] ++ optional useNvidia kernel.nvidia_x11; - environment.systemPackages = [ bumblebee pkgs.primus ]; + environment.systemPackages = [ bumblebee primus ]; systemd.services.bumblebeed = { description = "Bumblebee Hybrid Graphics Switcher"; wantedBy = [ "display-manager.service" ]; path = [ kernel.bbswitch bumblebee ]; serviceConfig = { - ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${config.hardware.bumblebee.group}"; - Restart = "always"; - RestartSec = 60; - CPUSchedulingPolicy = "idle"; + ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver}"; }; - environment.LD_LIBRARY_PATH="/run/opengl-driver/lib/"; environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; }; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 2b40120641a..6ff95605d4b 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -237,6 +237,7 @@ calibre-server = 213; heapster = 214; bepasty = 215; + pumpio = 216; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -451,6 +452,7 @@ xtreemfs = 212; calibre-server = 213; bepasty = 215; + pumpio = 216; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a8cf38f1c8f..963daf721ad 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -312,6 +312,7 @@ ./services/networking/lambdabot.nix ./services/networking/mailpile.nix ./services/networking/minidlna.nix + ./services/networking/miniupnpd.nix ./services/networking/mstpd.nix ./services/networking/murmur.nix ./services/networking/namecoind.nix @@ -401,6 +402,7 @@ ./services/ttys/agetty.nix ./services/ttys/gpm.nix ./services/ttys/kmscon.nix + ./services/web-apps/pump.io.nix ./services/web-servers/apache-httpd/default.nix ./services/web-servers/fcgiwrap.nix ./services/web-servers/jboss/default.nix @@ -506,6 +508,7 @@ ./virtualisation/amazon-options.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix + ./virtualisation/rkt.nix ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix ./virtualisation/vmware-guest.nix diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index 780d5daded9..61545a5acba 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -65,7 +65,7 @@ in { type = types.str; description = '' Verbatim configuration file contents. - See http://www.rabbitmq.com/configure.htm + See http://www.rabbitmq.com/configure.html ''; }; diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index 23b6edcefd1..6427c5be681 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -10,7 +10,6 @@ enableRDW = config.networking.networkmanager.enable; tlp = pkgs.tlp.override { inherit enableRDW; - kmod = config.system.sbin.modprobe; }; # XXX: We can't use writeTextFile + readFile here because it triggers @@ -69,6 +68,8 @@ in ExecStart = "${tlp}/bin/tlp init start"; ExecStop = "${tlp}/bin/tlp init stop"; }; + + environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; tlp-sleep = { @@ -87,6 +88,8 @@ in ExecStart = "${tlp}/bin/tlp suspend"; ExecStop = "${tlp}/bin/tlp resume"; }; + + environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 4505c5ceb84..949357ab20f 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -27,6 +27,7 @@ let http_settings: self_signed_cert: false repos_path: "${cfg.stateDir}/repositories" + secret_file: "${cfg.stateDir}/config/gitlab_shell_secret" log_file: "${cfg.stateDir}/log/gitlab-shell.log" redis: bin: ${pkgs.redis}/bin/redis-cli @@ -142,7 +143,7 @@ in { config = mkIf cfg.enable { - environment.systemPackages = [ gitlab-runner pkgs.gitlab-shell ]; + environment.systemPackages = [ pkgs.git gitlab-runner pkgs.gitlab-shell ]; assertions = [ { assertion = cfg.databasePassword != ""; @@ -154,7 +155,6 @@ in { services.redis.enable = mkDefault true; # We use postgres as the main data store. services.postgresql.enable = mkDefault true; - services.postgresql.package = mkDefault pkgs.postgresql; # Use postfix to send out mails. services.postfix.enable = mkDefault true; @@ -209,6 +209,23 @@ in { }; }; + systemd.services.gitlab-git-http-server = { + after = [ "network.target" "gitlab.service" ]; + wantedBy = [ "multi-user.target" ]; + environment.HOME = "${cfg.stateDir}/home"; + path = with pkgs; [ + gitAndTools.git + openssh + ]; + serviceConfig = { + Type = "simple"; + User = "gitlab"; + Group = "gitlab"; + TimeoutSec = "300"; + ExecStart = "${pkgs.gitlab-git-http-server}/bin/gitlab-git-http-server -listenUmask 0 -listenNetwork unix -listenAddr ${cfg.stateDir}/tmp/sockets/gitlab-git-http-server.socket -authBackend http://localhost:8080 ${cfg.stateDir}/repositories"; + }; + }; + systemd.services.gitlab = { after = [ "network.target" "postgresql.service" "redis.service" ]; wantedBy = [ "multi-user.target" ]; @@ -219,6 +236,8 @@ in { environment.GITLAB_APPLICATION_LOG_PATH = "${cfg.stateDir}/log/application.log"; environment.GITLAB_SATELLITES_PATH = "${cfg.stateDir}/satellites"; environment.GITLAB_SHELL_PATH = "${pkgs.gitlab-shell}"; + environment.GITLAB_SHELL_CONFIG_PATH = "${cfg.stateDir}/shell/config.yml"; + environment.GITLAB_SHELL_SECRET_PATH = "${cfg.stateDir}/config/gitlab_shell_secret"; environment.GITLAB_REPOSITORIES_PATH = "${cfg.stateDir}/repositories"; environment.GITLAB_SHELL_HOOKS_PATH = "${cfg.stateDir}/shell/hooks"; environment.BUNDLE_GEMFILE = "${pkgs.gitlab}/share/gitlab/Gemfile"; @@ -247,7 +266,7 @@ in { rm -rf ${cfg.stateDir}/config mkdir -p ${cfg.stateDir}/config # TODO: What exactly is gitlab-shell doing with the secret? - head -c 20 /dev/urandom > ${cfg.stateDir}/config/gitlab_shell_secret + tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 20 > ${cfg.stateDir}/config/gitlab_shell_secret mkdir -p ${cfg.stateDir}/home/.ssh touch ${cfg.stateDir}/home/.ssh/authorized_keys @@ -272,6 +291,7 @@ in { fi fi + ${bundler}/bin/bundle exec rake -f ${pkgs.gitlab}/share/gitlab/Rakefile db:migrate RAILS_ENV=production # Install the shell required to push repositories ln -fs ${pkgs.writeText "config.yml" gitlabShellYml} ${cfg.stateDir}/shell/config.yml export GITLAB_SHELL_CONFIG_PATH=""${cfg.stateDir}/shell/config.yml @@ -296,5 +316,4 @@ in { }; }; - } diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 7534eb0ae6a..3e1f53e79f3 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -117,7 +117,7 @@ in services.mingetty.helpLine = mkIf cfg.showManual "\nPress for the NixOS manual."; - services.nixosManual.browser = mkDefault "${pkgs.w3m}/bin/w3m"; + services.nixosManual.browser = mkDefault "${pkgs.w3m-nox}/bin/w3m"; }; diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index eb6575887d5..7c9483911f2 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -124,7 +124,7 @@ in { assertions = [ { assertion = cfg.databasePassword != ""; - message = "databasePassword must be set"; + message = "services.redmine.databasePassword must be set"; } ]; diff --git a/nixos/modules/services/monitoring/teamviewer.nix b/nixos/modules/services/monitoring/teamviewer.nix index 533f1ea6644..dd98ecab828 100644 --- a/nixos/modules/services/monitoring/teamviewer.nix +++ b/nixos/modules/services/monitoring/teamviewer.nix @@ -14,7 +14,7 @@ in options = { - services.teamviewer.enable = mkEnableOption "teamviewer daemon"; + services.teamviewer.enable = mkEnableOption "TeamViewer daemon"; }; @@ -27,9 +27,9 @@ in systemd.services.teamviewerd = { description = "TeamViewer remote control daemon"; - wantedBy = [ "graphical.target" ]; + wantedBy = [ "multi-user.target" ]; after = [ "NetworkManager-wait-online.service" "network.target" ]; - preStart = "mkdir -pv /var/tmp/teamviewer10/{logs,config}"; + preStart = "mkdir -pv /var/lib/teamviewer /var/log/teamviewer"; serviceConfig = { Type = "forking"; diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index a50aa4d0636..76c0fd7d0ea 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -73,29 +73,28 @@ in ###### implementation config = mkIf config.services.cntlm.enable { - + systemd.services.cntlm = { + description = "CNTLM is an NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "forking"; + User = "cntlm"; + ExecStart = '' + ${pkgs.cntlm}/bin/cntlm -U cntlm \ + -c ${pkgs.writeText "cntlm_config" cfg.extraConfig} + ''; + }; + }; + services.cntlm.netbios_hostname = mkDefault config.networking.hostName; - users.extraUsers = singleton { + users.extraUsers.cntlm = { name = "cntlm"; description = "cntlm system-wide daemon"; home = "/var/empty"; }; - jobs.cntlm = - { description = "CNTLM is an NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy"; - - startOn = "started network-interfaces"; - - daemonType = "fork"; - - exec = - '' - ${pkgs.cntlm}/bin/cntlm -U cntlm \ - -c ${pkgs.writeText "cntlm_config" cfg.extraConfig} - ''; - }; - services.cntlm.extraConfig = '' # Cntlm Authentication Proxy Configuration @@ -108,8 +107,7 @@ in ${concatMapStrings (port: '' Listen ${toString port} '') cfg.port} - ''; - + ''; }; } diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 5802d8b95b3..ee06dfbbca3 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -18,7 +18,7 @@ let password=${config.services.ddclient.password} protocol=${config.services.ddclient.protocol} server=${config.services.ddclient.server} - ssl=${if config.services.ddclient.ssl then "yes" else "yes"} + ssl=${if config.services.ddclient.ssl then "yes" else "no"} wildcard=YES ${config.services.ddclient.domain} ${config.services.ddclient.extraConfig} diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 2adbb0a5c4e..5a6ca139dda 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -53,11 +53,13 @@ in default = false; description = '' Enable putting a wireless interface into infrastructure mode, - allowing other wireless devices to associate with the wireless interface and do - wireless networking. A simple access point will enable hostapd.wpa, and - hostapd.wpa_passphrase, hostapd.ssid, dhcpd on the wireless interface to - provide IP addresses to the associated stations, and nat (from the wireless - interface to an upstream interface). + allowing other wireless devices to associate with the wireless + interface and do wireless networking. A simple access point will + , + , and + , as well as DHCP on the wireless + interface to provide IP addresses to the associated stations, and + NAT (from the wireless interface to an upstream interface). ''; }; @@ -73,7 +75,10 @@ in default = "nl80211"; example = "hostapd"; type = types.string; - description = "Which driver hostapd will use. Most things will probably use the default."; + description = '' + Which driver hostapd will use. + Most applications will probably use the default. + ''; }; ssid = mkOption { @@ -87,7 +92,10 @@ in default = "b"; example = "g"; type = types.string; - description = "Operation mode (a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE 802.11g"; + description = '' + Operation mode. + (a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE 802.11g). + ''; }; channel = mkOption { @@ -97,8 +105,9 @@ in description = '' Channel number (IEEE 802.11) - Please note that some drivers do not use this value from hostapd and the - channel will need to be configured separately with iwconfig. + Please note that some drivers do not use this value from + hostapd and the channel will need to be configured + separately with iwconfig. ''; }; @@ -106,12 +115,16 @@ in default = "wheel"; example = "network"; type = types.string; - description = "members of this group can control hostapd"; + description = '' + Members of this group can control hostapd. + ''; }; wpa = mkOption { default = true; - description = "enable WPA (IEEE 802.11i/D3.0) to authenticate to the access point"; + description = '' + Enable WPA (IEEE 802.11i/D3.0) to authenticate with the access point. + ''; }; wpaPassphrase = mkOption { @@ -121,8 +134,9 @@ in description = '' WPA-PSK (pre-shared-key) passphrase. Clients will need this - passphrase to associate with this access point. Warning: This passphrase will - get put into a world-readable file in the nix store. + passphrase to associate with this access point. + Warning: This passphrase will get put into a world-readable file in + the Nix store! ''; }; @@ -134,7 +148,7 @@ in ht_capab=[HT40-][SHORT-GI-40][DSSS_CCK-40] ''; type = types.string; - description = "Extra configuration options to put in the hostapd.conf"; + description = "Extra configuration options to put in hostapd.conf."; }; }; }; diff --git a/nixos/modules/services/networking/miniupnpd.nix b/nixos/modules/services/networking/miniupnpd.nix new file mode 100644 index 00000000000..e654eb80b17 --- /dev/null +++ b/nixos/modules/services/networking/miniupnpd.nix @@ -0,0 +1,70 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.miniupnpd; + configFile = pkgs.writeText "miniupnpd.conf" '' + ext_ifname=${cfg.externalInterface} + enable_natpmp=${if cfg.natpmp then "yes" else "no"} + enable_upnp=${if cfg.upnp then "yes" else "no"} + + ${concatMapStrings (range: '' + listening_ip=${range} + '') cfg.internalIPs} + + ${cfg.appendConfig} + ''; +in +{ + options = { + services.miniupnpd = { + enable = mkEnableOption "MiniUPnP daemon"; + + externalInterface = mkOption { + type = types.str; + description = '' + Name of the external interface. + ''; + }; + + internalIPs = mkOption { + type = types.listOf types.str; + example = [ "192.168.1.0/24" ]; + description = '' + The IP address ranges to listen on. + ''; + }; + + natpmp = mkEnableOption "NAT-PMP support"; + + upnp = mkOption { + default = true; + type = types.bool; + description = '' + Whether to enable UPNP support. + ''; + }; + + appendConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Configuration lines appended to the MiniUPnP config. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.miniupnpd = { + description = "MiniUPnP daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.miniupnpd ]; + serviceConfig = { + ExecStart = "${pkgs.miniupnpd}/bin/miniupnpd -d -f ${configFile}"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 36d9f5d2f16..e85f2681125 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -300,22 +300,8 @@ in options = { services.nsd = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the NSD authoritative domain name server. - ''; - }; - - bind8Stats = mkOption { - type = types.bool; - default = false; - example = true; - description = '' - Wheter to enable BIND8 like statisics. - ''; - }; + enable = mkEnableOption "NSD authoritative DNS server"; + bind8Stats = mkEnableOption "BIND8 like statistics"; rootServer = mkOption { type = types.bool; @@ -483,13 +469,7 @@ in ratelimit = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable ratelimit capabilities. - ''; - }; + enable = mkEnableOption "ratelimit capabilities"; size = mkOption { type = types.int; @@ -548,13 +528,7 @@ in remoteControl = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Wheter to enable remote control via nsd-control(8). - ''; - }; + enable = mkEnableOption "remote control via nsd-control"; interfaces = mkOption { type = types.listOf types.str; diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix index f55b87a9614..fe3cba8f149 100644 --- a/nixos/modules/services/networking/shout.nix +++ b/nixos/modules/services/networking/shout.nix @@ -57,7 +57,7 @@ in { wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ]; after = [ "network-online.target" ]; - preStart = if isNull cfg.configFile then null + preStart = if isNull cfg.configFile then "" else '' ln -sf ${pkgs.writeText "config.js" cfg.configFile} \ ${shoutHome}/config.js diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 8778b0364f9..d6960a5df47 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -118,7 +118,7 @@ in systemd.services.strongswan = { description = "strongSwan IPSec Service"; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux + path = with pkgs; [ config.system.sbin.modprobe iproute iptables utillinux ]; # XXX Linux wants = [ "keys.target" ]; after = [ "network.target" "keys.target" ]; environment = { diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 5822fb111b8..c4dc6512a0d 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -113,21 +113,26 @@ in #include #include - ${pkgs.glibc.out}/lib/*.so mr, - ${pkgs.libevent.out}/lib/libevent*.so* mr, - ${pkgs.curl.out}/lib/libcurl*.so* mr, - ${pkgs.openssl.out}/lib/libssl*.so* mr, - ${pkgs.openssl.out}/lib/libcrypto*.so* mr, - ${pkgs.zlib.out}/lib/libz*.so* mr, - ${pkgs.libssh2.out}/lib/libssh2*.so* mr, - ${pkgs.systemd}/lib/libsystemd*.so* mr, - ${pkgs.xz.out}/lib/liblzma*.so* mr, - ${pkgs.libgcrypt.out}/lib/libgcrypt*.so* mr, + ${pkgs.glibc.out}/lib/*.so mr, + ${pkgs.libevent.out}/lib/libevent*.so* mr, + ${pkgs.curl.out}/lib/libcurl*.so* mr, + ${pkgs.openssl.out}/lib/libssl*.so* mr, + ${pkgs.openssl.out}/lib/libcrypto*.so* mr, + ${pkgs.zlib.out}/lib/libz*.so* mr, + ${pkgs.libssh2.out}/lib/libssh2*.so* mr, + ${pkgs.systemd}/lib/libsystemd*.so* mr, + ${pkgs.xz.out}/lib/liblzma*.so* mr, + ${pkgs.libgcrypt.out}/lib/libgcrypt*.so* mr, ${pkgs.libgpgerror.out}/lib/libgpg-error*.so* mr, + ${pkgs.libnghttp2.out}/lib/libnghttp2*.so* mr, + ${pkgs.c-ares.out}/lib/libcares*.so* mr, + ${pkgs.libcap.out}/lib/libcap*.so* mr, + ${pkgs.attr.out}/lib/libattr*.so* mr, @{PROC}/sys/kernel/random/uuid r, @{PROC}/sys/vm/overcommit_memory r, + ${pkgs.openssl}/etc/** r, ${pkgs.transmission}/share/transmission/** r, owner ${settingsDir}/** rw, diff --git a/nixos/modules/services/web-apps/pump.io.nix b/nixos/modules/services/web-apps/pump.io.nix new file mode 100644 index 00000000000..b7c64bc6940 --- /dev/null +++ b/nixos/modules/services/web-apps/pump.io.nix @@ -0,0 +1,364 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.pumpio; + dataDir = "/var/lib/pump.io"; + user = "pumpio"; + + configOptions = { + driver = if cfg.driver == "disk" then null else cfg.driver; + params = ({ } // + (if cfg.driver == "disk" then { + dir = dataDir; + } else { }) // + (if cfg.driver == "mongodb" || cfg.driver == "redis" then { + host = cfg.dbHost; + port = cfg.dbPort; + dbname = cfg.dbName; + dbuser = cfg.dbUser; + dbpass = cfg.dbPassword; + } else { }) // + (if cfg.driver == "memcached" then { + host = cfg.dbHost; + port = cfg.dbPort; + } else { }) // + cfg.driverParams); + + secret = cfg.secret; + + address = cfg.address; + port = cfg.port; + + noweb = false; + urlPort = cfg.urlPort; + hostname = cfg.hostname; + favicon = cfg.favicon; + + site = cfg.site; + owner = cfg.owner; + ownerURL = cfg.ownerURL; + + key = cfg.sslKey; + cert = cfg.sslCert; + bounce = false; + + spamhost = cfg.spamHost; + spamclientid = cfg.spamClientId; + spamclientsecret = cfg.spamClientSecret; + + requireEmail = cfg.requireEmail; + smtpserver = cfg.smtpHost; + smtpport = cfg.smtpPort; + smtpuser = cfg.smtpUser; + smtppass = cfg.smtpPassword; + smtpusessl = cfg.smtpUseSSL; + smtpfrom = cfg.smtpFrom; + + nologger = false; + uploaddir = "${dataDir}/uploads"; + debugClient = false; + firehose = cfg.firehose; + disableRegistration = cfg.disableRegistration; + } // + (if cfg.port < 1024 then { + serverUser = user; # have pump.io listen then drop privileges + } else { }) // + cfg.extraConfig; + +in + +{ + options = { + + services.pumpio = { + + enable = mkEnableOption "Pump.io social streams server"; + + secret = mkOption { + type = types.str; + example = "my dog has fleas"; + description = '' + A session-generating secret, server-wide password. Warning: + this is stored in cleartext in the Nix store! + ''; + }; + + site = mkOption { + type = types.str; + example = "Awesome Sauce"; + description = "Name of the server"; + }; + + owner = mkOption { + type = types.str; + default = ""; + example = "Awesome Inc."; + description = "Name of owning entity, if you want to link to it."; + }; + + ownerURL = mkOption { + type = types.str; + default = ""; + example = "https://pump.io"; + description = "URL of owning entity, if you want to link to it."; + }; + + address = mkOption { + type = types.str; + default = "localhost"; + description = '' + Web server listen address. + ''; + }; + + port = mkOption { + type = types.int; + default = 31337; + description = '' + Port to listen on. Defaults to 31337, which is suitable for + running behind a reverse proxy. For a standalone server, + use 443. + ''; + }; + + hostname = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The hostname of the server, used for generating + URLs. Defaults to "localhost" which doesn't do much for you. + ''; + }; + + urlPort = mkOption { + type = types.int; + default = 443; + description = '' + Port to use for generating URLs. This basically has to be + either 80 or 443 because the host-meta and Webfinger + protocols don't make any provision for HTTP/HTTPS servers + running on other ports. + ''; + }; + + favicon = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Local filesystem path to the favicon.ico file to use. This + will be served as "/favicon.ico" by the server. + ''; + }; + + sslKey = mkOption { + type = types.path; + example = "${dataDir}/myserver.key"; + default = ""; + description = '' + The path to the server certificate private key. The + certificate is required, but it can be self-signed. + ''; + }; + + sslCert = mkOption { + type = types.path; + example = "${dataDir}/myserver.crt"; + default = ""; + description = '' + The path to the server certificate. The certificate is + required, but it can be self-signed. + ''; + }; + + firehose = mkOption { + type = types.str; + default = "ofirehose.com"; + description = '' + Firehose host running the ofirehose software. Defaults to + "ofirehose.com". Public notices will be ping this firehose + server and from there go out to search engines and the + world. If you want to disconnect from the public web, set + this to something falsy. + ''; + }; + + disableRegistration = mkOption { + type = types.bool; + default = false; + description = '' + Disables registering new users on the site through the Web + or the API. + ''; + }; + + requireEmail = mkOption { + type = types.bool; + default = false; + description = "Require an e-mail address to register."; + }; + + extraConfig = mkOption { + default = { }; + description = '' + Extra configuration options which are serialized to json and added + to the pump.io.json config file. + ''; + }; + + driver = mkOption { + type = types.enum [ "mongodb" "disk" "lrucache" "memcached" "redis" ]; + default = "mongodb"; + description = "Type of database. Corresponds to a nodejs databank driver."; + }; + + driverParams = mkOption { + default = { }; + description = "Extra parameters for the driver."; + }; + + dbHost = mkOption { + type = types.str; + default = "localhost"; + description = "The database host to connect to."; + }; + + dbPort = mkOption { + type = types.int; + default = 27017; + description = "The port that the database is listening on."; + }; + + dbName = mkOption { + type = types.str; + default = "pumpio"; + description = "The name of the database to use."; + }; + + dbUser = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The username. Defaults to null, meaning no authentication. + ''; + }; + + dbPassword = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The password corresponding to dbUser. Warning: this is + stored in cleartext in the Nix store! + ''; + }; + + smtpHost = mkOption { + type = types.nullOr types.str; + default = null; + example = "localhost"; + description = '' + Server to use for sending transactional email. If it's not + set up, no email is sent and features like password recovery + and email notification won't work. + ''; + }; + + smtpPort = mkOption { + type = types.int; + default = 25; + description = '' + Port to connect to on SMTP server. + ''; + }; + + smtpUser = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Username to use to connect to SMTP server. Might not be + necessary for some servers. + ''; + }; + + smtpPassword = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Password to use to connect to SMTP server. Might not be + necessary for some servers. Warning: this is stored in + cleartext in the Nix store! + ''; + }; + + smtpUseSSL = mkOption { + type = types.bool; + default = false; + description = '' + Only use SSL with the SMTP server. By default, a SSL + connection is negotiated using TLS. You may need to change + the smtpPort value if you set this. + ''; + }; + + smtpFrom = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Email address to use in the "From:" header of outgoing + notifications. Defaults to 'no-reply@' plus the site + hostname. + ''; + }; + + spamHost = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Host running activityspam software to use to test updates + for spam. + ''; + }; + spamClientId = mkOption { + type = types.nullOr types.str; + default = null; + description = "OAuth pair for spam server."; + }; + spamClientSecret = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + OAuth pair for spam server. Warning: this is + stored in cleartext in the Nix store! + ''; + }; + }; + + }; + + config = mkIf cfg.enable { + systemd.services."pump.io" = + { description = "pump.io social network stream server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${pkgs.pumpio}/bin/pump -c /etc/pump.io.json"; + serviceConfig.User = if cfg.port < 1024 then "root" else user; + serviceConfig.Group = user; + }; + + environment.etc."pump.io.json" = { + mode = "0440"; + gid = config.ids.gids.pumpio; + text = builtins.toJSON configOptions; + }; + + users.extraGroups.pumpio.gid = config.ids.gids.pumpio; + users.extraUsers.pumpio = { + group = "pumpio"; + uid = config.ids.uids.pumpio; + description = "Pump.io user"; + home = dataDir; + createHome = true; + }; + }; +} diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix index a5e539bc9ba..9994de0f9b4 100644 --- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix +++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix @@ -70,7 +70,7 @@ let "proxyuserpwd" => "", /* List of trusted domains, to prevent host header poisoning ownCloud is only using these Host headers */ - 'trusted_domains' => array('${config.trustedDomain}'), + ${if config.trustedDomain != "" then "'trusted_domains' => array('${config.trustedDomain}')," else ""} /* Theme to use for ownCloud */ "theme" => "", @@ -331,7 +331,7 @@ let */ 'share_folder' => '/', - 'version' => '${pkgs.owncloud.version}', + 'version' => '${config.package.version}', 'openssl' => '${pkgs.openssl}/bin/openssl' @@ -345,16 +345,15 @@ rec { extraConfig = '' - ServerName ${config.siteName} - ServerAdmin ${config.adminAddr} - DocumentRoot ${documentRoot} + ${if config.urlPrefix != "" then "Alias ${config.urlPrefix} ${config.package}" else '' - RewriteEngine On - RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f - RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d + RewriteEngine On + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d + ''} - - ${builtins.readFile "${pkgs.owncloud}/.htaccess"} + + ${builtins.readFile "${config.package}/.htaccess"} ''; @@ -362,12 +361,29 @@ rec { { name = "OC_CONFIG_PATH"; value = "${config.dataDir}/config/"; } ]; - documentRoot = pkgs.owncloud; + documentRoot = if config.urlPrefix == "" then config.package else null; enablePHP = true; options = { + package = mkOption { + type = types.package; + default = pkgs.owncloud70; + example = literalExample "pkgs.owncloud70"; + description = '' + PostgreSQL package to use. + ''; + }; + + urlPrefix = mkOption { + default = ""; + example = "/owncloud"; + description = '' + The URL prefix under which the owncloud service appears. + ''; + }; + id = mkOption { default = "main"; description = '' @@ -552,7 +568,7 @@ rec { cp ${owncloudConfig} ${config.dataDir}/config/config.php mkdir -p ${config.dataDir}/storage mkdir -p ${config.dataDir}/apps - cp -r ${pkgs.owncloud}/apps/* ${config.dataDir}/apps/ + cp -r ${config.package}/apps/* ${config.dataDir}/apps/ chmod -R ug+rw ${config.dataDir} chmod -R o-rwx ${config.dataDir} chown -R wwwrun:wwwrun ${config.dataDir} @@ -566,7 +582,11 @@ rec { ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true fi - ${php}/bin/php ${pkgs.owncloud}/occ upgrade || true + if [ -e ${config.package}/config/ca-bundle.crt ]; then + cp -f ${config.package}/config/ca-bundle.crt ${config.dataDir}/config/ + fi + + ${php}/bin/php ${config.package}/occ upgrade >> ${config.dataDir}/upgrade.log || true chown wwwrun:wwwrun ${config.dataDir}/owncloud.log || true diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index a28c8567f9f..937b2698ce9 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -5,7 +5,7 @@ with lib; let - version = "4.3"; + version = "4.3.1"; fullversion = "${version}"; # Our bare-bones wp-config.php file using the above settings @@ -74,7 +74,7 @@ let owner = "WordPress"; repo = "WordPress"; rev = "${fullversion}"; - sha256 = "0sz5jjhjpwqis8336gyq9a77cr4sf8zahd1y4pzmpvpzn9cn503y"; + sha256 = "1rk10vcv4z9p04hfzc0wkbilrgx7m9ssyr6c3w6vw3vl1bcgqxza"; }; installPhase = '' mkdir -p $out diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index dc6aa137cbd..0f3cb5735e7 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -108,16 +108,26 @@ in kdeApps.okular kdeApps.print-manager + # Oxygen icons moved to KDE Frameworks 5.16 and later. (kdeApps.oxygen-icons or kf5.oxygen-icons5) pkgs.hicolor_icon_theme plasma5.kde-gtk-config - pkgs.orion # GTK theme, nearly identical to Breeze ] + + # Plasma 5.5 and later has a Breeze GTK theme. + # If it is not available, Orion is very similar to Breeze. + ++ lib.optional (!(lib.hasAttr "breeze-gtk" plasma5)) pkgs.orion + + # Install Breeze icons if available + ++ lib.optional (lib.hasAttr "breeze-icons" kf5) kf5.breeze-icons + + # Optional hardware support features ++ lib.optional config.hardware.bluetooth.enable plasma5.bluedevil ++ lib.optional config.networking.networkmanager.enable plasma5.plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma5.plasma-pa ++ lib.optional config.powerManagement.enable plasma5.powerdevil + ++ lib.optionals cfg.phonon.gstreamer.enable [ pkgs.phonon_backend_gstreamer @@ -135,6 +145,7 @@ in pkgs.gst_all_1.gst-plugins-bad pkgs.gst_all_1.gst-libav # for mp3 playback ] + ++ lib.optionals cfg.phonon.vlc.enable [ pkgs.phonon_qt5_backend_vlc @@ -166,6 +177,14 @@ in # Extra UDEV rules used by Solid services.udev.packages = [ pkgs.media-player-info ]; + services.xserver.displayManager.sddm = { + theme = "breeze"; + themes = [ + plasma5.plasma-workspace + (kdeApps.oxygen-icons or kf5.oxygen-icons5) + ]; + }; + security.pam.services.kde = { allowNullPassword = true; }; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix new file mode 100644 index 00000000000..4b598ca48b0 --- /dev/null +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -0,0 +1,121 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + dmcfg = config.services.xserver.displayManager; + ldmcfg = dmcfg.lightdm; + cfg = ldmcfg.greeters.gtk; + + inherit (pkgs) stdenv lightdm writeScript writeText; + + theme = cfg.theme.package; + icons = cfg.iconTheme.package; + + # The default greeter provided with this expression is the GTK greeter. + # Again, we need a few things in the environment for the greeter to run with + # fonts/icons. + wrappedGtkGreeter = stdenv.mkDerivation { + name = "lightdm-gtk-greeter"; + buildInputs = [ pkgs.makeWrapper ]; + + buildCommand = '' + # This wrapper ensures that we actually get themes + makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ + $out/greeter \ + --prefix PATH : "${pkgs.glibc.bin}/bin" \ + --set GDK_PIXBUF_MODULE_FILE "${pkgs.gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ + --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \ + --set GTK_EXE_PREFIX "${theme}" \ + --set GTK_DATA_PREFIX "${theme}" \ + --set XDG_DATA_DIRS "${theme}/share:${icons}/share" \ + --set XDG_CONFIG_HOME "${theme}/share" + + cat - > $out/lightdm-gtk-greeter.desktop << EOF + [Desktop Entry] + Name=LightDM Greeter + Comment=This runs the LightDM Greeter + Exec=$out/greeter + Type=Application + EOF + ''; + }; + + gtkGreeterConf = writeText "lightdm-gtk-greeter.conf" + '' + [greeter] + theme-name = ${cfg.theme.name} + icon-theme-name = ${cfg.iconTheme.name} + background = ${ldmcfg.background} + ''; + +in +{ + options = { + + services.xserver.displayManager.lightdm.greeters.gtk = { + + enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable lightdm-gtk-greeter as the lightdm greeter. + ''; + }; + + theme = { + + package = mkOption { + type = types.path; + default = pkgs.gnome3.gnome_themes_standard; + description = '' + The package path that contains the theme given in the name option. + ''; + }; + + name = mkOption { + type = types.str; + default = "Adwaita"; + description = '' + Name of the theme to use for the lightdm-gtk-greeter. + ''; + }; + + }; + + iconTheme = { + + package = mkOption { + type = types.path; + default = pkgs.gnome3.defaultIconTheme; + description = '' + The package path that contains the icon theme given in the name option. + ''; + }; + + name = mkOption { + type = types.str; + default = "Adwaita"; + description = '' + Name of the icon theme to use for the lightdm-gtk-greeter. + ''; + }; + + }; + + }; + + }; + + config = mkIf (ldmcfg.enable && cfg.enable) { + + services.xserver.displayManager.lightdm.greeter = mkDefault { + package = wrappedGtkGreeter; + name = "lightdm-gtk-greeter"; + }; + + environment.etc."lightdm/lightdm-gtk-greeter.conf".source = gtkGreeterConf; + + }; +} diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 48fab024356..c8ccf43029d 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -18,38 +18,6 @@ let exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} ''; - theme = pkgs.gnome3.gnome_themes_standard; - icons = pkgs.gnome3.defaultIconTheme; - - # The default greeter provided with this expression is the GTK greeter. - # Again, we need a few things in the environment for the greeter to run with - # fonts/icons. - wrappedGtkGreeter = stdenv.mkDerivation { - name = "lightdm-gtk-greeter"; - buildInputs = [ pkgs.makeWrapper ]; - - buildCommand = '' - # This wrapper ensures that we actually get themes - makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ - $out/greeter \ - --prefix PATH : "${pkgs.glibc.bin}/bin" \ - --set GDK_PIXBUF_MODULE_FILE "${pkgs.gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ - --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \ - --set GTK_EXE_PREFIX "${theme}" \ - --set GTK_DATA_PREFIX "${theme}" \ - --set XDG_DATA_DIRS "${theme}/share:${icons}/share" \ - --set XDG_CONFIG_HOME "${theme}/share" - - cat - > $out/lightdm-gtk-greeter.desktop << EOF - [Desktop Entry] - Name=LightDM Greeter - Comment=This runs the LightDM Greeter - Exec=$out/greeter - Type=Application - EOF - ''; - }; - usersConf = writeText "users.conf" '' [UserList] @@ -72,34 +40,42 @@ let ${cfg.extraSeatDefaults} ''; - gtkGreeterConf = writeText "lightdm-gtk-greeter.conf" - '' - [greeter] - theme-name = Adwaita - icon-theme-name = Adwaita - background = ${cfg.background} - ''; - in { + # Note: the order in which lightdm greeter modules are imported + # here determines the default: later modules (if enable) are + # preferred. + imports = [ + ./lightdm-greeters/gtk.nix + ]; + options = { + services.xserver.displayManager.lightdm = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable lightdm as the display manager. ''; }; - greeter = mkOption { - description = '' - The LightDM greeter to login via. The package should be a directory - containing a .desktop file matching the name in the 'name' option. - ''; - default = { - name = "lightdm-gtk-greeter"; - package = wrappedGtkGreeter; + greeter = { + package = mkOption { + type = types.path; + description = '' + The LightDM greeter to login via. The package should be a directory + containing a .desktop file matching the name in the 'name' option. + ''; + + }; + name = mkOption { + type = types.string; + description = '' + The name of a .desktop file in the directory specified + in the 'package' option. + ''; }; }; @@ -135,7 +111,6 @@ in ''; }; - environment.etc."lightdm/lightdm-gtk-greeter.conf".source = gtkGreeterConf; environment.etc."lightdm/lightdm.conf".source = lightdmConf; environment.etc."lightdm/users.conf".source = usersConf; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 16a0d1b6d96..ae947a5d2d4 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -9,6 +9,8 @@ let cfg = dmcfg.sddm; xEnv = config.systemd.services."display-manager".environment; + sddm = pkgs.sddm.override { inherit (cfg) themes; }; + xserverWrapper = pkgs.writeScript "xserver-wrapper" '' #!/bin/sh ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} @@ -22,6 +24,8 @@ let [Theme] Current=${cfg.theme} + ThemeDir=${sddm}/share/sddm/themes + FacesDir=${sddm}/share/sddm/faces [Users] MaximumUid=${toString config.ids.uids.nixbld} @@ -86,6 +90,14 @@ in ''; }; + themes = mkOption { + type = types.listOf types.package; + default = []; + description = '' + Extra packages providing themes. + ''; + }; + autoLogin = mkOption { default = {}; description = '' @@ -146,8 +158,7 @@ in services.xserver.displayManager.job = { logsXsession = true; - #execCmd = "${pkgs.sddm}/bin/sddm"; - execCmd = "exec ${pkgs.sddm}/bin/sddm"; + execCmd = "exec ${sddm}/bin/sddm"; }; security.pam.services = { diff --git a/nixos/modules/services/x11/window-managers/afterstep.nix b/nixos/modules/services/x11/window-managers/afterstep.nix index 395dabb86b5..ba88a64c702 100644 --- a/nixos/modules/services/x11/window-managers/afterstep.nix +++ b/nixos/modules/services/x11/window-managers/afterstep.nix @@ -8,10 +8,7 @@ in { ###### interface options = { - services.xserver.windowManager.afterstep.enable = mkOption { - default = false; - description = "Enable the Afterstep window manager."; - }; + services.xserver.windowManager.afterstep.enable = mkEnableOption "afterstep"; }; ###### implementation diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix index d234a432e9a..8b4e91d25aa 100644 --- a/nixos/modules/services/x11/window-managers/bspwm.nix +++ b/nixos/modules/services/x11/window-managers/bspwm.nix @@ -8,12 +8,7 @@ in { options = { - services.xserver.windowManager.bspwm.enable = mkOption { - type = types.bool; - default = false; - example = true; - description = "Enable the bspwm window manager."; - }; + services.xserver.windowManager.bspwm.enable = mkEnableOption "bspwm"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/clfswm.nix b/nixos/modules/services/x11/window-managers/clfswm.nix index 9d8eecb56c7..176c1f46127 100644 --- a/nixos/modules/services/x11/window-managers/clfswm.nix +++ b/nixos/modules/services/x11/window-managers/clfswm.nix @@ -8,14 +8,7 @@ in { options = { - services.xserver.windowManager.clfswm = { - enable = mkOption { - type = types.bool; - default = false; - example = true; - description = "Enable the clfswm tiling window manager."; - }; - }; + services.xserver.windowManager.clfswm.enable = mkEnableOption "clfswm"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/compiz.nix b/nixos/modules/services/x11/window-managers/compiz.nix index ffd71e5f91e..539a83f9906 100644 --- a/nixos/modules/services/x11/window-managers/compiz.nix +++ b/nixos/modules/services/x11/window-managers/compiz.nix @@ -15,10 +15,7 @@ in services.xserver.windowManager.compiz = { - enable = mkOption { - default = false; - description = "Enable the Compiz window manager."; - }; + enable = mkEnableOption "compiz"; renderingFlag = mkOption { default = ""; diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 31f42f5ffb9..37d3348b8a3 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -12,6 +12,7 @@ in ./bspwm.nix ./clfswm.nix ./compiz.nix + ./dwm.nix ./fluxbox.nix ./herbstluftwm.nix ./i3.nix diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix new file mode 100644 index 00000000000..a74bfce097d --- /dev/null +++ b/nixos/modules/services/x11/window-managers/dwm.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.xserver.windowManager.dwm; + +in + +{ + + ###### interface + + options = { + services.xserver.windowManager.dwm.enable = mkEnableOption "dwm"; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + services.xserver.windowManager.session = singleton + { name = "dwm"; + start = + '' + ${pkgs.dwm}/bin/dwm & + waitPID=$! + ''; + }; + + environment.systemPackages = [ pkgs.dwm ]; + + }; + +} diff --git a/nixos/modules/services/x11/window-managers/fluxbox.nix b/nixos/modules/services/x11/window-managers/fluxbox.nix index 4748ce99ccf..b409335702a 100644 --- a/nixos/modules/services/x11/window-managers/fluxbox.nix +++ b/nixos/modules/services/x11/window-managers/fluxbox.nix @@ -8,10 +8,7 @@ in { ###### interface options = { - services.xserver.windowManager.fluxbox.enable = mkOption { - default = false; - description = "Enable the Fluxbox window manager."; - }; + services.xserver.windowManager.fluxbox.enable = mkEnableOption "fluxbox"; }; ###### implementation diff --git a/nixos/modules/services/x11/window-managers/herbstluftwm.nix b/nixos/modules/services/x11/window-managers/herbstluftwm.nix index 6cda910b6b3..829935fa432 100644 --- a/nixos/modules/services/x11/window-managers/herbstluftwm.nix +++ b/nixos/modules/services/x11/window-managers/herbstluftwm.nix @@ -8,12 +8,7 @@ in { options = { - services.xserver.windowManager.herbstluftwm.enable = mkOption { - type = types.bool; - default = false; - example = true; - description = "Enable the herbstluftwm window manager."; - }; + services.xserver.windowManager.herbstluftwm.enable = mkEnableOption "herbstluftwm"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix index e85c3bce591..0d5816e363d 100644 --- a/nixos/modules/services/x11/window-managers/i3.nix +++ b/nixos/modules/services/x11/window-managers/i3.nix @@ -9,11 +9,7 @@ in { options = { services.xserver.windowManager.i3 = { - enable = mkOption { - default = false; - example = true; - description = "Enable the i3 tiling window manager."; - }; + enable = mkEnableOption "i3"; configFile = mkOption { default = null; diff --git a/nixos/modules/services/x11/window-managers/icewm.nix b/nixos/modules/services/x11/window-managers/icewm.nix index 9a3e8022189..f4ae9222df6 100644 --- a/nixos/modules/services/x11/window-managers/icewm.nix +++ b/nixos/modules/services/x11/window-managers/icewm.nix @@ -8,7 +8,7 @@ in { ###### interface options = { - services.xserver.windowManager.icewm.enable = mkEnableOption "oroborus"; + services.xserver.windowManager.icewm.enable = mkEnableOption "icewm"; }; ###### implementation diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix index d13cbcfe40e..3e5229be634 100644 --- a/nixos/modules/services/x11/window-managers/metacity.nix +++ b/nixos/modules/services/x11/window-managers/metacity.nix @@ -12,13 +12,7 @@ in { options = { - - services.xserver.windowManager.metacity.enable = mkOption { - default = false; - example = true; - description = "Enable the metacity window manager."; - }; - + services.xserver.windowManager.metacity.enable = mkEnableOption "metacity"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/notion.nix b/nixos/modules/services/x11/window-managers/notion.nix index 1bfc2a86e96..4ece0d241c9 100644 --- a/nixos/modules/services/x11/window-managers/notion.nix +++ b/nixos/modules/services/x11/window-managers/notion.nix @@ -8,13 +8,7 @@ in { options = { - services.xserver.windowManager.notion = { - enable = mkOption { - default = false; - example = true; - description = "Enable the notion tiling window manager."; - }; - }; + services.xserver.windowManager.notion.enable = mkEnableOption "notion"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/openbox.nix b/nixos/modules/services/x11/window-managers/openbox.nix index 8fc759dda68..091b533b28b 100644 --- a/nixos/modules/services/x11/window-managers/openbox.nix +++ b/nixos/modules/services/x11/window-managers/openbox.nix @@ -1,5 +1,6 @@ {lib, pkgs, config, ...}: +with lib; let inherit (lib) mkOption mkIf; cfg = config.services.xserver.windowManager.openbox; @@ -7,13 +8,7 @@ in { options = { - services.xserver.windowManager.openbox = { - enable = mkOption { - default = false; - example = true; - description = "Enable the Openbox window manager."; - }; - }; + services.xserver.windowManager.openbox.enable = mkEnableOption "oroborus"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/ratpoison.nix b/nixos/modules/services/x11/window-managers/ratpoison.nix index c203c35cd1b..0d58481d457 100644 --- a/nixos/modules/services/x11/window-managers/ratpoison.nix +++ b/nixos/modules/services/x11/window-managers/ratpoison.nix @@ -8,10 +8,7 @@ in { ###### interface options = { - services.xserver.windowManager.ratpoison.enable = mkOption { - default = false; - description = "Enable the Ratpoison window manager."; - }; + services.xserver.windowManager.ratpoison.enable = mkEnableOption "ratpoison"; }; ###### implementation diff --git a/nixos/modules/services/x11/window-managers/sawfish.nix b/nixos/modules/services/x11/window-managers/sawfish.nix index 74a11926020..b988b5e1829 100644 --- a/nixos/modules/services/x11/window-managers/sawfish.nix +++ b/nixos/modules/services/x11/window-managers/sawfish.nix @@ -8,10 +8,7 @@ in { ###### interface options = { - services.xserver.windowManager.sawfish.enable = mkOption { - default = false; - description = "Enable the Sawfish window manager."; - }; + services.xserver.windowManager.sawfish.enable = mkEnableOption "sawfish"; }; ###### implementation diff --git a/nixos/modules/services/x11/window-managers/spectrwm.nix b/nixos/modules/services/x11/window-managers/spectrwm.nix index 5db6b41ba8f..a1dc298d242 100644 --- a/nixos/modules/services/x11/window-managers/spectrwm.nix +++ b/nixos/modules/services/x11/window-managers/spectrwm.nix @@ -9,13 +9,7 @@ in { options = { - services.xserver.windowManager.spectrwm = { - enable = mkOption { - default = false; - example = true; - description = "Enable the spectrwm window manager."; - }; - }; + services.xserver.windowManager.spectrwm.enable = mkEnableOption "spectrwm"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/stumpwm.nix b/nixos/modules/services/x11/window-managers/stumpwm.nix index eb7b8665f23..3d3f2e0028c 100644 --- a/nixos/modules/services/x11/window-managers/stumpwm.nix +++ b/nixos/modules/services/x11/window-managers/stumpwm.nix @@ -8,14 +8,7 @@ in { options = { - services.xserver.windowManager.stumpwm = { - enable = mkOption { - type = types.bool; - default = false; - example = true; - description = "Enable the stumpwm tiling window manager."; - }; - }; + services.xserver.windowManager.stumpwm.enable = mkEnableOption "stumpwm"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/twm.nix b/nixos/modules/services/x11/window-managers/twm.nix index 684b34c2f24..fc09901aae3 100644 --- a/nixos/modules/services/x11/window-managers/twm.nix +++ b/nixos/modules/services/x11/window-managers/twm.nix @@ -13,12 +13,7 @@ in ###### interface options = { - - services.xserver.windowManager.twm.enable = mkOption { - default = false; - description = "Enable the twm window manager."; - }; - + services.xserver.windowManager.twm.enable = mkEnableOption "twm"; }; diff --git a/nixos/modules/services/x11/window-managers/windowmaker.nix b/nixos/modules/services/x11/window-managers/windowmaker.nix index 27cedb7da0c..b6272375805 100644 --- a/nixos/modules/services/x11/window-managers/windowmaker.nix +++ b/nixos/modules/services/x11/window-managers/windowmaker.nix @@ -8,10 +8,7 @@ in { ###### interface options = { - services.xserver.windowManager.windowmaker.enable = mkOption { - default = false; - description = "Enable the Windowmaker window manager."; - }; + services.xserver.windowManager.windowmaker.enable = mkEnableOption "windowmaker"; }; ###### implementation diff --git a/nixos/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix index e6f534a1be6..30c8df78224 100644 --- a/nixos/modules/services/x11/window-managers/wmii.nix +++ b/nixos/modules/services/x11/window-managers/wmii.nix @@ -1,5 +1,6 @@ -{ config, lib, pkgs, options, modulesPath }: +{ config, lib, pkgs, options, modulesPath, ... }: +with lib; let inherit (lib) mkOption mkIf singleton; cfg = config.services.xserver.windowManager.wmii; @@ -7,11 +8,7 @@ let in { options = { - services.xserver.windowManager.wmii.enable = mkOption { - default = false; - example = true; - description = "Enable the wmii window manager."; - }; + services.xserver.windowManager.wmii.enable = mkEnableOption "wmii"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 288800d514d..6af88d4f645 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -1,5 +1,6 @@ {pkgs, lib, config, ...}: +with lib; let inherit (lib) mkOption mkIf optionals literalExample; cfg = config.services.xserver.windowManager.xmonad; @@ -13,12 +14,7 @@ in { options = { services.xserver.windowManager.xmonad = { - enable = mkOption { - default = false; - example = true; - description = "Enable the xmonad window manager."; - }; - + enable = mkEnableOption "xmonad"; haskellPackages = mkOption { default = pkgs.haskellPackages; defaultText = "pkgs.haskellPackages"; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 5f09e937537..87dbbd7cd51 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -470,7 +470,7 @@ in ] ++ flip concatMap cfg.mirroredBoots (args: [ { assertion = args.devices != [ ]; - message = "A boot path cannot have an empty devices string in ${arg.path}"; + message = "A boot path cannot have an empty devices string in ${args.path}"; } { assertion = hasPrefix "/" args.path; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index d145baeebe9..826368e711a 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -148,6 +148,12 @@ let # Misc. "systemd-sysctl.service" + "dbus-org.freedesktop.timedate1.service" + "dbus-org.freedesktop.locale1.service" + "dbus-org.freedesktop.hostname1.service" + "systemd-timedated.service" + "systemd-localed.service" + "systemd-hostnamed.service" ] ++ cfg.additionalUpstreamSystemUnits; diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index 5969da7062b..e36e9f85f1e 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -56,6 +56,8 @@ in # it has a restart trigger. systemd.services."systemd-vconsole-setup" = { wantedBy = [ "multi-user.target" ]; + before = [ "display-manager.service" ]; + after = [ "systemd-udev-settle.service" ]; restartTriggers = [ vconsoleConf ]; }; diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix new file mode 100644 index 00000000000..e657cc51939 --- /dev/null +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -0,0 +1,170 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.virtualisation.azure.agent; + + waagent = with pkgs; stdenv.mkDerivation rec { + name = "waagent-2.0"; + src = pkgs.fetchgit { + url = https://github.com/Phreedom/WALinuxAgent.git; + rev = "9dba81c7b1239c7971ec96e405e403c7cd224e6b"; + sha256 = "0khxk3ns3z37v26f2qj6m3m698a0vqpc9bxg5p7fyr3xza5gzwhs"; + }; + buildInputs = [ makeWrapper python pythonPackages.wrapPython ]; + runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh + nettools # for hostname + procps # for pidof + shadow # for useradd, usermod + utillinux # for (u)mount, fdisk, sfdisk, mkswap + parted + ]; + pythonPath = [ pythonPackages.pyasn1 ]; + + configurePhase = false; + buildPhase = false; + + installPhase = '' + substituteInPlace config/99-azure-product-uuid.rules \ + --replace /bin/chmod "${coreutils}/bin/chmod" + mkdir -p $out/lib/udev/rules.d + cp config/*.rules $out/lib/udev/rules.d + + mkdir -p $out/bin + cp waagent $out/bin/ + chmod +x $out/bin/waagent + + wrapProgram "$out/bin/waagent" \ + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix PATH : "${makeSearchPath "bin" runtimeDeps}" + ''; + }; + + provisionedHook = pkgs.writeScript "provisioned-hook" '' + #!${pkgs.stdenv.shell} + ${config.systemd.package}/bin/systemctl start provisioned.target + ''; + +in + +{ + + ###### interface + + options.virtualisation.azure.agent.enable = mkOption { + default = false; + description = "Whether to enable the Windows Azure Linux Agent."; + }; + + ###### implementation + + config = mkIf cfg.enable { + assertions = [ { + assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64; + message = "Azure not currently supported on ${pkgs.stdenv.system}"; + } { + assertion = config.networking.networkmanager.enable == false; + message = "Windows Azure Linux Agent is not compatible with NetworkManager"; + } ]; + + boot.initrd.kernelModules = [ "ata_piix" ]; + networking.firewall.allowedUDPPorts = [ 68 ]; + + + environment.etc."waagent.conf".text = '' + # + # Windows Azure Linux Agent Configuration + # + + Role.StateConsumer=${provisionedHook} + + # Enable instance creation + Provisioning.Enabled=y + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=n + + # Generate fresh host key pair. + Provisioning.RegenerateSshHostKeyPair=y + + # Supported values are "rsa", "dsa" and "ecdsa". + Provisioning.SshHostKeyPairType=ed25519 + + # Monitor host name changes and publish changes via DHCP requests. + Provisioning.MonitorHostName=y + + # Decode CustomData from Base64. + Provisioning.DecodeCustomData=n + + # Execute CustomData after provisioning. + Provisioning.ExecuteCustomData=n + + # Format if unformatted. If 'n', resource disk will not be mounted. + ResourceDisk.Format=y + + # File system on the resource disk + # Typically ext3 or ext4. FreeBSD images should use 'ufs2' here. + ResourceDisk.Filesystem=ext4 + + # Mount point for the resource disk + ResourceDisk.MountPoint=/mnt/resource + + # Respond to load balancer probes if requested by Windows Azure. + LBProbeResponder=y + + # Enable logging to serial console (y|n) + # When stdout is not enough... + # 'y' if not set + Logs.Console=y + + # Enable verbose logging (y|n) + Logs.Verbose=n + + # Root device timeout in seconds. + OS.RootDeviceScsiTimeout=300 + ''; + + services.udev.packages = [ waagent ]; + + networking.dhcpcd.persistent = true; + + services.logrotate = { + enable = true; + config = '' + /var/log/waagent.log { + compress + monthly + rotate 6 + notifempty + missingok + } + ''; + }; + + systemd.targets.provisioned = { + description = "Services Requiring Azure VM provisioning to have finished"; + wantedBy = [ "sshd.service" ]; + before = [ "sshd.service" ]; + }; + + + systemd.services.waagent = { + wantedBy = [ "sshd.service" ]; + before = [ "sshd.service" ]; + after = [ "ip-up.target" ]; + wants = [ "ip-up.target" ]; + + path = [ pkgs.e2fsprogs ]; + description = "Windows Azure Agent Service"; + unitConfig.ConditionPathExists = "/etc/waagent.conf"; + serviceConfig = { + ExecStart = "${waagent}/bin/waagent -daemon"; + Type = "simple"; + }; + }; + + }; + +} diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index 47022c6887c..eedf115ee15 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -4,6 +4,9 @@ with lib; { imports = [ ../profiles/headless.nix ]; + require = [ ./azure-agent.nix ]; + virtualisation.azure.agent.enable = true; + boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ]; boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ]; diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 1013396c049..024be4a5116 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -98,8 +98,8 @@ in systemd.services.fetch-ssh-keys = { description = "Fetch host keys and authorized_keys for root user"; - wantedBy = [ "sshd.service" ]; - before = [ "sshd.service" ]; + wantedBy = [ "sshd.service" "waagent.service" ]; + before = [ "sshd.service" "waagent.service" ]; after = [ "local-fs.target" ]; path = [ pkgs.coreutils ]; @@ -108,14 +108,14 @@ in eval "$(base64 --decode /metadata/CustomData.bin)" if ! [ -z "$ssh_host_ecdsa_key" ]; then echo "downloaded ssh_host_ecdsa_key" - echo "$ssh_host_ecdsa_key" > /etc/ssh/ssh_host_ecdsa_key - chmod 600 /etc/ssh/ssh_host_ecdsa_key + echo "$ssh_host_ecdsa_key" > /etc/ssh/ssh_host_ed25519_key + chmod 600 /etc/ssh/ssh_host_ed25519_key fi if ! [ -z "$ssh_host_ecdsa_key_pub" ]; then echo "downloaded ssh_host_ecdsa_key_pub" - echo "$ssh_host_ecdsa_key_pub" > /etc/ssh/ssh_host_ecdsa_key.pub - chmod 644 /etc/ssh/ssh_host_ecdsa_key.pub + echo "$ssh_host_ecdsa_key_pub" > /etc/ssh/ssh_host_ed25519_key.pub + chmod 644 /etc/ssh/ssh_host_ed25519_key.pub fi if ! [ -z "$ssh_root_auth_key" ]; then diff --git a/nixos/modules/virtualisation/nova-image.nix b/nixos/modules/virtualisation/nova-image.nix index 44c83aee273..13e36e7888b 100644 --- a/nixos/modules/virtualisation/nova-image.nix +++ b/nixos/modules/virtualisation/nova-image.nix @@ -21,7 +21,6 @@ with lib; imports = [ ../profiles/qemu-guest.nix ../profiles/headless.nix - ./ec2-data.nix ]; fileSystems."/".device = "/dev/disk/by-label/nixos"; diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix new file mode 100644 index 00000000000..7b4d46e0749 --- /dev/null +++ b/nixos/modules/virtualisation/rkt.nix @@ -0,0 +1,62 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.virtualisation.rkt; +in +{ + options.virtualisation.rkt = { + enable = mkEnableOption "rkt metadata service"; + + gc = { + automatic = mkOption { + default = true; + type = types.bool; + description = "Automatically run the garbage collector at a specific time."; + }; + + dates = mkOption { + default = "03:15"; + type = types.str; + description = '' + Specification (in the format described by + systemd.time + 5) of the time at + which the garbage collector will run. + ''; + }; + + options = mkOption { + default = "--grace-period=24h"; + type = types.str; + description = '' + Options given to rkt gc when the + garbage collector is run automatically. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.rkt ]; + + systemd.services.rkt = { + description = "rkt metadata service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${pkgs.rkt}/bin/rkt metadata-service"; + }; + }; + + systemd.services.rkt-gc = { + description = "rkt garbage collection"; + startAt = optionalString cfg.gc.automatic cfg.gc.dates; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.rkt}/bin/rkt gc ${cfg.gc.options}"; + }; + }; + }; +} diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 4dc221dba68..9a2a77b3155 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -83,6 +83,7 @@ in rec { (all nixos.tests.openssh) (all nixos.tests.printing) (all nixos.tests.proxy) + (all nixos.tests.sddm) (all nixos.tests.simple) (all nixos.tests.udisks2) (all nixos.tests.xfce) diff --git a/nixos/release.nix b/nixos/release.nix index f0df3fe3e1e..b5ac97b3b94 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -283,9 +283,11 @@ in rec { tests.peerflix = callTest tests/peerflix.nix {}; tests.printing = callTest tests/printing.nix {}; tests.proxy = callTest tests/proxy.nix {}; + tests.pumpio = callTest tests/pump.io.nix {}; tests.quake3 = callTest tests/quake3.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; tests.sddm = callTest tests/sddm.nix {}; + tests.sddm-kde5 = callTest tests/sddm-kde5.nix {}; tests.simple = callTest tests/simple.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 213dd4ca43b..1d1e12d0ee3 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -26,8 +26,8 @@ import ./make-test.nix ( diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index 2cae63fdda4..f61c82b916a 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -25,7 +25,7 @@ in import ./make-test.nix ({ pkgs, ...} : { name = "cjdns"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ emery ]; + maintainers = [ ehmry ]; }; nodes = rec @@ -122,4 +122,4 @@ import ./make-test.nix ({ pkgs, ...} : { $bob->succeed("curl --fail -g http://[$aliceIp6]"); ''; -}) \ No newline at end of file +}) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index b2e1abc26ee..c59b97a66e4 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -171,7 +171,7 @@ let ]; virtualisation.diskSize = 8 * 1024; - virtualisation.memorySize = 768; + virtualisation.memorySize = 1024; virtualisation.writableStore = true; # Use a small /dev/vdb as the root disk for the diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index ecec89226d6..6297452df95 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -80,6 +80,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; # Test whether systemd-udevd automatically loads modules for our hardware. + $machine->succeed("systemctl start systemd-udev-settle.service"); subtest "udev-auto-load", sub { $machine->waitForUnit('systemd-udev-settle.service'); $machine->succeed('lsmod | grep psmouse'); diff --git a/nixos/tests/pump.io.nix b/nixos/tests/pump.io.nix new file mode 100644 index 00000000000..89fa23c3336 --- /dev/null +++ b/nixos/tests/pump.io.nix @@ -0,0 +1,94 @@ +# This test runs pump.io with mongodb, listing on port 443. + +import ./make-test.nix ({ pkgs, ...} : let + snakeOilKey = '' + -----BEGIN PRIVATE KEY----- + MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCqVemio78R41Tz + MnR2zFD/wFT0iScOpFkuytNmuPf28FLaa9wSBWmuAGbEi7wBIfw8/bUqFBTQp2G1 + m1cmcCKxhmvvOkGs89eM131s1lW/bXU3zYso4e7724kHwU65jRlQs6cFWIlmW7V5 + 3HQobP05dy+zPpujPPSlOQ0qYViR1s+RgZI8r0wS2ZDsliNtQwBLJSIvX6XVnXLo + F/HmF4/ySJ9pL2AxQXCwZE8SfCzHpArs9COIqTaAuwB79kxWSFQJewmab74BXiM6 + 9FMCtHON24Pl7OR9sRJHH8rMEzUumppmUeCNEzABjzQQ7svR18cmbzRWetp0tT9Y + 7rj6URHHAgMBAAECggEAGmbCldDnlrAzxJY3cwpsK5f2EwkHIr/aiuQpLCzTUlUh + onVBYRGxtaSeSSyXcV2BKTrxz5nZOBYZkPqI4Y5T8kwxgpz2/QW2jUABUtNN6yPe + HU4gma+bSTJX5PnTZ/M0z0tpQezdLx5b3I2M+48ZGMUegZvcp8qU6N8U6VK5VbFD + DMTGL4b+Kc9HScRkCJjU3FfQcqf9Ml5w9jzHSeHImYEDrG0nX8N8EImRCBXbgxCl + 5XT1h6LFUGdr+N6n2w56+6l8OZZVmwj1NdF6NJybUQl4Y7b0niA+5czzjRt/YUjZ + HW0fXmx3XlbYGWYdMdS+VaIW6pkUpm8kZkqjngqLwQKBgQDfhbFQmg9lsJQ8/dQZ + WzRNsozHKWkQiZbW5sXBWygJbAB3Hc8gvQkuZe9TVyF99cznRj6ro6pGZjP0rTdY + 3ACTL+ygRArcIR6VsJCIr6nPvBLpOoNb8TQeKPmHC2gnSP9zaT/K2lldYISKNaYQ + 0seB2gvZhIgMgWtZtmb3jdgl9wKBgQDDFdknXgvFgB+y96//9wTu2WWuE5yQ5yB7 + utAcHNO9rx5X1tJqxymYh+iE8HUN25By+96SpNMQFI+0wNGVB00YWNBKtyepimWN + EUCojTy+MIXIjrLcvviEePsI4TPWYf8XtZeiYtcczYrt/wPQUYaDb8LBRfpIfmhr + rCGW93s+sQKBgEDOKTeeQyKPjJsWWL01RTfVsZ04s155FcOeyu0heb0plAT1Ho12 + YUgTg8zc8Tfs4QiYxCjNXdvlW+Dvq6FWv8/s0CUzNRbXf1+U/oKys4AoHi+CqH0q + tJqd9KKjuwHQ10dl13n/znMVPbg4j7pG8lMCnfblxvAhQbeT+8yAUo/HAoGBAL3t + /n4KXNGK3NHDvXEp0H6t3wWsiEi3DPQJO+Wy1x8caCFCv5c/kaqz3tfWt0+njSm1 + N8tzdx13tzVWaHV8Jz3l8dxcFtxEJnxB6L5wy0urOAS7kT3DG3b1xgmuH2a//7fY + jumE60NahcER/2eIh7pdS7IZbAO6NfVmH0m4Zh/xAoGAbquh60sAfLC/1O2/4Xom + PHS7z2+TNpwu4ou3nspxfigNQcTWzzzTVFLnaTPg+HKbLRXSWysjssmmj5u3lCyc + S2M9xuhApa9CrN/udz4gEojRVsTla/gyLifIZ3CtTn2QEQiIJEMxM+59KAlkgUBo + 9BeZ03xTaEZfhVZ9bEN30Ak= + -----END PRIVATE KEY----- + ''; + + snakeOilCert = '' + -----BEGIN CERTIFICATE----- + MIICvjCCAaagAwIBAgIJANhA6+PPhomZMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV + BAMMDGIwOTM0YWMwYWZkNTAeFw0xNTExMzAxNzQ3MzVaFw0yNTExMjcxNzQ3MzVa + MBcxFTATBgNVBAMMDGIwOTM0YWMwYWZkNTCCASIwDQYJKoZIhvcNAQEBBQADggEP + ADCCAQoCggEBAKpV6aKjvxHjVPMydHbMUP/AVPSJJw6kWS7K02a49/bwUtpr3BIF + aa4AZsSLvAEh/Dz9tSoUFNCnYbWbVyZwIrGGa+86Qazz14zXfWzWVb9tdTfNiyjh + 7vvbiQfBTrmNGVCzpwVYiWZbtXncdChs/Tl3L7M+m6M89KU5DSphWJHWz5GBkjyv + TBLZkOyWI21DAEslIi9fpdWdcugX8eYXj/JIn2kvYDFBcLBkTxJ8LMekCuz0I4ip + NoC7AHv2TFZIVAl7CZpvvgFeIzr0UwK0c43bg+Xs5H2xEkcfyswTNS6ammZR4I0T + MAGPNBDuy9HXxyZvNFZ62nS1P1juuPpREccCAwEAAaMNMAswCQYDVR0TBAIwADAN + BgkqhkiG9w0BAQsFAAOCAQEAd2w9rxi6qF9WV8L3rHnTE7uu0ldtdgJlCASx6ouj + TleOnjfEg+kH8r8UbmRV5vsTDn1Qp5JGDYxfytRUQwLb1zTLde0xotx37E3LY8Wr + sD6Al4t8sHywB/hc5dy29TgG0iyG8LKZrkwytLvDZ814W3OwpN2rpEz6pdizdHNn + jsoDEngZiDHvLjIyE0cDkFXkeYMGXOnBUeOcu4nfu4C5eKs3nXGGAcNDbDRIuLoE + BZExUBY+YSs6JBvh5tvRqLVW0Dz0akEcjb/jhwS2LmDip8Pdoxx4Q1jPKEu38zrr + Vd5WD2HJhLb9u0UxVp9vfWIUDgydopV5ZmWCQ5YvNepb1w== + -----END CERTIFICATE----- + ''; + + makePump = { opts ? { } }: + { + enable = true; + sslCert = pkgs.writeText "snakeoil.cert" snakeOilCert; + sslKey = pkgs.writeText "snakeoil.pem" snakeOilKey; + secret = "test"; + site = "test"; + } // opts; + +in { + name = "pumpio"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ rvl ]; + }; + + nodes = { + one = + { config, pkgs, ... }: + { + services = { + pumpio = makePump { opts = { + port = 443; + }; }; + mongodb.enable = true; + mongodb.extraConfig = '' + nojournal = true + ''; + }; + systemd.services.mongodb.unitConfig.Before = "pump.io.service"; + systemd.services.mongodb.unitConfig.RequiredBy = "pump.io.service"; + }; + }; + + testScript = '' + startAll; + + $one->waitForUnit("pump.io.service"); + $one->waitUntilSucceeds("curl -k https://localhost"); + ''; +}) diff --git a/nixos/tests/sddm-kde5.nix b/nixos/tests/sddm-kde5.nix new file mode 100644 index 00000000000..476cb732e25 --- /dev/null +++ b/nixos/tests/sddm-kde5.nix @@ -0,0 +1,29 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "sddm"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ttuegel ]; + }; + + machine = { lib, ... }: { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.displayManager.sddm = { + enable = true; + autoLogin = { + enable = true; + user = "alice"; + }; + }; + services.xserver.windowManager.default = "icewm"; + services.xserver.windowManager.icewm.enable = true; + services.xserver.desktopManager.default = "none"; + services.xserver.desktopManager.kde5.enable = true; + }; + + enableOCR = true; + + testScript = { nodes, ... }: '' + startAll; + $machine->waitForWindow("^IceWM "); + ''; +}) diff --git a/pkgs/applications/altcoins/namecoind.nix b/pkgs/applications/altcoins/namecoind.nix index baf6ba0dbc0..5b393330147 100644 --- a/pkgs/applications/altcoins/namecoind.nix +++ b/pkgs/applications/altcoins/namecoind.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, db4, boost, openssl, miniupnpc, unzip }: +{ stdenv, fetchzip, db4, boost, openssl, miniupnpc, unzip }: with stdenv.lib; stdenv.mkDerivation rec { version = "0.3.80"; name = "namecoind-${version}"; - src = fetchurl { + src = fetchzip { url = "https://github.com/namecoin/namecoin/archive/nc${version}.tar.gz"; - sha256 = "1755mqxpg91wg9hf0ibpj59sdzfmhh73yrpi7hfi2ipabkwmlpiz"; + sha256 = "0mbkhj7y3f4vbqp5q3zk27bzqlk2kq71rcgivvj06w29fzd64mw6"; }; buildInputs = [ db4 boost openssl unzip miniupnpc ]; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix new file mode 100644 index 00000000000..c70a1b4aa9b --- /dev/null +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, alsaLib, jack2Full, minixml, pkgconfig }: + +stdenv.mkDerivation rec { + name = packageName + "-" + version ; + packageName = "aj-snapshot" ; + version = "0.9.6" ; + + src = fetchurl { + url = "mirror://sourceforge/${packageName}/${name}.tar.bz2"; + sha256 = "12n2h3609fbvsnnwrwma4m55iyv6lcv1v3q5pznz2w6f12wf0c9z"; + }; + + doCheck = false; + + buildInputs = [ alsaLib minixml jack2Full pkgconfig ]; + + meta = with stdenv.lib; { + description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files"; + longDescription = '' + Aj-snapshot is a small program that can be used to make snapshots of the connections made between JACK and/or ALSA clients. + Because JACK can provide both audio and MIDI support to programs, aj-snapshot can store both types of connections for JACK. + ALSA, on the other hand, only provides routing facilities for MIDI clients. + You can also run aj-snapshot in daemon mode if you want to have your connections continually restored. + ''; + + homepage = http://aj-snapshot.sourceforge.net/; + license = licenses.gpl2; + maintainers = [ maintainers.palo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index a5cfdf227bb..4aba1a53075 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,22 +1,120 @@ -{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, libpulseaudio}: +{ stdenv, fetchFromGitHub, ncurses, pkgconfig + +, alsaSupport ? stdenv.isLinux, alsaLib ? null +# simple fallback for everyone else +, aoSupport ? !stdenv.isLinux, libao ? null +, jackSupport ? false, libjack ? null +, samplerateSupport ? jackSupport, libsamplerate ? null +, ossSupport ? false, alsaOss ? null +, pulseaudioSupport ? false, libpulseaudio ? null + +# TODO: add these +#, artsSupport +#, roarSupport +#, sndioSupport +#, sunSupport +#, waveoutSupport + +, cddbSupport ? true, libcddb ? null +, cdioSupport ? true, libcdio ? null +, cueSupport ? true, libcue ? null +, discidSupport ? true, libdiscid ? null +, ffmpegSupport ? true, ffmpeg ? null +, flacSupport ? true, flac ? null +, madSupport ? true, libmad ? null +, mikmodSupport ? true, libmikmod ? null +, modplugSupport ? true, libmodplug ? null +, mpcSupport ? true, libmpcdec ? null +, tremorSupport ? false, tremor ? null +, vorbisSupport ? true, libvorbis ? null +, wavpackSupport ? true, wavpack ? null + +# can't make these work, something is broken +#, aacSupport ? true, faac ? null +#, mp4Support ? true, mp4v2 ? null +#, opusSupport ? true, opusfile ? null + +# not in nixpkgs +#, vtxSupport ? true, libayemu ? null +}: + +with stdenv.lib; + +assert samplerateSupport -> jackSupport; + +# vorbis and tremor are mutually exclusive +assert vorbisSupport -> !tremorSupport; +assert tremorSupport -> !vorbisSupport; + +let + + mkFlag = b: f: dep: if b + then { flags = [ f ]; deps = [ dep ]; } + else { flags = []; deps = []; }; + + opts = [ + # Audio output + (mkFlag alsaSupport "CONFIG_ALSA=y" alsaLib) + (mkFlag aoSupport "CONFIG_AO=y" libao) + (mkFlag jackSupport "CONFIG_JACK=y" libjack) + (mkFlag samplerateSupport "CONFIG_SAMPLERATE=y" libsamplerate) + (mkFlag ossSupport "CONFIG_OSS=y" alsaOss) + (mkFlag pulseaudioSupport "CONFIG_PULSE=y" libpulseaudio) + + #(mkFlag artsSupport "CONFIG_ARTS=y") + #(mkFlag roarSupport "CONFIG_ROAR=y") + #(mkFlag sndioSupport "CONFIG_SNDIO=y") + #(mkFlag sunSupport "CONFIG_SUN=y") + #(mkFlag waveoutSupport "CONFIG_WAVEOUT=y") + + # Input file formats + (mkFlag cddbSupport "CONFIG_CDDB=y" libcddb) + (mkFlag cdioSupport "CONFIG_CDIO=y" libcdio) + (mkFlag cueSupport "CONFIG_CUE=y" libcue) + (mkFlag discidSupport "CONFIG_DISCID=y" libdiscid) + (mkFlag ffmpegSupport "CONFIG_FFMPEG=y" ffmpeg) + (mkFlag flacSupport "CONFIG_FLAC=y" flac) + (mkFlag madSupport "CONFIG_MAD=y" libmad) + (mkFlag mikmodSupport "CONFIG_MIKMOD=y" libmikmod) + (mkFlag modplugSupport "CONFIG_MODPLUG=y" libmodplug) + (mkFlag mpcSupport "CONFIG_MPC=y" libmpcdec) + (mkFlag tremorSupport "CONFIG_TREMOR=y" tremor) + (mkFlag vorbisSupport "CONFIG_VORBIS=y" libvorbis) + (mkFlag wavpackSupport "CONFIG_WAVPACK=y" wavpack) + + #(mkFlag opusSupport "CONFIG_OPUS=y" opusfile) + #(mkFlag mp4Support "CONFIG_MP4=y" mp4v2) + #(mkFlag aacSupport "CONFIG_AAC=y" faac) + + #(mkFlag vtxSupport "CONFIG_VTX=y" libayemu) + ]; + +in stdenv.mkDerivation rec { name = "cmus-${version}"; - version = "2.6.0"; + version = "2.7.0"; - src = fetchgit { - url = https://github.com/cmus/cmus.git; - rev = "46b71032da827d22d4fae5bf2afcc4c9afef568c"; - sha256 = "1hkqifll5ryf3ljp3w1dxz1p8m6rk34fpazc6vwavis6ga310hka"; + src = fetchFromGitHub { + owner = "cmus"; + repo = "cmus"; + rev = "0306cc74c5073a85cf8619c61da5b94a3f863eaa"; + sha256 = "18w9mznb843nzkrcqvshfha51mlpdl92zlvb5wfc5dpgrbf37728"; }; - configurePhase = "./configure prefix=$out"; + patches = [ ./option-debugging.patch ]; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue libpulseaudio ]; + configurePhase = "./configure " + concatStringsSep " " ([ + "prefix=$out" + "CONFIG_WAV=y" + ] ++ concatMap (a: a.flags) opts); + + buildInputs = [ ncurses pkgconfig ] ++ concatMap (a: a.deps) opts; meta = { description = "Small, fast and powerful console music player for Linux and *BSD"; homepage = https://cmus.github.io/; license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.oxij ]; }; } diff --git a/pkgs/applications/audio/cmus/option-debugging.patch b/pkgs/applications/audio/cmus/option-debugging.patch new file mode 100644 index 00000000000..84115e1480e --- /dev/null +++ b/pkgs/applications/audio/cmus/option-debugging.patch @@ -0,0 +1,42 @@ +Shows build and link errors in configure for ease of debugging which +options require what. +diff --git a/scripts/checks.sh b/scripts/checks.sh +index 64cbbf3..fab4d9b 100644 +--- a/scripts/checks.sh ++++ b/scripts/checks.sh +@@ -425,7 +425,7 @@ try_compile() + echo "$1" > $__src || exit 1 + shift + __cmd="$CC -c $CFLAGS $@ $__src -o $__obj" +- $CC -c $CFLAGS "$@" $__src -o $__obj 2>/dev/null ++ $CC -c $CFLAGS "$@" $__src -o $__obj + ;; + cxx) + __src=`tmp_file prog.cc` +@@ -433,7 +433,7 @@ try_compile() + echo "$1" > $__src || exit 1 + shift + __cmd="$CXX -c $CXXFLAGS $@ $__src -o $__obj" +- $CXX -c $CXXFLAGS "$@" $__src -o $__obj 2>/dev/null ++ $CXX -c $CXXFLAGS "$@" $__src -o $__obj + ;; + esac + return $? +@@ -451,7 +451,7 @@ try_compile_link() + echo "$1" > $__src || exit 1 + shift + __cmd="$CC $__src -o $__exe $CFLAGS $LDFLAGS $@" +- $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" 2>/dev/null ++ $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" + ;; + cxx) + __src=`tmp_file prog.cc` +@@ -459,7 +459,7 @@ try_compile_link() + echo "$1" > $__src || exit 1 + shift + __cmd="$CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS $@" +- $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" 2>/dev/null ++ $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" + ;; + esac + return $? diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index d1828016de3..2663f5592f7 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -9,6 +9,7 @@ , wavSupport ? true, libsndfile ? null , cdaSupport ? true, libcdio ? null, libcddb ? null , aacSupport ? true, faad2 ? null +, midiSupport ? false, wildmidi ? null , wavpackSupport ? false, wavpack ? null , ffmpegSupport ? false, ffmpeg ? null # misc plugins @@ -44,6 +45,7 @@ assert alsaSupport -> alsaLib != null; assert pulseSupport -> libpulseaudio != null; assert resamplerSupport -> libsamplerate != null; assert overloadSupport -> zlib != null; +assert midiSupport -> wildmidi != null; assert wavpackSupport -> wavpack != null; assert remoteSupport -> curl != null; @@ -73,6 +75,7 @@ stdenv.mkDerivation rec { ++ optional pulseSupport libpulseaudio ++ optional resamplerSupport libsamplerate ++ optional overloadSupport zlib + ++ optional midiSupport wildmidi ++ optional wavpackSupport wavpack ++ optional remoteSupport curl ; diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index 93abad7aa77..2b78d1a4b6d 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { { description = "Auditory binaural-beat generator"; homepage = http://gnaural.sourceforge.net/; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index 3b7a5bc685c..e412f31f316 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Collection of audio level meters with GUI in LV2 plugin format"; homepage = http://x42.github.io/meters.lv2/; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix index 4dc150d0642..8ceb0fe3b36 100644 --- a/pkgs/applications/audio/morituri/default.nix +++ b/pkgs/applications/audio/morituri/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchurl, python, pythonPackages, cdparanoia, cdrdao +{ stdenv, fetchgit, python, pythonPackages, cdparanoia, cdrdao , pygobject, gst_python, gst_plugins_base, gst_plugins_good -, setuptools, utillinux, makeWrapper, substituteAll }: +, setuptools, utillinux, makeWrapper, substituteAll, autoreconfHook }: stdenv.mkDerivation rec { name = "morituri-${version}"; - version = "0.2.3"; + version = "0.2.3.20151109"; namePrefix = ""; - src = fetchurl { - url = "http://thomas.apestaart.org/download/morituri/${name}.tar.bz2"; - sha256 = "1b30bs1y8azl04izsrl01gw9ys0lhzkn5afxi4p8qbiri2h4v210"; + src = fetchgit { + url = "https://github.com/thomasvs/morituri.git"; + fetchSubmodules = true; + rev = "135b2f7bf27721177e3aeb1d26403f1b29116599"; + sha256 = "1ccxq1spny6xgd7nqwn13n9nqa00ay0nhflg3vbdkvbirh8fgxwq"; }; pythonPath = [ pygobject gst_python pythonPackages.musicbrainzngs pythonPackages.pycdio pythonPackages.pyxdg setuptools + pythonPackages.CDDB ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ python cdparanoia cdrdao utillinux makeWrapper gst_plugins_base gst_plugins_good diff --git a/pkgs/applications/audio/morituri/paths.patch b/pkgs/applications/audio/morituri/paths.patch index efabc1d200c..b3372dae48b 100644 --- a/pkgs/applications/audio/morituri/paths.patch +++ b/pkgs/applications/audio/morituri/paths.patch @@ -1,8 +1,9 @@ -diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in ---- morituri-0.2.3-orig/doc/Makefile.in 2014-12-23 12:44:46.222410092 +0100 -+++ morituri-0.2.3/doc/Makefile.in 2014-12-23 12:46:49.619756940 +0100 -@@ -486,7 +486,7 @@ morituri.ics: $(top_srcdir)/morituri.doa - -moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics +diff --git a/doc/Makefile.am b/doc/Makefile.am +index c115c2c..78c883e 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -24,7 +24,7 @@ morituri.ics: $(top_srcdir)/morituri.doap + man_MANS = rip.1 rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri - PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1 @@ -10,9 +11,10 @@ diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in clean-local: @rm -rf reference -diff -Nurp morituri-0.2.3-orig/morituri/common/program.py morituri-0.2.3/morituri/common/program.py ---- morituri-0.2.3-orig/morituri/common/program.py 2014-12-23 12:44:46.218410048 +0100 -+++ morituri-0.2.3/morituri/common/program.py 2014-12-23 12:46:49.647757245 +0100 +diff --git a/morituri/common/program.py b/morituri/common/program.py +index d340fdd..15cb751 100644 +--- a/morituri/common/program.py ++++ b/morituri/common/program.py @@ -92,13 +92,13 @@ class Program(log.Loggable): """ Load the given device. @@ -38,19 +40,12 @@ diff -Nurp morituri-0.2.3-orig/morituri/common/program.py morituri-0.2.3/moritur def getFastToc(self, runner, toc_pickle, device): """ -diff -Nurp morituri-0.2.3-orig/morituri/extern/python-command/scripts/help2man morituri-0.2.3/morituri/extern/python-command/scripts/help2man ---- morituri-0.2.3-orig/morituri/extern/python-command/scripts/help2man 2014-12-23 12:44:46.206409916 +0100 -+++ morituri-0.2.3/morituri/extern/python-command/scripts/help2man 2014-12-23 12:46:49.631757074 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!@python@/bin/python - - # -*- Mode: Python -*- - # vi:si:et:sw=4:sts=4:ts=4 -diff -Nurp morituri-0.2.3-orig/morituri/program/cdparanoia.py morituri-0.2.3/morituri/program/cdparanoia.py ---- morituri-0.2.3-orig/morituri/program/cdparanoia.py 2014-12-23 12:44:46.202409873 +0100 -+++ morituri-0.2.3/morituri/program/cdparanoia.py 2014-12-23 12:46:49.659757376 +0100 -@@ -278,7 +278,7 @@ class ReadTrackTask(log.Loggable, task.T +Submodule morituri/extern/python-command contains modified content +diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py +index 46176d5..fce14a5 100644 +--- a/morituri/program/cdparanoia.py ++++ b/morituri/program/cdparanoia.py +@@ -278,7 +278,7 @@ class ReadTrackTask(log.Loggable, task.Task): stopTrack, stopOffset) bufsize = 1024 @@ -68,9 +63,10 @@ diff -Nurp morituri-0.2.3-orig/morituri/program/cdparanoia.py morituri-0.2.3/mor _VERSION_RE, "%(version)s %(release)s") -diff -Nurp morituri-0.2.3-orig/morituri/program/cdrdao.py morituri-0.2.3/morituri/program/cdrdao.py ---- morituri-0.2.3-orig/morituri/program/cdrdao.py 2014-12-23 12:44:46.202409873 +0100 -+++ morituri-0.2.3/morituri/program/cdrdao.py 2014-12-23 12:46:49.667757463 +0100 +diff --git a/morituri/program/cdrdao.py b/morituri/program/cdrdao.py +index c6fba64..c4d0306 100644 +--- a/morituri/program/cdrdao.py ++++ b/morituri/program/cdrdao.py @@ -257,7 +257,7 @@ class CDRDAOTask(ctask.PopenTask): def start(self, runner): diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 3d0114352a1..df76b8073b6 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -35,7 +35,7 @@ buildPythonPackage { meta = with stdenv.lib; { homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard"; description = "The official MusicBrainz tagger"; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index f26434f6f20..e9a42b3bbea 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk -, libjack2, libsndfile, lv2, mesa, minixml, pkgconfig, zlib, xorg +, libjack2, libsndfile, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg }: assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.3.6"; + version = "1.3.7.1"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0c2y59m945rrspnwdxmixk92z9nfiayxdxh582gf15nj8bvkh1l6"; + sha256 = "13xc1x8jrr2rn26jx4dini692ww3771d5j5xf7f56ixqr7mmdhvz"; }; buildInputs = [ - alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile lv2 mesa + alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile readline lv2 mesa minixml zlib xorg.libpthreadstubs ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "cd src"; - cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so" ]; + cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so -DCMAKE_INSTALL_DATAROOTDIR=$out" ]; meta = with stdenv.lib; { description = "high quality software synthesizer based on ZynAddSubFX"; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index ec8971d319f..84a62d34fa6 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, alsaLib, cmake, libjack2, fftw, fltk13, libjpeg -, minixml, pkgconfig, zlib +, minixml, pkgconfig, zlib, liblo }: stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; - version = "2.4.4"; + version = "2.5.2"; src = fetchurl { - url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.xz"; - sha256 = "15byz08p5maf3v8l1zz11xan6s0qcfasjf1b81xc8rffh13x5f53"; + url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.gz"; + sha256 = "11yrady7xwfrzszkk2fvq81ymv99mq474h60qnirk27khdygk24m"; }; - buildInputs = [ alsaLib libjack2 fftw fltk13 libjpeg minixml zlib ]; + buildInputs = [ alsaLib libjack2 fftw fltk13 libjpeg minixml zlib liblo ]; nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://zynaddsubfx.sourceforge.net; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ maintainers.goibhniu maintainers.palo ]; }; } diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index dc891605d1b..d2faf465106 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,54 +1,80 @@ -{ stdenv, fetchpatch, makeQtWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs -, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }: +{ stdenv, makeQtWrapper, fetchFromGitHub +, cmake, pkgconfig, libxcb, libpthreadstubs, lndir +, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd +, themes +}: let version = "0.13.0"; + + unwrapped = stdenv.mkDerivation rec { + name = "sddm-unwrapped-${version}"; + + src = fetchFromGitHub { + owner = "sddm"; + repo = "sddm"; + rev = "v${version}"; + sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1"; + }; + + patches = [ + ./0001-ignore-config-mtime.patch + ./0002-fix-ConfigReader-QStringList-corruption.patch + ]; + + nativeBuildInputs = [ cmake pkgconfig qttools ]; + + buildInputs = [ + libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd + ]; + + cmakeFlags = [ + "-DCONFIG_FILE=/etc/sddm.conf" + # Set UID_MIN and UID_MAX so that the build script won't try + # to read them from /etc/login.defs (fails in chroot). + # The values come from NixOS; they may not be appropriate + # for running SDDM outside NixOS, but that configuration is + # not supported anyway. + "-DUID_MIN=1000" + "-DUID_MAX=29999" + ]; + + preConfigure = '' + export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "QML based X11 display manager"; + homepage = https://github.com/sddm/sddm; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ttuegel ]; + }; + }; + in -stdenv.mkDerivation rec { + +stdenv.mkDerivation { name = "sddm-${version}"; + phases = "installPhase"; - src = fetchFromGitHub { - owner = "sddm"; - repo = "sddm"; - rev = "v${version}"; - sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1"; - }; + nativeBuildInputs = [ lndir makeQtWrapper ]; + buildInputs = [ unwrapped ] ++ themes; + inherit themes; + inherit unwrapped; - patches = [ - ./0001-ignore-config-mtime.patch - ./0002-fix-ConfigReader-QStringList-corruption.patch - ]; + installPhase = '' + makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm" - nativeBuildInputs = [ cmake makeQtWrapper pkgconfig qttools ]; - - buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ]; - - cmakeFlags = [ - "-DCONFIG_FILE=/etc/sddm.conf" - # Set UID_MIN and UID_MAX so that the build script won't try - # to read them from /etc/login.defs (fails in chroot). - # The values come from NixOS; they may not be appropriate - # for running SDDM outside NixOS, but that configuration is - # not supported anyway. - "-DUID_MIN=1000" - "-DUID_MAX=29999" - ]; - - preConfigure = '' - export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system" + mkdir -p "$out/share/sddm" + for pkg in $unwrapped $themes; do + local sddmDir="$pkg/share/sddm" + if [[ -d "$sddmDir" ]]; then + lndir -silent "$sddmDir" "$out/share/sddm" + fi + done ''; - postInstall = '' - wrapQtProgram $out/bin/sddm - wrapQtProgram $out/bin/sddm-greeter - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "QML based X11 display manager"; - homepage = https://github.com/sddm/sddm; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; + inherit (unwrapped) meta; } diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 3f454da04af..9e6002e9398 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -106,16 +106,16 @@ rec { anyedittools = buildEclipsePlugin rec { name = "anyedit-${version}"; - version = "2.5.0.201510241327"; + version = "2.6.0.201511291145"; srcFeature = fetchurl { url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar"; - sha256 = "01qaxg1b4n7y7g1xdkx1bnmpwqydln270mk14l4pl35q3c88s5nc"; + sha256 = "1vllci75qcd28b6hn2jz29l6cabxx9ql5i6l9cwq9rxp49dhc96b"; }; srcPlugin = fetchurl { - url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.5.0/de.loskutov.anyedit.AnyEditTools_${version}.jar"; - sha256 = "0m4qxkscl5xih8x1znbrih4jh28wky4l62spfif9zw0s7mgl117c"; + url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.6.0/de.loskutov.anyedit.AnyEditTools_${version}.jar"; + sha256 = "0mgq0ylfa7srjf7azyx0kbahlsjf0sdpazqphzx4f0bfn1l328s4"; }; meta = with stdenv.lib; { @@ -317,11 +317,11 @@ rec { scala = buildEclipseUpdateSite rec { name = "scala-${version}"; - version = "4.1.1.20150911"; + version = "4.1.1.20151201"; src = fetchzip { url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip"; - sha256 = "03g24sjivm7kzy64wwjs4ihf9vrb6703lb7bx3jafxzcwqm0pj1i"; + sha256 = "19iqaha9c5n5hkyn83xj8znkvshm4823d65zigbj97fz8gzrr0la"; }; meta = with stdenv.lib; { @@ -335,16 +335,16 @@ rec { testng = buildEclipsePlugin rec { name = "testng-${version}"; - version = "6.9.10.201511281504"; + version = "6.9.10.201512020421"; srcFeature = fetchurl { - url = "http://beust.com/eclipse/features/org.testng.eclipse_${version}.jar"; - sha256 = "1kjaifa1fc16yh82bzp5xa5pn3kgrpgc5jq55lyvgz29vjj6ss97"; + url = "http://beust.com/eclipse-old/eclipse_${version}/features/org.testng.eclipse_${version}.jar"; + sha256 = "17y0cb1xprldjav14iy2sinv7lcw4xnjs2fwz9gl41m9m1c0hajk"; }; srcPlugin = fetchurl { - url = "http://beust.com/eclipse/plugins/org.testng.eclipse_${version}.jar"; - sha256 = "1njz4ynjwnhjjbsszfgqyjn2ixxzjv8qvnc7dqz8jldrz3jrjf07"; + url = "http://beust.com/eclipse-old/eclipse_${version}/plugins/org.testng.eclipse_${version}.jar"; + sha256 = "1iwq0ifk9l56z11vhy5yscvl8l1xk6igkp103v9vwvcx6nlmkfgc"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 5dd477f2981..f2cbdaaee82 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls -, alsaLib, cairo, acl, gpm, AppKit +, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK3 ? false, gtk3 ? null , withGTK2 ? true, gtk2 @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (withX && withGTK3) gtk3 ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin AppKit; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; configureFlags = if stdenv.isDarwin diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.json b/pkgs/applications/editors/emacs-modes/elpa-packages.json new file mode 100644 index 00000000000..0572dca56be --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.json @@ -0,0 +1,1337 @@ +{ + "stream": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/stream-2.1.0.el", + "sha256": "05fihjd8gm5w4xbdcvah1g9srcgmk87ymk3i7wwa6961w5s01d5y" + }, + "version": "2.1.0", + "deps": [ + "emacs" + ] + }, + "load-dir": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/load-dir-0.0.3.el", + "sha256": "0w5rdc6gr7nm7r0d258mp5sc06n09mmz7kjg8bd3sqnki8iz7s32" + }, + "version": "0.0.3", + "deps": [] + }, + "w3": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/w3-4.0.49.tar", + "sha256": "01n334b3gwx288xysa1vxsvb14avsz3syfigw85i7m5nizhikqbb" + }, + "version": "4.0.49", + "deps": [] + }, + "diff-hl": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/diff-hl-1.8.1.tar", + "sha256": "09yqa71xmkikkzddg9f6ah92444wwf14aial9fxv2cxqavisdj64" + }, + "version": "1.8.1", + "deps": [ + "cl-lib" + ] + }, + "sml-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/sml-mode-6.7.el", + "sha256": "041dmxx7imiy99si9pscwjh5y4h02y3lirzhv1cfxqr3ghxngf9x" + }, + "version": "6.7", + "deps": [] + }, + "gnugo": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/gnugo-3.0.0.tar", + "sha256": "0b94kbqxir023wkmqn9kpjjj2v0gcz856mqipz30gxjbjj42w27x" + }, + "version": "3.0.0", + "deps": [ + "ascii-art-to-unicode", + "cl-lib", + "xpm" + ] + }, + "python": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/python-0.25.1.el", + "sha256": "16r1sjq5fagrvlnrnbxmf6h2yxrcbhqlaa3ppqsa14vqrj09gisd" + }, + "version": "0.25.1", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "vlf": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/vlf-1.7.tar", + "sha256": "007zdr5szimr6nwwrqz9s338s0qq82r006pdwgcm8nc41jsmsx7r" + }, + "version": "1.7", + "deps": [] + }, + "minimap": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/minimap-1.2.el", + "sha256": "1vcxdxy7mv8mi4lrri3kmyf9kly3rb02z4kpfx5d1xv493havvb8" + }, + "version": "1.2", + "deps": [] + }, + "load-relative": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/load-relative-1.2.el", + "sha256": "0vmfal05hznb10k2y3j9mychi9ra4hxcm6qf7j1r8aw9j7af6riw" + }, + "version": "1.2", + "deps": [] + }, + "quarter-plane": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/quarter-plane-0.1.el", + "sha256": "0hj3asdzf05h8j1fsxx9y71arnprg2xwk2dcb81zj04hzggzpwmm" + }, + "version": "0.1", + "deps": [] + }, + "context-coloring": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/context-coloring-7.2.0.el", + "sha256": "0l7mzmnhqh6sri1fhhv51khi0fnpfp51drzy725s6zfmpbrcn7vn" + }, + "version": "7.2.0", + "deps": [ + "emacs", + "js2-mode" + ] + }, + "svg-clock": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/svg-clock-0.5.el", + "sha256": "1i77c7nyqcwc6b6n7vdh95xbmwv5kpdds6j7pklp4c9vbvm8axgp" + }, + "version": "0.5", + "deps": [ + "emacs", + "svg" + ] + }, + "math-symbol-lists": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/math-symbol-lists-1.0.el", + "sha256": "1rry9x4pl7i0sij051i76zp1ypvnj1qbwm40a7bs462c74q4jlwn" + }, + "version": "1.0", + "deps": [] + }, + "osc": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/osc-0.1.el", + "sha256": "09nzbbzvxfrjm91wawbv6bg6fqlcx1qi0711qc73yfrbc8ndsnsb" + }, + "version": "0.1", + "deps": [] + }, + "electric-spacing": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/electric-spacing-5.0.el", + "sha256": "1jk6v84z0n8jljzsz4wk7rgzh7drpfvxf4bp6xis8gapnd3ycfyv" + }, + "version": "5.0", + "deps": [] + }, + "exwm": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/exwm-0.1.tar", + "sha256": "18w9a37v8lyyjj8ll2f5mw8fw14g54b887cflzv5d576k5f606f5" + }, + "version": "0.1", + "deps": [ + "xelb" + ] + }, + "ada-ref-man": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ada-ref-man-2012.0.tar", + "sha256": "1g97892h8d1xa7cfxgg4i232i15hhci7gijj0dzc31yd9vbqayx8" + }, + "version": "2012.0", + "deps": [] + }, + "landmark": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/landmark-1.0.el", + "sha256": "0mz1l9zc1nvggjhg4jcly8ncw38xkprlrha8l8vfl9k9rg7s1dv4" + }, + "version": "1.0", + "deps": [] + }, + "rudel": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/rudel-0.3.tar", + "sha256": "041yac9a7hbz1fpmjlmc31ggcgg90fmw08z6bkzly2141yky8yh1" + }, + "version": "0.3", + "deps": [] + }, + "tiny": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/tiny-0.1.tar", + "sha256": "04iyidzjgnm4ka575wxqdak19h8j4dlni2ahf0bkq1q9by79xq1q" + }, + "version": "0.1", + "deps": [] + }, + "coffee-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/coffee-mode-0.4.1.1.el", + "sha256": "1jffd8rqmc3l597db26rggis6apf91glyzm1qvpf5g3iz55g6slz" + }, + "version": "0.4.1.1", + "deps": [] + }, + "sisu-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/sisu-mode-3.0.3.el", + "sha256": "0ay9hfix3x53f39my02071dzxrw69d4zx5zirxwmmmyxmkaays3r" + }, + "version": "3.0.3", + "deps": [] + }, + "lmc": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/lmc-1.3.el", + "sha256": "0s5dkksgfbfbhc770z1n7d4jrkpcb8z1935abgrw80icxgsrc01p" + }, + "version": "1.3", + "deps": [] + }, + "temp-buffer-browse": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/temp-buffer-browse-1.4.el", + "sha256": "055z7hm8b2s8z1kd6hahjz0crz9qx8k9qb5pwdwdxcsh2j70pmcw" + }, + "version": "1.4", + "deps": [] + }, + "org": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/org-20151123.tar", + "sha256": "13ybzjg6k61paldfln6isc6149hvilwsgsnhyirig42bz1z0vjbb" + }, + "version": "20151123", + "deps": [] + }, + "bug-hunter": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/bug-hunter-1.0.1.el", + "sha256": "0c0pg542y09c1k25dxk2062pj3cj12i73kqxbpq0m6af0qm7wy9d" + }, + "version": "1.0.1", + "deps": [ + "cl-lib", + "seq" + ] + }, + "test-simple": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/test-simple-1.1.el", + "sha256": "0s8r6kr0a6n1c20fraif2ngis436a7d3gsj351s6icx6bbcjdalw" + }, + "version": "1.1", + "deps": [ + "cl-lib" + ] + }, + "notes-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/notes-mode-1.30.tar", + "sha256": "1aqivlfa0nk0y27gdv68k5rg3m5wschh8cw196a13qb7kaghk9r6" + }, + "version": "1.30", + "deps": [] + }, + "nlinum": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/nlinum-1.6.el", + "sha256": "1hr5waxbq0fcys8x2nfdl84mp2v8v9qi08f1kqdray2hzmnmipcw" + }, + "version": "1.6", + "deps": [] + }, + "sokoban": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/sokoban-1.4.tar", + "sha256": "1yfkaw8rjris03qpj32vqhg5lfml4hz9v3adka6sw6dv4n67j9w1" + }, + "version": "1.4", + "deps": [] + }, + "tNFA": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/tNFA-0.1.1.el", + "sha256": "01n4p8lg8f2k55l2z77razb2sl202qisjqm5lff96a2kxnxinsds" + }, + "version": "0.1.1", + "deps": [ + "queue" + ] + }, + "js2-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/js2-mode-20150909.tar", + "sha256": "1ha696jl9k1325r3xlr11rx6lmd545p42f8biw4hb0q1zsr2306h" + }, + "version": "20150909", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "other-frame-window": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/other-frame-window-1.0.2.el", + "sha256": "0gr4vn7ld4fx372091wxnzm1rhq6rc4ycim4fwz5bxnpykz83l7d" + }, + "version": "1.0.2", + "deps": [ + "emacs" + ] + }, + "flylisp": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/flylisp-0.2.el", + "sha256": "0hh09qy1xwlv52lsh49nr11h4lk8qlmk06b669q494d79hxyv4v6" + }, + "version": "0.2", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "yasnippet": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/yasnippet-0.8.0.tar", + "sha256": "1syb9sc6xbw4vjhaix8b41lbm5zq6myrljl4r72yi6ndj5z9bmpr" + }, + "version": "0.8.0", + "deps": [] + }, + "cl-lib": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/cl-lib-0.5.el", + "sha256": "1z4ffcx7b95bxz52586lhvdrdm5vp473g3afky9h5my3jp5cd994" + }, + "version": "0.5", + "deps": [] + }, + "dts-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/dts-mode-0.1.0.el", + "sha256": "08xwqbdg0gwipc3gfacs3gpc6zz6lhkw7pyj7n9qhg020c4qv7hq" + }, + "version": "0.1.0", + "deps": [] + }, + "djvu": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/djvu-0.5.el", + "sha256": "1wpyv4ismfsz5hfaj75j3h3nni1mnk33czhw3rd45cf32a2zkqsj" + }, + "version": "0.5", + "deps": [] + }, + "javaimp": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/javaimp-0.6.el", + "sha256": "00a37jv9wbzy521a15vk7a66rsf463zzr57adc8ii2m4kcyldpqh" + }, + "version": "0.6", + "deps": [] + }, + "loc-changes": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/loc-changes-1.2.el", + "sha256": "1x8fn8vqasayf1rb8a6nma9n6nbvkx60krmiahyb05vl5rrsw6r3" + }, + "version": "1.2", + "deps": [] + }, + "scroll-restore": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/scroll-restore-1.0.el", + "sha256": "0h55szlmkmzmcvd6gvv8l74n7y64i0l78nwwmq7xsbzprlmj6khn" + }, + "version": "1.0", + "deps": [] + }, + "web-server": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/web-server-0.1.1.tar", + "sha256": "1q51fhqw5al4iycdlighwv7jqgdpjb1a66glwd5jnc9b651yk42n" + }, + "version": "0.1.1", + "deps": [ + "emacs" + ] + }, + "debbugs": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/debbugs-0.8.tar", + "sha256": "1wp5wa2a0rwvpfdzd2b78k6vd26qbyqwl4p2c2s5l7zkqy258in5" + }, + "version": "0.8", + "deps": [] + }, + "on-screen": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/on-screen-1.3.2.el", + "sha256": "15d18mjgv1pnwl6kf3pr5w64q1322p1l1qlfvnckglwmzy5sl2qv" + }, + "version": "1.3.2", + "deps": [ + "cl-lib" + ] + }, + "pabbrev": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/pabbrev-4.2.1.el", + "sha256": "19v5adk61y8fpigw7k6wz6dj79jwr450hnbi7fj0jvb21cvjmfxh" + }, + "version": "4.2.1", + "deps": [] + }, + "fsm": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/fsm-0.2.el", + "sha256": "1kh1r5by1q2x8bbg0z2jzmb5i6blvlf105mavrnbcxa6ghbiz6iy" + }, + "version": "0.2", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "jgraph-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/jgraph-mode-1.1.el", + "sha256": "0479irjz5r79x6ngl3lfkl1gqsmvcw8kn6285sm6nkn66m1dfs8l" + }, + "version": "1.1", + "deps": [ + "cl-lib" + ] + }, + "wpuzzle": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/wpuzzle-1.1.el", + "sha256": "1wjg411dc0fvj2n8ak73igfrzc31nizzvvr2qa87fhq99bgh62kj" + }, + "version": "1.1", + "deps": [] + }, + "darkroom": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/darkroom-0.1.el", + "sha256": "0fif8fm1h7x7g16949shfnaik5f5488clsvkf8bi5izpqp3vi6ak" + }, + "version": "0.1", + "deps": [ + "cl-lib" + ] + }, + "let-alist": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/let-alist-1.0.4.el", + "sha256": "07312bvvyz86lf64vdkxg2l1wgfjl25ljdjwlf1bdzj01c4hm88x" + }, + "version": "1.0.4", + "deps": [] + }, + "wconf": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/wconf-0.2.0.el", + "sha256": "07adnx2ni7kprxw9mx1nywzs1a2h43rszfa8r8i0s9j16grvgphk" + }, + "version": "0.2.0", + "deps": [ + "emacs" + ] + }, + "ntlm": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ntlm-2.0.0.el", + "sha256": "1n602yi60rwsacqw20kqbm97x6bhzjxblxbdprm36f31qmym8si4" + }, + "version": "2.0.0", + "deps": [] + }, + "cl-generic": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/cl-generic-0.2.el", + "sha256": "0b2y114f14fdlk5hkb0fvdbv6pqm9ifw0vwzri1vqp1xq1l1f9p3" + }, + "version": "0.2", + "deps": [] + }, + "undo-tree": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/undo-tree-0.6.5.el", + "sha256": "0bs97xyxwfkjvzax9llg0zsng0vyndnrxj5d2n5mmynaqcn89d37" + }, + "version": "0.6.5", + "deps": [] + }, + "muse": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/muse-3.20.tar", + "sha256": "0i5gfhgxdm1ripw7j3ixqlfkinx3fxjj2gk5md99h70iigrhcnm9" + }, + "version": "3.20", + "deps": [] + }, + "aumix-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/aumix-mode-7.el", + "sha256": "0qyjw2g3pzcxqdg1cpp889nmb524jxqq32dz7b7cg2m903lv5gmv" + }, + "version": "7", + "deps": [] + }, + "avy": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/avy-0.3.0.tar", + "sha256": "1ycfqabx949s7dgp9vhyb9phpxw83gjw4cc7914gr84bqlkj0458" + }, + "version": "0.3.0", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "markchars": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/markchars-0.2.0.el", + "sha256": "1wn9v9jzcyq5wxhw5839jsggfy97955ngspn2gn6jmvz6zdgy4hv" + }, + "version": "0.2.0", + "deps": [] + }, + "rich-minority": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/rich-minority-1.0.1.el", + "sha256": "1pr89k3jz044vf582klphl1zf0r7hj2g7ga8j1dwbrpr9ngiicgc" + }, + "version": "1.0.1", + "deps": [ + "cl-lib" + ] + }, + "hydra": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/hydra-0.13.3.tar", + "sha256": "1il0maxkxm2nxwz6y6v85zhf6a8f52gfq51h1filcnlzg10b5arm" + }, + "version": "0.13.3", + "deps": [ + "cl-lib" + ] + }, + "dismal": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/dismal-1.5.tar", + "sha256": "1vhs6w6c2klsrfjpw8vr5c4gwiw83ppdjhsn2la0fvkm60jmc476" + }, + "version": "1.5", + "deps": [ + "cl-lib" + ] + }, + "xclip": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/xclip-1.3.el", + "sha256": "1zlqr4sp8588sjga5c9b4prnsbpv3lr2wv8sih2p0s5qmjghc947" + }, + "version": "1.3", + "deps": [] + }, + "nameless": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/nameless-0.5.1.el", + "sha256": "0vv4zpqb56w9xy9wljchwilcwpw7zdmqrwfwffxp0pgbhf4w41y9" + }, + "version": "0.5.1", + "deps": [ + "emacs" + ] + }, + "sotlisp": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/sotlisp-1.4.1.el", + "sha256": "1v99pcj5lp1xxavghwv03apwpc589y7wb8vv6w3kai7483p13z5j" + }, + "version": "1.4.1", + "deps": [ + "emacs" + ] + }, + "register-list": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/register-list-0.1.el", + "sha256": "1azgfm4yvhp2bqqplmfbz1fij8gda527lks82bslnpnabd8m6sjh" + }, + "version": "0.1", + "deps": [] + }, + "f90-interface-browser": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/f90-interface-browser-1.1.el", + "sha256": "0mf32w2bgc6b43k0r4a11bywprj7y3rvl21i0ry74v425r6hc3is" + }, + "version": "1.1", + "deps": [] + }, + "ediprolog": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ediprolog-1.1.el", + "sha256": "19qaciwhzr7k624z455fi8i0v5kl10587ha2mfx1bdsym7y376yd" + }, + "version": "1.1", + "deps": [] + }, + "queue": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/queue-0.1.1.el", + "sha256": "0jw24fxqnf9qcaf2nh09cnds1kqfk7hal35dw83x1ari95say391" + }, + "version": "0.1.1", + "deps": [] + }, + "iterators": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/iterators-0.1.el", + "sha256": "0rljqdaj88cbhngj4ddd2z3bfd35r84aivq4h10mk4n4h8whjpj4" + }, + "version": "0.1", + "deps": [ + "emacs" + ] + }, + "all": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/all-1.0.el", + "sha256": "17h4cp0xnh08szh3snbmn1mqq2smgqkn45bq7v0cpsxq1i301hi3" + }, + "version": "1.0", + "deps": [] + }, + "docbook": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/docbook-0.1.el", + "sha256": "01x0g8dhw65mzp9mk6qhx9p2bsvkw96hz1awrrf2ji17sp8hd1v6" + }, + "version": "0.1", + "deps": [] + }, + "dict-tree": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/dict-tree-0.12.8.el", + "sha256": "08jaifqaq9cfz1z4fr4ib9l6lbx4x60q7d6gajx1cdhh18x6nys5" + }, + "version": "0.12.8", + "deps": [ + "heap", + "tNFA", + "trie" + ] + }, + "memory-usage": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/memory-usage-0.2.el", + "sha256": "03qwb7sprdh1avxv3g7hhnhl41pwvnpxcpnqrikl7picy78h1gwj" + }, + "version": "0.2", + "deps": [] + }, + "ggtags": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ggtags-0.8.10.el", + "sha256": "0bigf87idd2rh40akyjiy1qvym6y3hvvx6khyb233b231s400aj9" + }, + "version": "0.8.10", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "soap-client": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/soap-client-3.0.2.tar", + "sha256": "0yx7lnag6fqrnm3a4j77w1lq63izn43sms0n3d4504yr3p826sci" + }, + "version": "3.0.2", + "deps": [ + "cl-lib" + ] + }, + "ack": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ack-1.5.tar", + "sha256": "0sljshiy44z27idy0rxjs2fx4smlm4v607wic7md1vihp6qp4l9r" + }, + "version": "1.5", + "deps": [] + }, + "wisi": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/wisi-1.1.1.tar", + "sha256": "14bpir7kng8b4m1yna4iahhp2z0saagc2i8z53apd39msbplay3r" + }, + "version": "1.1.1", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "beacon": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/beacon-0.5.1.el", + "sha256": "1xzypqprlx23kxlkc1waranyq378ipxr8i6fv6hnhg4ys5j8ksj4" + }, + "version": "0.5.1", + "deps": [ + "seq" + ] + }, + "names": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/names-20151201.0.tar", + "sha256": "13smsf039x4yd7pzvllgn1vz8lhkwghnhip9y2bka38vk37w912d" + }, + "version": "20151201.0", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "dbus-codegen": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/dbus-codegen-0.1.el", + "sha256": "1gi7jc6rn6hlgh01zfwb7cczb5hi3c05wlnzw6akj1h9kai1lmzw" + }, + "version": "0.1", + "deps": [ + "cl-lib" + ] + }, + "ztree": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ztree-1.0.2.tar", + "sha256": "0rm9b7cw5md9zbgbq89kh8wb5jdjrqy9g43psdws19z6j532g665" + }, + "version": "1.0.2", + "deps": [] + }, + "heap": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/heap-0.3.el", + "sha256": "1347s06nv88zyhmbimvn13f13d1r147kn6kric1ki6n382zbw6k6" + }, + "version": "0.3", + "deps": [] + }, + "uni-confusables": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/uni-confusables-0.1.tar", + "sha256": "0s3scvzhd4bggk0qafcspf97cmcvdw3w8bbf5ark4p22knvg80zp" + }, + "version": "0.1", + "deps": [] + }, + "enwc": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/enwc-1.0.tar", + "sha256": "19mjkcgnacygzwm5dsayrwpbzfxadp9kdmmghrk1vir2hwixgv8y" + }, + "version": "1.0", + "deps": [] + }, + "ascii-art-to-unicode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ascii-art-to-unicode-1.9.el", + "sha256": "0lfgfkx81s4dd318xcxsl7hdgpi0dc1fv3d00m3xg8smyxcf3adv" + }, + "version": "1.9", + "deps": [] + }, + "company": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/company-0.8.12.tar", + "sha256": "1r7q813rjs4dgknsfqi354ahsvk8k4ld4xh1fkp8lbxb13da6gqx" + }, + "version": "0.8.12", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "seq": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/seq-1.11.el", + "sha256": "1qpam4cxpy6x6gibln21v29mif71kifyvdfymjsidlnjqqnvdk1h" + }, + "version": "1.11", + "deps": [] + }, + "company-statistics": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/company-statistics-0.2.2.tar", + "sha256": "0h1k0dbb7ngk6pghli2csfpzpx37si0wg840jmay0jlb80q6vw73" + }, + "version": "0.2.2", + "deps": [ + "company", + "emacs" + ] + }, + "metar": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/metar-0.1.el", + "sha256": "0s9zyzps022h5xax574bwsvsyp893x5w74kznnhfm63sxrifbi18" + }, + "version": "0.1", + "deps": [ + "cl-lib" + ] + }, + "caps-lock": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/caps-lock-1.0.el", + "sha256": "1i4hwam81p4dr0bk8257fkiz4xmv6knkjxj7a00fa35kgx5blpva" + }, + "version": "1.0", + "deps": [] + }, + "wcheck-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/wcheck-mode-2014.6.21.el", + "sha256": "0qgyj9mrg4b4rkbm0sdhysrzqr1adri4xpjh33zkpy70vln1qnc7" + }, + "version": "2014.6.21", + "deps": [] + }, + "ahungry-theme": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ahungry-theme-1.0.12.tar", + "sha256": "0a6mlxka1b7vja4wxd8gvfhfk5i1jdj3a851c7dn34hz1lkgvnx8" + }, + "version": "1.0.12", + "deps": [ + "emacs" + ] + }, + "el-search": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/el-search-0.1.1.el", + "sha256": "1q5nscxajqc2qvqksh2glq106749bx6cnz97ysfjh2i78vps4z36" + }, + "version": "0.1.1", + "deps": [ + "emacs" + ] + }, + "company-math": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/company-math-1.0.1.el", + "sha256": "1lkj9cqhmdf3h5zvr94hszkz1251i2rq2mycnhscsnzrk5ll3gck" + }, + "version": "1.0.1", + "deps": [ + "company", + "math-symbol-lists" + ] + }, + "swiper": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/swiper-0.5.1.tar", + "sha256": "06kd6r90fnjz3lapm52pgsx4dhnd95mkzq9y4khkzqny59h0vmm6" + }, + "version": "0.5.1", + "deps": [ + "emacs" + ] + }, + "eldoc-eval": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/eldoc-eval-0.1.el", + "sha256": "1mnhxdsn9h43iq941yqmg92v3hbzwyg7acqfnz14q5g52bnagg19" + }, + "version": "0.1", + "deps": [] + }, + "ada-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ada-mode-5.1.8.tar", + "sha256": "015lmliwk4qa2sbs9spxik6dnwsf1a34py6anklf92qnmzhjicy6" + }, + "version": "5.1.8", + "deps": [ + "cl-lib", + "emacs", + "wisi" + ] + }, + "svg": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/svg-0.1.el", + "sha256": "0v27casnjvjjaalmrbw494sk0zciws037cn6cmcc6rnhj30lzbv5" + }, + "version": "0.1", + "deps": [ + "emacs" + ] + }, + "omn-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/omn-mode-1.2.el", + "sha256": "0p7lmqabdcn625q9z7libn7q1b6mjc74bkic2kjhhckzvlfjk742" + }, + "version": "1.2", + "deps": [] + }, + "trie": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/trie-0.2.6.el", + "sha256": "1q3i1dhq55c3b1hqpvmh924vzvhrgyp76hr1ci7bhjqvjmjx24ii" + }, + "version": "0.2.6", + "deps": [ + "heap", + "tNFA" + ] + }, + "transcribe": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/transcribe-0.5.0.el", + "sha256": "1wxfv96sjcxins8cyqijsb16fc3n0m13kvaw0hjam8x91wamcbxq" + }, + "version": "0.5.0", + "deps": [] + }, + "websocket": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/websocket-1.5.tar", + "sha256": "0plgc8an229cqbghrxd6wh73b081dc17fx1r940dqhgi284pcjsy" + }, + "version": "1.5", + "deps": [] + }, + "aggressive-indent": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/aggressive-indent-1.4.el", + "sha256": "0qdpvdzmw4hq2g8krx93fbb352nkg731p7v82zhqw76y79khdpka" + }, + "version": "1.4", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "xpm": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/xpm-1.0.3.tar", + "sha256": "0qckb93xwzcg8iwiv4bd08r60jn0n853czmilz0hyyb1lfi82lp4" + }, + "version": "1.0.3", + "deps": [] + }, + "oauth2": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/oauth2-0.10.el", + "sha256": "0rlxmbb88dp0yqw9d5mdx0nxv5l5618scmg5872scbnc735f2yna" + }, + "version": "0.10", + "deps": [] + }, + "spinner": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/spinner-1.4.el", + "sha256": "0j4x8hbnhda83yyb31mm9b014pfb81gdfsr026rhn8ls3y163dbf" + }, + "version": "1.4", + "deps": [] + }, + "ergoemacs-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ergoemacs-mode-5.14.7.3.tar", + "sha256": "0lqqrnw6z9w7js8r40khckjc1cyxdiwx8kapf5pvyfs09gs89i90" + }, + "version": "5.14.7.3", + "deps": [ + "emacs", + "undo-tree" + ] + }, + "minibuffer-line": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/minibuffer-line-0.1.el", + "sha256": "1ny4iirp26na5118wfgxlv6fxlrdclzdbd9m0lkrv51w0qw7spil" + }, + "version": "0.1", + "deps": [] + }, + "rainbow-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/rainbow-mode-0.12.el", + "sha256": "10a7qs7fvw4qi4vxj9n56j26gjk61bl79dgz4md1d26slb2j1c04" + }, + "version": "0.12", + "deps": [] + }, + "csv-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/csv-mode-1.5.el", + "sha256": "1dmc6brb6m9s29wsr6giwpf77yindfq47344l9jr31hqgg82x1xc" + }, + "version": "1.5", + "deps": [] + }, + "adjust-parens": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/adjust-parens-3.0.tar", + "sha256": "16gmrgdfyqs7i617669f7xy5mds1svbyfv12xhdjk96rbssfngzg" + }, + "version": "3.0", + "deps": [] + }, + "crisp": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/crisp-1.3.4.el", + "sha256": "1xbnf7xlw499zsnr5ky2bghb2fzg3g7cf2ldmbb7c3b84raryn0i" + }, + "version": "1.3.4", + "deps": [] + }, + "poker": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/poker-0.1.el", + "sha256": "0gbm59m6bs0766r7v8dy9gdif1pb89xj1h8h76bh78hr65yh7gg0" + }, + "version": "0.1", + "deps": [] + }, + "auto-overlays": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/auto-overlays-0.10.9.tar", + "sha256": "0aqjp3bkd7mi191nm971z857s09py390ikcd93hyhmknblk0v14p" + }, + "version": "0.10.9", + "deps": [] + }, + "pinentry": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/pinentry-0.1.el", + "sha256": "0iiw11prk4w32czk69mvc3x6ja9xbhbvpg9b0nidrsg5njjjh76d" + }, + "version": "0.1", + "deps": [] + }, + "adaptive-wrap": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/adaptive-wrap-0.5.el", + "sha256": "0frgmp8vrrml4iykm60j4d6cl9rbcivy9yh24q6kd10bcyx59ypy" + }, + "version": "0.5", + "deps": [] + }, + "xelb": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/xelb-0.4.tar", + "sha256": "1m3wmlzcnbv1akncdaakfy4xmxyjnfb6yl1nfahwf4lfxlsvnwzd" + }, + "version": "0.4", + "deps": [ + "cl-generic", + "emacs" + ] + }, + "num3-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/num3-mode-1.2.el", + "sha256": "1nm3yjp5qs6rq4ak47gb6325vjfw0dnkryfgybgly0m6h4hhpbd8" + }, + "version": "1.2", + "deps": [] + }, + "gnorb": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/gnorb-1.1.1.tar", + "sha256": "1ni2gcnnpdm9pi3y9jap88nic1k0viv865w413xarw6w0jjpdpxa" + }, + "version": "1.1.1", + "deps": [ + "cl-lib" + ] + }, + "auctex": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/auctex-11.89.tar", + "sha256": "0ggk2q17wq4y9yw5b9mykk153ihphazjdj1fl4lv0zblgnrxz5l5" + }, + "version": "11.89", + "deps": [] + }, + "dash": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/dash-2.12.0.tar", + "sha256": "02r547vian59zr55z6ri4p2b7q5y5k256wi9j8a317vjzyh54m05" + }, + "version": "2.12.0", + "deps": [] + }, + "windresize": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/windresize-0.1.el", + "sha256": "0b5bfs686nkp7s05zgfqvr1mpagmkd74j1grq8kp2w9arj0qfi3x" + }, + "version": "0.1", + "deps": [] + }, + "timerfunctions": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/timerfunctions-1.4.2.el", + "sha256": "122q8nv08pz1mkgilvi9qfrs7rsnc5picr7jyz2jpnvpd9qw6jw5" + }, + "version": "1.4.2", + "deps": [ + "cl-lib" + ] + }, + "chess": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/chess-2.0.4.tar", + "sha256": "1sq1bjmp513vldfh7hc2bbfc54665abqiz0kqgqq3gijckaxn5js" + }, + "version": "2.0.4", + "deps": [ + "cl-lib" + ] + }, + "ace-window": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ace-window-0.9.0.el", + "sha256": "1m7fc4arcxn7fp0hnzyp20czjp4zx3rjaspfzpxzgc8sbghi81a3" + }, + "version": "0.9.0", + "deps": [ + "avy" + ] + }, + "shen-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/shen-mode-0.1.tar", + "sha256": "1dr24kkah4hr6vrfxwhl9vzjnwn4n773bw23c3j9bkmlgnbvn0kz" + }, + "version": "0.1", + "deps": [] + }, + "easy-kill": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/easy-kill-0.9.3.tar", + "sha256": "17nw0mglmg877axwg1d0gs03yc0p04lzmd3pl0nsnqbh3303fnqb" + }, + "version": "0.9.3", + "deps": [ + "cl-lib", + "emacs" + ] + }, + "jumpc": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/jumpc-3.0.el", + "sha256": "1vhggw3mzaq33al8f16jbg5qq5f95s8365is9qqyb8yq77gqym6a" + }, + "version": "3.0", + "deps": [] + }, + "epoch-view": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/epoch-view-0.0.1.el", + "sha256": "1wy25ryyg9f4v83qjym2pwip6g9mszhqkf5a080z0yl47p71avfx" + }, + "version": "0.0.1", + "deps": [] + }, + "midi-kbd": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/midi-kbd-0.2.el", + "sha256": "1783k07gyiaq784wqv8qqc89cw5d6q1bdqz68b7n1lx4vmvfrhmh" + }, + "version": "0.2", + "deps": [ + "emacs" + ] + }, + "nhexl-mode": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/nhexl-mode-0.1.el", + "sha256": "0h4kl5d8rj9aw4xxrmv4a9fdcqvkk74ia7bq8jgmjp11pwpzww9j" + }, + "version": "0.1", + "deps": [] + }, + "lex": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/lex-1.1.tar", + "sha256": "1i6ri3k2b2nginhnmwy67mdpv5p75jkxjfwbf42wymza8fxzwbb7" + }, + "version": "1.1", + "deps": [] + }, + "ioccur": { + "fetch": { + "tag": "fetchurl", + "url": "http://elpa.gnu.org/packages/ioccur-2.4.el", + "sha256": "1isid3kgsi5qkz27ipvmp9v5knx0qigmv7lz12mqdkwv8alns1p9" + }, + "version": "2.4", + "deps": [] + } +} \ No newline at end of file diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix new file mode 100644 index 00000000000..3cf37c26280 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -0,0 +1,42 @@ +pkgs: with pkgs; + +let + + inherit (stdenv.lib) makeScope mapAttrs; + + json = builtins.readFile ./elpa-packages.json; + manifest = builtins.fromJSON json; + + mkPackage = self: name: recipe: + let drv = + { elpaBuild, stdenv, fetchurl }: + let fetch = { inherit fetchurl; }."${recipe.fetch.tag}" + or (abort "emacs-${name}: unknown fetcher '${recipe.fetch.tag}'"); + args = builtins.removeAttrs recipe.fetch [ "tag" ]; + src = fetch args; + in elpaBuild { + pname = name; + inherit (recipe) version; + inherit src; + deps = + let lookupDep = d: + self."${d}" or (abort "emacs-${name}: missing dependency ${d}"); + in map lookupDep recipe.deps; + meta = { + homepage = "http://elpa.gnu.org/packages/${name}.html"; + license = stdenv.lib.licenses.free; + }; + }; + in self.callPackage drv {}; + + packages = self: + let + elpaPackages = mapAttrs (mkPackage self) manifest; + + elpaBuild = import ../../../build-support/emacs/melpa.nix { + inherit (pkgs) lib stdenv fetchurl texinfo; + inherit (self) emacs; + }; + in elpaPackages // { inherit elpaBuild elpaPackages; }; + +in makeScope pkgs.newScope packages diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index ca8aca5c1e3..0e6cd48ceec 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -297,13 +297,13 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "9.0"; - build = "PS-141.1912"; + version = "10.0.1"; + build = "PS-143.382"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1n6p8xiv0nrs6yf0250mpga291msnrfamv573dva9f17cc3df2pp"; + sha256 = "12bqil8pxzmbv8a7pxn2529ph2x7szr3wvkvgxaisydm463kpdk8"; }; }; @@ -311,7 +311,7 @@ in name = "webstorm-${version}"; version = "10.0.4"; build = "141.1550"; - description = "Professional IDE for Web and JavaScript devlopment"; + description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 344293d3367..a27027406e2 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -15,15 +15,15 @@ with stdenv.lib; let - version = "0.1.0"; + version = "0.1.1"; # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness: - neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation { + neovimLibvterm = let version = "2015-11-06"; in stdenv.mkDerivation { name = "neovim-libvterm-${version}"; src = fetchFromGitHub { - sha256 = "0i2h74jrx4fy90sv57xj8g4lbjjg4nhrq2rv6rz576fmqfpllcc5"; - rev = "20ad1396c178c72873aeeb2870bd726f847acb70"; + sha256 = "0f9r0wnr9ajcdd6as24igmch0n8s1annycb9f4k0vg6fngwaypy9"; + rev = "04781d37ce5af3f580376dc721bd3b89c434966b"; repo = "libvterm"; owner = "neovim"; }; @@ -63,7 +63,7 @@ let name = "neovim-${version}"; src = fetchFromGitHub { - sha256 = "1704f3dqf5p6hicpzf0pi21n6ymylra9prsm4azvqp86allmvnfx"; + sha256 = "0crswjslp687yp1cpn7nmm0j2sccqhcxryzxv1s81cgpai0fzf60"; rev = "v${version}"; repo = "neovim"; owner = "neovim"; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 8f0c560f47d..0749f58ecea 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { { description = "Set of integrated tools for the R language"; homepage = http://www.rstudio.com/; license = licenses.agpl3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index ab7b08d8186..a09eb846e50 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { ]; }; + __impureHostDeps = [ "/dev/ptmx" ]; + # To fix the trouble in vim73, that it cannot cross-build with this patch # to bypass a configure script check that cannot be done cross-building. # http://groups.google.com/group/vim_dev/browse_thread/thread/66c02efd1523554b?pli=1 diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 13f9fe6bd77..39ba1f7265b 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -4,10 +4,10 @@ }: stdenv.mkDerivation { - name = "grass-7.0.1"; + name = "grass-7.0.2"; src = fetchurl { - url = http://grass.osgeo.org/grass70/source/grass-7.0.1.tar.gz; - sha256 = "0ps0xfsgls1hai8fx8x74ajh3560p1yjql2sg02lpqpx30bdv1q9"; + url = http://grass.osgeo.org/grass70/source/grass-7.0.2.tar.gz; + sha256 = "02qrdgn46gxr60amxwax4b8fkkmhmjxi6qh4yfvpbii6ai6diarf"; }; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix new file mode 100644 index 00000000000..84986e0d900 --- /dev/null +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, cmake, qt4 }: + +stdenv.mkDerivation rec { + name = "fontmatrix-0.6.0"; + src = fetchurl { + url = "http://fontmatrix.be/archives/${name}-Source.tar.gz"; + sha256 = "bcc5e929d95d2a0c9481d185144095c4e660255220a7ae6640298163ee77042c"; + }; + + buildInputs = [ qt4 ]; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; + homepage = http://fontmatrix.be/; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 462f657f2a7..9298c764d28 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "imv-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "eXeC64"; repo = "imv"; - rev = "f2ce793d628e88825eff3364b293104cb0bdb582"; - sha256 = "1xqaqbfjgksbjmy1yy7q4sv5bak7w8va60xa426jzscy9cib2sgh"; + rev = "4d1a6d581b70b25d9533c5c788aab6900ebf82bb"; + sha256 = "1c5r4pqqypir8ymicxyn2k7mhq8nl88b3x6giaafd77ssjn0vz9r"; }; buildInputs = [ SDL2 freeimage ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line image viewer for tiling window managers"; homepage = https://github.com/eXeC64/imv; - license = licenses.mit; + license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index ede0dc07afb..9f1f53abc5c 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, zlib, qt4, freetype, cairo, lua5, texLive, ghostscriptX -, libjpeg +{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texLive, ghostscriptX +, libjpeg, qtbase , makeWrapper }: let ghostscript = ghostscriptX; in stdenv.mkDerivation rec { - name = "ipe-7.1.8"; + name = "ipe-7.1.10"; src = fetchurl { - url = "http://github.com/otfried/ipe/raw/master/releases/7.1/${name}-src.tar.gz"; - sha256 = "1zx6dyr1rb6m6rvawagg9f8bc2li9nbighv2dglzjbh11bxqsyva"; + url = "https://dl.bintray.com/otfried/generic/ipe/7.1/${name}-src.tar.gz"; + sha256 = "0kwk8l2jasb4fdixaca08g661d0sdmx2jkk3ch7pxh0f4xkdxkkz"; }; # changes taken from Gentoo portage @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { LUA_PACKAGE = "lua"; buildInputs = [ - libjpeg pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper + libjpeg pkgconfig zlib qtbase freetype cairo lua5 texLive ghostscript makeWrapper ]; postInstall = '' diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 5c22854512a..069a4bace28 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pygtk, pil, python27Packages }: +{ stdenv, fetchurl, buildPythonPackage, python27Packages }: buildPythonPackage rec { namePrefix = ""; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0k3pqbvk08kb1nr0qldaj9bc7ca6rvcycgfi2n7gqmsirq5kscys"; }; - pythonPath = [ pygtk pil python27Packages.sqlite3 ]; + propagatedBuildInputs = with python27Packages; [ pygtk pillow sqlite3 ]; meta = { description = "Image viewer designed to handle comic books"; diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index 20f7460f7a1..c4b14388d1b 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, python, pygtk, pil, libX11, gettext }: +{ stdenv, fetchurl, buildPythonPackage, python, pygtk, pillow, libX11, gettext }: buildPythonPackage rec { namePrefix = ""; @@ -17,7 +17,7 @@ buildPythonPackage rec { sed -i "s@/usr/local/share/locale@$out/share/locale@" mirage.py ''; - pythonPath = [ pygtk pil ]; + propagatedBuildInputs = [ pygtk pillow ]; meta = { description = "Simple image viewer written in PyGTK"; diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index a067efe82ea..8ee39c135ef 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, makeWrapper, xulrunner }: stdenv.mkDerivation rec { - version = "2.0.14"; + version = "2.0.15"; name = "pencil-${version}"; src = fetchurl { url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz"; - sha256 = "59f46db863e6d95ee6987e600d658ad4b58b03b0744c5c6d17ce04f5ae92d260"; - + sha256 = "be338558b613f51506337a2c7c80f209e8644656c2925f41c294e2872feabc3b"; }; buildPhase = ""; diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix index 67b733dda7a..3de7057916a 100644 --- a/pkgs/applications/graphics/sane/backends-git.nix +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -7,12 +7,12 @@ in assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); stdenv.mkDerivation { - name = "sane-backends-1.0.24.73-g6c4f6bc"; + name = "sane-backends-1.0.25.177-g753d123"; src = fetchgit { url = "git://alioth.debian.org/git/sane/sane-backends.git"; - rev = "6c4f6bc58615755dc734281703b594cea3ebf848"; - sha256 = "0f7lbv1rnr53n4rpihcd8dkfm01xvwfnx9i1nqaadrzbpvgkjrfa"; + rev = "753d123f36d08cdb8047adac7c89a9fe015c4b25"; + sha256 = "1f5b4606f9b1b65a312794726e8d5d06056510b7426f86845ebeb8ca1a9b2f1f"; }; udevSupport = hotplugSupport; @@ -38,12 +38,19 @@ stdenv.mkDerivation { "echo epson2 > \${out}/etc/sane.d/dll.conf" else ""; - meta = { + meta = with stdenv.lib; { homepage = "http://www.sane-project.org/"; - description = "Scanner Access Now Easy"; - license = stdenv.lib.licenses.gpl2Plus; + description = "SANE (Scanner Access Now Easy) backends"; + longDescription = '' + Collection of open-source SANE backends (device drivers). + SANE is a universal scanner interface providing standardized access to + any raster image scanner hardware: flatbed scanners, hand-held scanners, + video- and still-cameras, frame-grabbers, etc. For a list of supported + scanners, see http://www.sane-project.org/sane-backends.html. + ''; + license = licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ nckx simons ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index 66fc4810e7d..fb943ac23b5 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -8,16 +8,16 @@ let firmware = gt68xxFirmware { inherit fetchurl; }; in stdenv.mkDerivation rec { - version = "1.0.24"; + version = "1.0.25"; name = "sane-backends-${version}"; src = fetchurl { urls = [ - "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-1.0.24.tar.gz/1ca68e536cd7c1852322822f5f6ac3a4/${name}.tar.gz" - "https://alioth.debian.org/frs/download.php/file/3958/${name}.tar.gz" + "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-1.0.25.tar.gz/f9ed5405b3c12f07c6ca51ee60225fe7/${name}.tar.gz" + "https://alioth.debian.org/frs/download.php/file/4146/${name}.tar.gz" ]; curlOpts = "--insecure"; - sha256 = "0ba68m6bzni54axjk15i51rya7hfsdliwvqyan5msl7iaid0iir7"; + sha256 = "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4"; }; outputs = [ "out" "doc" "man" ]; @@ -49,12 +49,19 @@ stdenv.mkDerivation rec { " \${out}/share/sane/snapscan/your-firmwarefile.bin" else ""; - meta = { + meta = with stdenv.lib; { homepage = "http://www.sane-project.org/"; - description = "Scanner Access Now Easy"; - license = stdenv.lib.licenses.gpl2Plus; + description = "SANE (Scanner Access Now Easy) backends"; + longDescription = '' + Collection of open-source SANE backends (device drivers). + SANE is a universal scanner interface providing standardized access to + any raster image scanner hardware: flatbed scanners, hand-held scanners, + video- and still-cameras, frame-grabbers, etc. For a list of supported + scanners, see http://www.sane-project.org/sane-backends.html. + ''; + license = licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ nckx simons ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 1943d24382a..4dd30697f0b 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb -, libxml2, makeWrapper, pkgconfig, saneBackends, systemd, vala }: +{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool +, libusb, libxml2, pkgconfig, saneBackends, vala, wrapGAppsHook }: let version = "3.19.2"; in stdenv.mkDerivation rec { @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 saneBackends - systemd vala ]; - nativeBuildInputs = [ intltool itstool makeWrapper pkgconfig ]; + vala ]; + nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; configureFlags = [ "--disable-packagekit" ]; @@ -25,11 +25,6 @@ stdenv.mkDerivation rec { doCheck = true; - preFixup = '' - wrapProgram "$out/bin/simple-scan" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - meta = with stdenv.lib; { inherit version; description = "Simple scanning utility"; diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix new file mode 100644 index 00000000000..0f85bf58c55 --- /dev/null +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, makeDesktopItem, unzip, jre }: + +let version = "0.2"; in +stdenv.mkDerivation rec { + name = "swingsane-${version}"; + + src = fetchurl { + sha256 = "15pgqgyw46yd2i367ax9940pfyvinyw2m8apmwhrn0ix5nywa7ni"; + url = "mirror://sourceforge/swingsane/swingsane-${version}-bin.zip"; + }; + + nativeBuildInputs = [ unzip ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = let + + execWrapper = '' + #!/bin/sh + exec ${jre}/bin/java -jar $out/share/java/swingsane/swingsane-${version}.jar "$@" + ''; + + desktopItem = makeDesktopItem { + name = "swingsane"; + exec = "swingsane"; + icon = "swingsane"; + desktopName = "SwingSane"; + genericName = "Scan from local or remote SANE servers"; + comment = meta.description; + categories = "Office;Application;"; + }; + + in '' + install -v -m 755 -d $out/share/java/swingsane/ + install -v -m 644 *.jar $out/share/java/swingsane/ + + echo "${execWrapper}" > swingsane + install -v -D -m 755 swingsane $out/bin/swingsane + + unzip -j swingsane-${version}.jar "com/swingsane/images/*.png" + install -v -D -m 644 swingsane_512x512.png $out/share/pixmaps/swingsane.png + + cp -v -r ${desktopItem}/share/applications $out/share + ''; + + meta = with stdenv.lib; { + inherit version; + description = "Java GUI for SANE scanner servers (saned)"; + longDescription = '' + SwingSane is a powerful, cross platform, open source Java front-end for + using both local and remote Scanner Access Now Easy (SANE) servers. + The most powerful feature is its ability to query back-ends for scanner + specific options which can be set by the user as a scanner profile. + It also has support for authentication, mutlicast DNS discovery, + simultaneous scan jobs, image transformation jobs (deskew, binarize, + crop, etc), PDF and PNG output. + ''; + homepage = http://swingsane.com/; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/default.nix b/pkgs/applications/kde-apps-15.08/kdelibs/default.nix index 49a8e1a11c3..91c1f3af448 100644 --- a/pkgs/applications/kde-apps-15.08/kdelibs/default.nix +++ b/pkgs/applications/kde-apps-15.08/kdelibs/default.nix @@ -1,5 +1,5 @@ { kdeApp, attica, attr, automoc4, avahi, bison, cmake -, docbook_xml_dtd_42, docbook_xsl, flex, giflib, herqq, ilmbase +, docbook_xml_dtd_42, docbook_xsl, flex, giflib, ilmbase , libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig , polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info , soprano, strigi, udev, xz, pcre @@ -10,7 +10,7 @@ kdeApp { name = "kdelibs"; buildInputs = [ - attica attr avahi giflib herqq libdbusmenu_qt libjpeg libxml2 + attica attr avahi giflib libdbusmenu_qt libjpeg libxml2 polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre ]; propagatedBuildInputs = [ qt4 soprano phonon strigi ]; @@ -30,7 +30,6 @@ kdeApp { cmakeFlags = [ "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" - "-DHUPNP_ENABLED=ON" "-DWITH_SOLID_UDISKS2=ON" "-DKDE_DEFAULT_HOME=.kde" ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index c8ee0ac1e96..de5e4f26534 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite -, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp +, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp , xdg_utils }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg - fontconfig podofo qt5.base pil chmlib icu sqlite libusb1 libmtp xdg_utils + fontconfig podofo qt5.base chmlib icu sqlite libusb1 libmtp xdg_utils pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index 78cd08e212c..0a7fb1e5f3f 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, gtk, libnotify, unzip, glib, pkgconfig }: +{ stdenv, fetchzip, gtk, libnotify, unzip, glib, pkgconfig }: stdenv.mkDerivation rec { name = "cbatticon-${version}"; version = "1.4.2"; - src = fetchurl { + src = fetchzip { url = "https://github.com/valr/cbatticon/archive/${version}.zip"; - sha256 = "1jkaar987ayydgghl8s8f1yy41mcmhqvgw897jv4y8yliskn0604"; + sha256 = "0ixkxvlrn84b8nh75c9s2gvxnycis89mf047iz8j38814979di5l"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 1b2e518c5a7..df997ad6e0b 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { ''; homepage = https://electrum.org; license = licenses.gpl3; - maintainers = with maintainers; [ emery joachifm ]; + maintainers = with maintainers; [ ehmry joachifm ]; }; } diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 32a16e79c21..9a7fad6a207 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, pkgconfig, qt4, libXtst, libvorbis, hunspell, libao, ffmpeg, libeb, lzo, xz, libtiff }: stdenv.mkDerivation rec { - name = "goldendict-1.5.0.20150801"; + name = "goldendict-1.5.0.ec86515"; src = fetchFromGitHub { owner = "goldendict"; repo = "goldendict"; - rev = "b4bb1e9635c764aa602fbeaeee661f35e461d062"; - sha256 = "0dhaa0nii226541al3i2d8x8h7cfh96w5vkw3pa3l74llgrj7yx2"; + rev = "ec865158f5b7116f629e4d451a39ee59093eefa5"; + sha256 = "070majwxbn15cy7sbgz7ljl8rkn7vcgkm10884v97csln7bfzwhr"; }; buildInputs = [ pkgconfig qt4 libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff ]; diff --git a/pkgs/applications/misc/kgocode/default.nix b/pkgs/applications/misc/kgocode/default.nix new file mode 100644 index 00000000000..5e72b02045c --- /dev/null +++ b/pkgs/applications/misc/kgocode/default.nix @@ -0,0 +1,21 @@ +{ fetchgit, stdenv, cmake, kdelibs } : + +stdenv.mkDerivation rec { + name = "kgocode-0.0.1"; + + buildInputs = [ cmake kdelibs ]; + + src = fetchgit { + url = https://bitbucket.org/lucashnegri/kgocode.git; + rev = "024536e4b2f371db4f51c1d80fb6b444352ff6a6"; + sha256 = "1cjxcy4w46rbx90jrikklh9vw7nz641gq7xlvrq3pjsszxn537gq"; + }; + + meta = with stdenv.lib; { + description = "a plugin for KTextEditor (Kate, KDevelop, among others) that provides basic code completion for the Go programming language. Uses gocode as completion provider"; + homepage = https://bitbucket.org/lucashnegri/kgocode/overview; + maintainers = with maintainers; [ qknight ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index 65483c80823..1fa5d1a28d5 100644 --- a/pkgs/applications/misc/monero/default.nix +++ b/pkgs/applications/misc/monero/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { description = "Private, secure, untraceable currency"; homepage = http://monero.cc/; license = licenses.bsd3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index b39eeac6878..c79d9c037d1 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -1,8 +1,6 @@ { stdenv , makeWrapper , fetchurl -, wxPython -, libXmu , cabextract , gettext , glxinfo @@ -11,18 +9,46 @@ , imagemagick , netcat , p7zip -, python +, python2Packages , unzip , wget , wine , xdg-user-dirs , xterm +, pkgs +, pkgsi686Linux }: -stdenv.mkDerivation rec { - name = "playonlinux-${version}"; +let version = "4.2.9"; + binpath = stdenv.lib.makeSearchPath "bin" + [ cabextract + python2Packages.python + gettext + glxinfo + gnupg1compat + icoutils + imagemagick + netcat + p7zip + unzip + wget + wine + xdg-user-dirs + xterm + ]; + + ld32 = + if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" + else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" + else abort "Unsupported platform for PlayOnLinux: ${stdenv.system}"; + ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; + libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xlibs.libX11 ]; + +in stdenv.mkDerivation { + name = "playonlinux-${version}"; + src = fetchurl { url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz"; sha256 = "89bb0fd7cce8cf598ebf38cad716b8587eaca5b916d54386fb24b3ff66b48624"; @@ -31,74 +57,34 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = - [ wxPython - libXmu - cabextract - gettext - glxinfo - gnupg1compat - icoutils - imagemagick - netcat - p7zip - python - unzip - wget - wine - xdg-user-dirs - xterm + [ python2Packages.python + python2Packages.wxPython + python2Packages.setuptools ]; patchPhase = '' - PYFILES="python/*.py python/lib/*.py tests/python/*.py" - sed -i "s/env python[0-9.]*/python/" $PYFILES + patchShebangs python tests/python sed -i "s/ %F//g" etc/PlayOnLinux.desktop ''; installPhase = '' install -d $out/share/playonlinux - install -d $out/bin cp -r . $out/share/playonlinux/ - echo "#!${stdenv.shell}" > $out/bin/playonlinux - echo "$prefix/share/playonlinux/playonlinux \"\$@\"" >> $out/bin/playonlinux - chmod +x $out/bin/playonlinux - install -D -m644 etc/PlayOnLinux.desktop $out/share/applications/playonlinux.desktop - ''; - preFixupPhases = [ "preFixupPhase" ]; + makeWrapper $out/share/playonlinux/playonlinux $out/bin/playonlinux \ + --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ + --prefix PATH : ${binpath} - preFixupPhase = '' - for f in $out/bin/*; do - wrapProgram $f \ - --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ - --prefix PATH : \ - ${cabextract}/bin:\ - ${gettext}/bin:\ - ${glxinfo}/bin:\ - ${gnupg1compat}/bin:\ - ${icoutils}/bin:\ - ${imagemagick}/bin:\ - ${netcat}/bin:\ - ${p7zip}/bin:\ - ${python}/bin:\ - ${unzip}/bin:\ - ${wget}/bin:\ - ${wine}/bin:\ - ${xdg-user-dirs}/bin:\ - ${xterm}/bin - - done - - for f in $out/share/playonlinux/bin/*; do - bunzip2 $f - done - ''; - - postFixupPhases = [ "postFixupPhase" ]; - - postFixupPhase = '' + bunzip2 $out/share/playonlinux/bin/check_dd_x86.bz2 + patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${libs pkgsi686Linux} $out/share/playonlinux/bin/check_dd_x86 + ${if stdenv.system == "x86_64-linux" then '' + bunzip2 $out/share/playonlinux/bin/check_dd_amd64.bz2 + patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${libs pkgs} $out/share/playonlinux/bin/check_dd_amd64 + '' else '' + rm $out/share/playonlinux/bin/check_dd_amd64.bz2 + ''} for f in $out/share/playonlinux/bin/*; do bzip2 $f done @@ -109,6 +95,6 @@ stdenv.mkDerivation rec { homepage = https://www.playonlinux.com/; license = licenses.gpl3; maintainers = [ maintainers.a1russell ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 06a7e3bcd7e..8b527463b22 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { homepage = https://centrabit.com/; license = licenses.lgpl3; platforms = qt.meta.platforms; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; }; } diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 6e5404eb686..ad2f5f74cce 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig -, geoclue +, geoclue2 , guiSupport ? true, hicolor_icon_theme, gtk3, python, pygobject3, pyxdg , drmSupport ? true, libdrm , randrSupport ? true, libxcb @@ -17,7 +17,7 @@ stdenv.mkDerivation { url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"; }; - buildInputs = [ geoclue ] + buildInputs = [ geoclue2 ] ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python pygobject3 pyxdg ] ++ stdenv.lib.optionals drmSupport [ libdrm ] ++ stdenv.lib.optionals randrSupport [ libxcb ] diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix deleted file mode 100644 index 7a8c9dfd71e..00000000000 --- a/pkgs/applications/misc/rofi/pass.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchgit, rofi, wmctrl, xprop, xdotool}: - -stdenv.mkDerivation rec { - name = "rofi-pass-${version}"; - version = "1.2"; - - src = fetchgit { - url = "https://github.com/carnager/rofi-pass"; - rev = "refs/tags/${version}"; - sha256 = "1dlaplr18qady5g8sp8xgiqdw81mfx9iisihf8appr5s4sjm559h"; - }; - - buildInputs = [ rofi wmctrl xprop xdotool ]; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/bin - cp -a $src/rofi-pass $out/bin/rofi-pass - - mkdir -p $out/share/doc/rofi-pass/ - cp -a $src/config.example $out/share/doc/rofi-pass/config.example - ''; - - meta = { - description = "A script to make rofi work with password-store"; - homepage = https://github.com/carnager/rofi-pass; - maintainers = [stdenv.lib.maintainers.hiberno]; - }; -} diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index 02d26f66001..f0a48cfb8d4 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Extract URLs from text"; homepage = http://packages.qa.debian.org/u/urlview.html; licencse = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 19fd910195f..7616eddd16b 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "viking-${version}"; - version = "1.6"; + version = "1.6.1"; src = fetchurl { url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2"; - sha256 = "02ljnnc1in3cnafmld93qvzgx3j4qsgac2a53q18s6sp5hvvvw91"; + sha256 = "0ic445f85z1sdx1ifgcijn379m7amr5mcjpg10343972sam4rz1s"; }; buildInputs = [ makeWrapper pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 64b9009f152..e861973b13c 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "xca-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "mirror://sourceforge/xca/${name}.tar.gz"; - sha256 = "10rxma0zm7vryzv69m0aqlvmbf82d261wa77kxni4h3lndwqvpf2"; + sha256 = "1r2w9gpahjv221j963bd4vn0gj4cxmb9j42f3cd9qdn890hizw84"; }; postInstall = '' diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index f580c41c0a4..9a912353281 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { ''; homepage = http://xcruiser.sourceforge.net/; license = licenses.gpl2; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; }; } diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index e662e9bf836..c1f2cbbce4d 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -12,9 +12,6 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - ${optionalString (versionOlder base.version "44.0.0.0") '' - cp -v "$buildPath/libffmpegsumo.so" "$libExecPath/" - ''} cp -v "$buildPath/chrome" "$libExecPath/$packageName" cp -v "$buildPath/chrome_sandbox" "$libExecPath/chrome-sandbox" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 943c87bd0a3..a9ecfca494a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -5,7 +5,7 @@ , libevent, expat, libjpeg, snappy , libpng, libxml2, libxslt, libcap , xdg_utils, yasm, minizip, libwebp -, libusb1, libexif, pciutils +, libusb1, libexif, pciutils, nss , python, pythonPackages, perl, pkgconfig , nspr, libudev, kerberos @@ -22,7 +22,6 @@ , enableSELinux ? false, libselinux ? null , enableNaCl ? false , enableHotwording ? false -, useOpenSSL ? false, nss ? null, openssl ? null , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome_keyring3 ? null , proprietaryCodecs ? true @@ -65,7 +64,6 @@ let use_system_opus = true; use_system_snappy = true; use_system_speex = true; - use_system_ssl = useOpenSSL; use_system_stlport = true; use_system_xdg_utils = true; use_system_yasm = true; @@ -107,8 +105,7 @@ let buildInputs = defaultDependencies ++ [ which python perl pkgconfig - nspr libudev - (if useOpenSSL then openssl else nss) + nspr nss libudev utillinux alsaLib bison gperf kerberos glib gtk dbus_glib @@ -155,7 +152,6 @@ let linux_link_pulseaudio = pulseSupport; disable_nacl = !enableNaCl; enable_hotwording = enableHotwording; - use_openssl = useOpenSSL; selinux = enableSELinux; use_cups = cupsSupport; } // { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 9a7f4a2757e..bf870e144e5 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -5,7 +5,6 @@ , enableSELinux ? false , enableNaCl ? false , enableHotwording ? false -, useOpenSSL ? false , gnomeSupport ? false , gnomeKeyringSupport ? false , proprietaryCodecs ? true @@ -23,11 +22,10 @@ let source = callPackage ./source { inherit channel; # XXX: common config - inherit useOpenSSL; }; mkChromiumDerivation = callPackage ./common.nix { - inherit enableSELinux enableNaCl enableHotwording useOpenSSL gnomeSupport + inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport hiDPISupport; }; diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index da962c6b768..4e568aed594 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, fetchpatch, patchutils, python , channel ? "stable" -, useOpenSSL # XXX }: with stdenv.lib; @@ -36,8 +35,6 @@ in stdenv.mkDerivation { --exclude='*/.*' ''; - opensslPatches = optional useOpenSSL openssl.patches; - prePatch = '' for i in $outputs; do eval patchShebangs "\$$i" @@ -45,10 +42,8 @@ in stdenv.mkDerivation { ''; patches = - (if versionOlder version "45.0.0.0" - then singleton ./nix_plugin_paths_44.patch - else singleton ./nix_plugin_paths_46.patch ++ - optional (!versionOlder version "46.0.0.0") ./build_fixes_46.patch) ++ + singleton ./nix_plugin_paths_46.patch ++ + singleton ./build_fixes_46.patch ++ singleton ./widevine.patch; patchPhase = let @@ -71,8 +66,6 @@ in stdenv.mkDerivation { -e 's|/bin/echo|echo|' \ -e "/python_arch/s/: *'[^']*'/: '""'/" \ "$out/build/common.gypi" "$main/chrome/chrome_tests.gypi" - '' + optionalString useOpenSSL '' - cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl" ''; passthru = { diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch deleted file mode 100644 index 326da7f420a..00000000000 --- a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index 8a205a6..d5c24e1 100644 ---- a/chrome/common/chrome_paths.cc -+++ b/chrome/common/chrome_paths.cc -@@ -97,21 +97,14 @@ static base::LazyInstance - g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; - - // Gets the path for internal plugins. --bool GetInternalPluginsDirectory(base::FilePath* result) { --#if defined(OS_MACOSX) && !defined(OS_IOS) -- // If called from Chrome, get internal plugins from a subdirectory of the -- // framework. -- if (base::mac::AmIBundled()) { -- *result = chrome::GetFrameworkBundlePath(); -- DCHECK(!result->empty()); -- *result = result->Append("Internet Plug-Ins"); -- return true; -- } -- // In tests, just look in the module directory (below). --#endif -- -- // The rest of the world expects plugins in the module directory. -- return PathService::Get(base::DIR_MODULE, result); -+bool GetInternalPluginsDirectory(base::FilePath* result, -+ const std::string& ident) { -+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; -+ const char* value = getenv(full_env.c_str()); -+ if (value == NULL) -+ return PathService::Get(base::DIR_MODULE, result); -+ else -+ *result = base::FilePath(value); - } - - } // namespace -@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) { - create_dir = true; - break; - case chrome::DIR_INTERNAL_PLUGINS: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "ALL")) - return false; - break; - case chrome::DIR_PEPPER_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) - return false; - cur = cur.Append(kPepperFlashBaseDirectory); - break; -@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.Append(FILE_PATH_LITERAL("script.log")); - break; - case chrome::FILE_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "FILEFLASH")) - return false; - cur = cur.Append(kInternalFlashPluginFileName); - break; -@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) { - // We currently need a path here to look up whether the plugin is disabled - // and what its permissions are. - case chrome::FILE_NACL_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "NACL")) - return false; - cur = cur.Append(kInternalNaClPluginFileName); - break; -@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.DirName(); - } - #else -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PNACL")) - return false; - #endif - cur = cur.Append(FILE_PATH_LITERAL("pnacl")); -@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) { - // In the component case, this is the source adapter. Otherwise, it is the - // actual Pepper module that gets loaded. - case chrome::FILE_WIDEVINE_CDM_ADAPTER: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE")) - return false; - cur = cur.AppendASCII(kWidevineCdmAdapterFileName); - break; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 3ce3dd813c1..55facf55438 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "47.0.2508.0"; - sha256 = "1jmcvbimj3x91czvclnqbp8w2nfqhk2bd7bw9yd37c576md1wnw2"; - sha256bin32 = "10spq63yfyzw419bz22r2g5rmnaxy5861715mkrcbpfm8cylzmzh"; - sha256bin64 = "1ycdp37ikdc9w4hp9qgpzjp47zh37g01ax8x4ack202vrv0dxhsh"; + version = "48.0.2564.22"; + sha256 = "18kk8vmv7c8dsxdghvrjl90davm0gc4wdvs5zmsgiymlw1c6qpaj"; + sha256bin32 = "1b10bb83npnn24fxl7jqkrhjzhk211cgf1f2ykx50z3cc41v4rvp"; + sha256bin64 = "0a3w22blkpnk1wdg201ixm8jm7lrn4md64wcllmm69z433flrg1b"; }; beta = { - version = "46.0.2490.64"; - sha256 = "1k2zir4rbs7hwdasbjpwyjr4ibis2vm6lx45bfm2r2f469mf3y2g"; - sha256bin32 = "0j1xncws0r5z2rvvjsi0gxxmnslfcbiasaxr6bjhbxnzjv7chrd4"; - sha256bin64 = "1m8vv3qh79an3719afz7n2ijqanf4cyxz2q4bzm512x52z5zipl7"; + version = "48.0.2564.23"; + sha256 = "0rhjrvxsxv84jahnph26lbivfa6g48qmv1mw6wysjx8rvfpfx9g9"; + sha256bin32 = "17330cv6zv25z5y6pbfc9hb7vk77yggvcdggknkvvbfd0p6mrf4z"; + sha256bin64 = "0d3r64ipgigjqgnr57lklk5icv2snd2gq9w6aw7apfx61qlbnxly"; }; stable = { - version = "45.0.2454.101"; - sha256 = "1yw5xlgy5hd3iwcyf0sillq5p367fcpvp4mizpmv52cwmv52ss0v"; - sha256bin32 = "1ll8lmkmx7v74naz1vcnrwk5ighh0skfcb66jkq4kgxrb5fjgwm5"; - sha256bin64 = "1cwbd3n77dnbfnrfr8g0qng9xkgvz6y7mx489gpx1wsamgi42bzj"; + version = "47.0.2526.73"; + sha256 = "1xgl2pmvfxnm2pk4p4p4v642ip0cxxjysc1xy4pmdxnzilfd0rkd"; + sha256bin32 = "1y9g14s81xanp70l0s6grszn4q0acn4rgm46i5kigf37s1cbwagy"; + sha256bin64 = "1y00znk5cfd1nvh4dx92b0m8q38849i25a18zg2lhvjqrpq097za"; }; } diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index d5e73c3be7d..353c133ee5d 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig intltool vala makeWrapper - webkitgtk librsvg libnotify sqlite + webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas (libsoup.override {gnomeSupport = true;}) ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 5f790fc9cea..fbf8f95a388 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.540"; + version = "11.2.202.554"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "0zya9n5h669wbna182ig6dl4yf5sv4lvqk19rqhcwv3i718b0ai6"; + sha256 = "15zziclffvsa0wpygkwzbh3v367n73pmzwsnkanhg75rv28dgl3x"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "1n8ik5f257s388ql7gkmfh1iqil0g4kzxh3zsv2x8r6ssrvpq1by"; + sha256 = "1a26l6lz5l6qbx4lm7266pzk0zr77h6issbnayr6df9qj99bppyz"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix index 10b2ffaff5b..ad3c1a715b3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { { description = "Plugin for browser to TREZOR device communication"; homepage = https://mytrezor.com; license = licenses.unfree; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; }; } \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index d8c421af46a..bea74f62358 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl -, sslSupport ? true -, graphicsSupport ? false -, mouseSupport ? false -, ncurses, openssl ? null, boehmgc, gettext, zlib -, imlib2 ? null, xlibsWrapper ? null, fbcon ? null -, gpm-ncurses ? null +, ncurses, boehmgc, gettext, zlib +, sslSupport ? true, openssl ? null +, graphicsSupport ? true, imlib2 ? null +, x11Support ? graphicsSupport, libX11 ? null +, mouseSupport ? !stdenv.isDarwin, gpm-ncurses ? null }: assert sslSupport -> openssl != null; -assert graphicsSupport -> imlib2 != null && (xlibsWrapper != null || fbcon != null); +assert graphicsSupport -> imlib2 != null; +assert x11Support -> graphicsSupport && libX11 != null; assert mouseSupport -> gpm-ncurses != null; +with stdenv.lib; + stdenv.mkDerivation rec { name = "w3m-0.5.3"; @@ -19,19 +21,24 @@ stdenv.mkDerivation rec { sha256 = "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579"; }; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lsocket -lnsl"; + patches = [ ./glibc214.patch ] # Patch for the newer unstable boehm-gc 7.2alpha. Not all platforms use that # alpha. At the time of writing this, boehm-gc-7.1 is the last stable. - ++ stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ] - ++ stdenv.lib.optional stdenv.isCygwin ./cygwin.patch; + ++ optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ] + ++ optional stdenv.isCygwin ./cygwin.patch + # for frame buffer only version + ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ]; buildInputs = [ncurses boehmgc gettext zlib] - ++ stdenv.lib.optional sslSupport openssl - ++ stdenv.lib.optional mouseSupport gpm-ncurses - ++ stdenv.lib.optionals graphicsSupport [imlib2 xlibsWrapper fbcon]; + ++ optional sslSupport openssl + ++ optional mouseSupport gpm-ncurses + ++ optional graphicsSupport imlib2 + ++ optional x11Support libX11; configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}" - + stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb"; + + optionalString graphicsSupport " --enable-image=${optionalString x11Support "x11,"}fb"; preConfigure = '' substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path @@ -40,7 +47,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - meta = with stdenv.lib; { + # for w3mimgdisplay + LIBS = optionalString x11Support "-lX11"; + + meta = { homepage = http://w3m.sourceforge.net/; description = "A text-mode web browser"; maintainers = [ maintainers.mornfall ]; diff --git a/pkgs/applications/networking/browsers/w3m/no-x11.patch b/pkgs/applications/networking/browsers/w3m/no-x11.patch new file mode 100644 index 00000000000..83b3e96821f --- /dev/null +++ b/pkgs/applications/networking/browsers/w3m/no-x11.patch @@ -0,0 +1,15 @@ +Forget about X11 in fb module. +This breaks w3mimgdisplay under X11, but removes X11 dependency it in pure fb. +diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c +index ea36637..d3d7bc3 100644 +--- a/w3mimg/fb/fb_imlib2.c ++++ b/w3mimg/fb/fb_imlib2.c +@@ -3,7 +3,7 @@ + fb_imlib2.c 0.3 Copyright (C) 2002, hito + **************************************************************************/ + +-#include ++#define X_DISPLAY_MISSING + #include + #include "fb.h" + #include "fb_img.h" diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 6e7b6b6ac02..892d8fa3300 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, pkgconfig, fetchurl, python, dropbox }: let - version = "2015.02.12"; + version = "2015.10.28"; dropboxd = "${dropbox}/bin/dropbox"; in stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2"; - sha256 = "12md01ymxsly1rdhdi2sw3aiwykd4y8z8isipc8mjfk8bbp55q86"; + sha256 = "1ai6vi5227z2ryxl403693xi63b42ylyfmzh8hbv4shp69zszm9c"; }; buildInputs = [ pkgconfig python ]; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index dc11c086f9f..7a615277d2c 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -20,11 +20,11 @@ let # NOTE: When updating, please also update in current stable, as older versions stop working - version = "3.10.11"; + version = "3.12.4"; sha256 = { - "x86_64-linux" = "1bs8bscg9sihpmcdrsi1y4128a03s82fwb4df459afx459i7ir82"; - "i686-linux" = "0cl868m303fsqv5ac8d8ygjywm6wgmirs60f35l1piv13cyj92ll"; + "x86_64-linux" = "0xq5gjqmrl4fn6vp7krj44jhb71npxvsjzbqb01whyyw7mdlc8gf"; + "i686-linux" = "093bfnak5xv50p9fxpr68w25hc1d08fcvrqnb4a6nb9wdfv3lkr6"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 4635814e11c..9f107559551 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { { description = "FIFO based tox client"; homepage = http://ratox.2f30.org/; license = licenses.isc; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index c7921b8553b..f84a3367d52 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -42,10 +42,30 @@ stdenv.mkDerivation rec { preFixup = if stdenv.isDarwin then '' + set -e + + die() { + >&2 echo "$@" + exit 1 + } + prg="$out/bin/notmuch" - target="libnotmuch.3.dylib" - echo "$prg: fixing link to $target" - install_name_tool -change "$target" "$out/lib/$target" "$prg" + lib="$(find "$out/lib" -name 'libnotmuch.?.dylib')" + + [[ -s "$prg" ]] || die "couldn't find notmuch binary" + [[ -s "$lib" ]] || die "couldn't find libnotmuch" + + badname="$(otool -L "$prg" | awk '$1 ~ /libtalloc/ { print $1 }')" + goodname="$(find "${talloc}/lib" -name 'libtalloc.?.?.?.dylib')" + + [[ -n "$badname" ]] || die "couldn't find libtalloc reference in binary" + [[ -n "$goodname" ]] || die "couldn't find libtalloc in nix store" + + echo "fixing libtalloc link in $lib" + install_name_tool -change "$badname" "$goodname" "$lib" + + echo "fixing libtalloc link in $prg" + install_name_tool -change "$badname" "$goodname" "$prg" '' else ""; @@ -58,6 +78,6 @@ stdenv.mkDerivation rec { description = "Mail indexer"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ chaoflow garbas ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index 84cf023776e..6aa1ec76253 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The slrn (S-Lang read news) newsreader"; homepage = http://slrn.sourceforge.net/index.html; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; }; } diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix index e7be81def61..6b1a1fc9454 100644 --- a/pkgs/applications/networking/p2p/firestr/default.nix +++ b/pkgs/applications/networking/p2p/firestr/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { description = "Grass computing platform"; homepage = http://firestr.com/; license = licenses.gpl3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 5f7ad92f7cc..b1181960f41 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = http://dev.yorhel.nl/ncdc; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; # arbitrary - maintainers = [ stdenv.lib.maintainers.emery ]; + maintainers = [ stdenv.lib.maintainers.ehmry ]; }; } diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 5d76b295dda..dc80d7d34de 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { { description = "GTK remote control for the Transmission BitTorrent client"; homepage = https://github.com/ajf8/transmission-remote-gtk; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index a96d0f9cc67..b2a578ddc1d 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pythonPackages.twisted pythonPackages.gmpy pythonPackages.netifaces - pythonPackages.pil + pythonPackages.pillow pythonPackages.pycrypto pythonPackages.pyasn1 pythonPackages.requests diff --git a/pkgs/applications/networking/remote/teamviewer/10.nix b/pkgs/applications/networking/remote/teamviewer/10.nix deleted file mode 100644 index 5de60180c69..00000000000 --- a/pkgs/applications/networking/remote/teamviewer/10.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, -wineUnstable, makeWrapper, libXau , patchelf, config }: - -with stdenv.lib; - -let - topath = "${wineUnstable}/bin"; - - toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") - [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); -in -stdenv.mkDerivation { - name = "teamviewer-10.0.37742"; - src = fetchurl { - url = config.teamviewer10.url or "http://download.teamviewer.com/download/teamviewer_amd64.deb"; - sha256 = config.teamviewer10.sha256 or "10risay1a5a85ijbjaz2vxqbfxygpxslvh0dvzz32k988hr9p1gk"; - }; - - buildInputs = [ makeWrapper patchelf ]; - - unpackPhase = '' - ar x $src - tar xf data.tar.gz - ''; - - installPhase = '' - mkdir -p $out/share/teamviewer $out/bin - cp -a opt/teamviewer/* $out/share/teamviewer - rm -R $out/share/teamviewer/tv_bin/wine/{bin,lib,share} - - cat > $out/bin/teamviewer << EOF - #!${stdenv.shell} - export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} - export PATH=${topath}\''${PATH:+:\$PATH} - $out/share/teamviewer/tv_bin/script/teamviewer "\$@" - EOF - chmod +x $out/bin/teamviewer - - ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin/ - rm -rf $out/share/teamviewer/logfiles $out/share/teamviewer/config - ln -sv /var/tmp/teamviewer10/logs/ $out/share/teamviewer/logfiles - ln -sv /var/tmp/teamviewer10/config/ $out/share/teamviewer/config - ''; - - # the fixupPhase undoes the rpath patch - postFixup = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd - patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd - ''; - - meta = { - homepage = "http://www.teamviewer.com"; - license = licenses.unfree; - description = "Desktop sharing application, providing remote support and online meetings"; - maintainers = with maintainers; [ jagajaga ]; - }; -} diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix deleted file mode 100644 index 28b272045b7..00000000000 --- a/pkgs/applications/networking/remote/teamviewer/8.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau -, bash, patchelf, config }: - -let - topath = "${wineUnstable}/bin"; - - toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") - [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); -in -stdenv.mkDerivation { - name = "teamviewer-8.0.17147"; - src = fetchurl { - url = config.teamviewer8.url or "http://download.teamviewer.com/download/version_8x/teamviewer_linux_x64.deb"; - sha256 = config.teamviewer8.sha256 or "0s5m15f99rdmspzwx3gb9mqd6jx1bgfm0d6rfd01k9rf7gi7qk0k"; - }; - - buildInputs = [ makeWrapper patchelf ]; - - unpackPhase = '' - ar x $src - tar xf data.tar.gz - ''; - - installPhase = '' - mkdir -p $out/share/teamviewer8 $out/bin - cp -a opt/teamviewer8/* $out/share/teamviewer8 - rm -R $out/share/teamviewer8/tv_bin/wine/{bin,lib,share} - - cat > $out/bin/teamviewer << EOF - #!${bash}/bin/sh - export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} - export PATH=${topath}\''${PATH:+:\$PATH} - $out/share/teamviewer8/tv_bin/script/teamviewer "\$@" - EOF - chmod +x $out/bin/teamviewer - - patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer8/tv_bin/teamviewerd - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer8/tv_bin/teamviewerd - ln -s $out/share/teamviewer8/tv_bin/teamviewerd $out/bin/ - ''; - - meta = { - homepage = "http://www.teamviewer.com"; - license = stdenv.lib.licenses.unfree; - description = "Desktop sharing application, providing remote support and online meetings"; - }; -} diff --git a/pkgs/applications/networking/remote/teamviewer/9.nix b/pkgs/applications/networking/remote/teamviewer/9.nix deleted file mode 100644 index 9b272a618b5..00000000000 --- a/pkgs/applications/networking/remote/teamviewer/9.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau -, bash, patchelf, config }: - -let - topath = "${wineUnstable}/bin"; - - toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") - [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); -in -stdenv.mkDerivation { - name = "teamviewer-9.0.32150"; - src = fetchurl { - url = config.teamviewer9.url or "http://download.teamviewer.com/download/version_9x/teamviewer_linux_x64.deb"; - sha256 = config.teamviewer9.sha256 or "0wpwbx0xzn3vlzavszxhfvfcaj3pijlpwvlz5m7w19mb6cky3q13"; - }; - - buildInputs = [ makeWrapper patchelf ]; - - unpackPhase = '' - ar x $src - tar xf data.tar.gz - ''; - - installPhase = '' - mkdir -p $out/share/teamviewer9 $out/bin - cp -a opt/teamviewer9/* $out/share/teamviewer9 - rm -R $out/share/teamviewer9/tv_bin/wine/{bin,lib,share} - - cat > $out/bin/teamviewer << EOF - #!${bash}/bin/sh - export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} - export PATH=${topath}\''${PATH:+:\$PATH} - $out/share/teamviewer9/tv_bin/script/teamviewer "\$@" - EOF - chmod +x $out/bin/teamviewer - - patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer9/tv_bin/teamviewerd - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd - ln -s $out/share/teamviewer9/tv_bin/teamviewerd $out/bin/ - ''; - - meta = { - homepage = "http://www.teamviewer.com"; - license = stdenv.lib.licenses.unfree; - description = "Desktop sharing application, providing remote support and online meetings"; - }; -} diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix new file mode 100644 index 00000000000..2c70d44570c --- /dev/null +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -0,0 +1,86 @@ +{ stdenv, lib, fetchurl, xdg_utils, pkgs, pkgsi686Linux }: + +let + version = "11.0.52520"; + + ld32 = + if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" + else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" + else abort "Unsupported architecture"; + ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; + + mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]); + + deps = ps: (with ps; [ dbus alsaLib fontconfig freetype libpng libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst ]); + tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux); + tvldpath64 = lib.makeLibraryPath (deps pkgs); + +in +stdenv.mkDerivation { + name = "teamviewer-${version}"; + src = fetchurl { + # There is a 64-bit package, but it has no differences apart from Debian dependencies. + # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason. + url = "http://download.teamviewer.com/download/teamviewer_${version}_i386.deb"; + sha256 = "1430dimcv69plpj0ad0wsn10k15x9fwlk6fiq7yz51qbcr5l9wk6"; + }; + + unpackPhase = '' + ar x $src + tar xf data.tar.* + ''; + + installPhase = '' + mkdir -p $out/share/teamviewer $out/bin $out/share/applications + cp -a opt/teamviewer/* $out/share/teamviewer + rm -R \ + $out/share/teamviewer/logfiles \ + $out/share/teamviewer/config \ + $out/share/teamviewer/tv_bin/{xdg-utils,RTlib} \ + $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh} + + ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin + ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin + ln -s $out/share/teamviewer/tv_bin/desktop/teamviewer-teamviewer*.desktop $out/share/applications + ln -s /var/lib/teamviewer $out/share/teamviewer/config + ln -s /var/log/teamviewer $out/share/teamviewer/logfiles + ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils + + pushd $out/share/teamviewer/tv_bin + + sed -i "s,TV_LD32_PATH=.*,TV_LD32_PATH=$(cat ${ld32})," script/tvw_config + ${if stdenv.system == "x86_64-linux" then '' + sed -i "s,TV_LD64_PATH=.*,TV_LD64_PATH=$(cat ${ld64})," script/tvw_config + '' else '' + sed -i ",TV_LD64_PATH=.*,d" script/tvw_config + ''} + + sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/teamviewer-*.desktop + + for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/*; do + echo "patching $i" + patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${tvldpath32} $i || true + done + for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so; do + echo "patching $i" + patchelf --set-rpath ${tvldpath32} $i || true + done + ${if stdenv.system == "x86_64-linux" then '' + patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64 + '' else '' + rm TVGuiSlave.64 + ''} + popd + ''; + + dontPatchELF = true; + dontStrip = true; + + meta = with stdenv.lib; { + homepage = "http://www.teamviewer.com"; + license = licenses.unfree; + description = "Desktop sharing application, providing remote support and online meetings"; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ jagajaga ]; + }; +} diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 5e29e3cfd0d..5e09beb4c47 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "A fast incremental file transfer utility"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ simons emery ]; + maintainers = with maintainers; [ simons ehmry ]; }; } diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 8cc7e9b3253..75fdc703ec9 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, python, makeWrapper, lib -, xpdf, pil, pyopengl, pygame +, xpdf, pillow, pyopengl, pygame , setuptools, mesa, freeglut }: let version = "0.10.5"; @@ -17,7 +17,7 @@ in # Note: We need to have `setuptools' in the path to be able to use # PyOpenGL. - buildInputs = [ makeWrapper xpdf pil pyopengl pygame ]; + buildInputs = [ makeWrapper xpdf pillow pyopengl pygame ]; configurePhase = '' sed -i "impressive.py" \ @@ -44,7 +44,7 @@ in ${lib.concatStringsSep ":" (map (path: path + "/lib/${python.libPrefix}/site-packages") - [ pil pyopengl pygame setuptools ])} \ + [ pillow pyopengl pygame setuptools ])} \ --prefix LIBRARY_PATH ":" "${mesa}/lib:${freeglut}/lib" ''; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 2f3e42d5774..7b4b20e897f 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -12,14 +12,14 @@ let then "i386" else "amd64"; - shortVersion = "1.15-stable"; + shortVersion = "1.15.2-stable"; version = "${shortVersion}_${arch}"; url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb"; sha256 = if stdenv.system == arch32 - then "16274a1ad981f8abd6facae88e8412eaf5c8b9b238ff4e07fa7c7b5f498c3cc7" - else "a455f0cf898f1df66dd5a38c656718a9f8b0f6e80ee7205b37635a8261f9d3cf"; + then "64e72b5749ea54f75cb0400732af68d1044037c6233a6bc0ba7a560acd3503cb" + else "cd13e39ad665b243fa5ca04c30cdc4c7da3ddaa259ea1af8fd1ff60f85f4eb25"; deps = [ gcc.cc diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix new file mode 100644 index 00000000000..e41b0e4683f --- /dev/null +++ b/pkgs/applications/office/tudu/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, ncurses }: +stdenv.mkDerivation rec { + + name = "tudu-${version}"; + version = "0.10"; + + src = fetchurl { + url = "http://code.meskio.net/tudu/${name}.tar.gz"; + sha256 = "0571wh5hn0hgadyx34zq1zi35pzd7vpwkavm7kzb9hwgn07443x4"; + }; + + buildInputs = [ ncurses ]; + + meta = { + description = "ncurses-based hierarchical todo list manager with vim-like keybindings"; + homepage = "http://code.meskio.net/tudu/"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/default.nix index da4894c11a8..71bc58af7c0 100644 --- a/pkgs/applications/science/electronics/eagle/default.nix +++ b/pkgs/applications/science/electronics/eagle/default.nix @@ -1,24 +1,34 @@ { stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig , openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi +, libxcb, cups, xkeyboardconfig }: let libPath = stdenv.lib.makeLibraryPath [ zlib freetype fontconfig openssl libXrender libXrandr libXcursor libX11 - libXext libXi + libXext libXi libxcb cups ]; in stdenv.mkDerivation rec { name = "eagle-${version}"; - version = "6.6.0"; + version = "7.5.0"; - src = fetchurl { - url = "ftp://ftp.cadsoft.de/eagle/program/6.6/eagle-lin-${version}.run"; - sha256 = "0m5289daah85b2rwpivnh2z1573v6j4alzjy9hg78fkb9jdgbn0x"; - }; + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "ftp://ftp.cadsoft.de/eagle/program/7.5/eagle-lin32-${version}.run"; + sha256 = "1yfpfv2bqppc95964dhn38g0hq198wnz88lq2dmh517z7jlq9j5g"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "ftp://ftp.cadsoft.de/eagle/program/7.5/eagle-lin64-${version}.run"; + sha256 = "0msd0sn8yfln96mf7j5rc3b8amprxn87vmpq4wsz2cnmgd8xq0s9"; + } + else + throw "Unsupported system: ${stdenv.system}"; desktopItem = makeDesktopItem { name = "eagle"; @@ -65,6 +75,7 @@ stdenv.mkDerivation rec { #!${stdenv.shell} export LD_LIBRARY_PATH="${stdenv.cc.cc}/lib:${libPath}" export LD_PRELOAD="$out/lib/eagle_fixer.so" + export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb" exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@" EOF chmod a+x "$out"/bin/eagle diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index d1fb853ee9e..0313467ed78 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -1,12 +1,12 @@ -{ fetchurl, stdenv, ocaml, ocamlPackages, coq }: +{ fetchurl, stdenv, ocamlPackages, coq }: stdenv.mkDerivation rec { name = "why3-${version}"; - version = "0.86.1"; + version = "0.86.2"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/34797/why3-0.86.1.tar.gz; - sha256 = "129kzq79n8h480zrlphgh1ixvwp3wm18nbcky9bp4wdnr6zaibd7"; + url = https://gforge.inria.fr/frs/download.php/file/35214/why3-0.86.2.tar.gz; + sha256 = "08sa7dmp6yp29xn0m6h98nic4q47vb4ahvaid5drwh522pvwvg10"; }; buildInputs = with ocamlPackages; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 7c8e76d676b..183a1f50375 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.2.2"; + name = "R-3.2.3"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "07a6s865bjnh7w0fqsrkv1pva76w99v86w0w787qpdil87km54cw"; + sha256 = "b93b7d878138279234160f007cb9b7f81b8a72c012a15566e9ec5395cfd9b6c1"; }; buildInputs = [ bzip2 gfortran libX11 libXmu libXt @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { which jdk openblas curl ]; - patches = [ ./no-usr-local-search-paths.patch - ./fix-tests-without-recommended-packages.patch ]; + patches = [ ./no-usr-local-search-paths.patch ]; preConfigure = '' configureFlagsArray=( diff --git a/pkgs/applications/science/math/R/fix-tests-without-recommended-packages.patch b/pkgs/applications/science/math/R/fix-tests-without-recommended-packages.patch deleted file mode 100644 index c736c7098a3..00000000000 --- a/pkgs/applications/science/math/R/fix-tests-without-recommended-packages.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur R-3.2.2-upstream/tests/reg-packages.R R-3.2.2/tests/reg-packages.R ---- R-3.2.2-upstream/tests/reg-packages.R 2015-08-05 17:45:05.000000000 -0430 -+++ R-3.2.2/tests/reg-packages.R 2015-10-01 02:11:05.484992903 -0430 -@@ -82,7 +82,8 @@ - ## pkgB tests an empty R directory - dir.create(file.path(pkgPath, "pkgB", "R"), recursive = TRUE, - showWarnings = FALSE) --p.lis <- if("Matrix" %in% row.names(installed.packages(.Library))) -+matrixIsInstalled <- "Matrix" %in% row.names(installed.packages(.Library)) -+p.lis <- if(matrixIsInstalled) - c("pkgA", "pkgB", "exNSS4") else "exNSS4" - for(p. in p.lis) { - cat("building package", p., "...\n") -@@ -111,8 +112,8 @@ - tools::assertError(is.null(pkgA:::nilData)) - } - --if(dir.exists(file.path("myLib", "exNSS4"))) { -- for(ns in c("pkgB", "pkgA", "Matrix", "exNSS4")) unloadNamespace(ns) -+if(matrixIsInstalled && dir.exists(file.path("myLib", "exNSS4"))) { -+ for(ns in c(rev(p.lis), "Matrix")) unloadNamespace(ns) - ## Both exNSS4 and Matrix define "atomicVector" *the same*, - ## but 'exNSS4' has it extended - and hence *both* are registered in cache -> "conflicts" - requireNamespace("exNSS4", lib= "myLib") diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 233323fceef..05c6f262293 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -96,6 +96,8 @@ stdenv.mkDerivation rec { preFixup = '' echo "=== PatchElfing away ===" + # This code should be a bit forgiving of errors, unfortunately + set +e find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') if [ -z "$type" ]; then diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 4bc160a2c28..9e74a233236 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { name = "spyder-${version}"; - version = "2.3.7"; + version = "2.3.8"; namePrefix = ""; src = fetchurl { url = "https://pypi.python.org/packages/source/s/spyder/${name}.zip"; - sha256 = "0ywgvgcp9s64ys25nfscd2648f7di8544a21b5lb59d4f48z028h"; + sha256 = "99fdae2cea325c0f2842c77bd67dd22db19fef3d9c0dde1545b1a2650eae517e"; }; # NOTE: sphinx makes the build fail with: ValueError: ZIP does not support timestamps before 1980 diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 0f079314959..d060acef53e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -36,6 +36,9 @@ stdenv.mkDerivation { # required to support pthread_cancel() NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + # without this, git fails when trying to check for /etc/gitconfig existence + propagatedSandboxProfile = stdenv.lib.sandbox.allowDirectoryList "/etc"; + makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix new file mode 100644 index 00000000000..fb6d542f479 --- /dev/null +++ b/pkgs/applications/version-management/git-review/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pythonPackages, python} : + +pythonPackages.buildPythonPackage rec { + name = "git-review-${version}"; + version = "1.25.0"; + + # Manually set version because prb wants to get it from the git + # upstream repository (and we are installing from tarball instead) + PBR_VERSION = "${version}"; + + src = fetchurl rec { + url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz"; + sha256 = "aa594690ed586041a524d6e5ae76152cbd53d4f03a98b20b213d15cecbe128ce"; + }; + + propagatedBuildInputs = [ pythonPackages.pbr pythonPackages.requests2 pythonPackages.argparse pythonPackages.setuptools ]; + + # Don't do tests because they require gerrit which is not packaged + doCheck = false; + + meta = { + homepage = "https://github.com/openstack-infra/git-review"; + description = "Tool to submit code to Gerrit"; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/applications/version-management/gitlab-git-http-server/default.nix b/pkgs/applications/version-management/gitlab-git-http-server/default.nix new file mode 100644 index 00000000000..98b14d2ce86 --- /dev/null +++ b/pkgs/applications/version-management/gitlab-git-http-server/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, git, go }: + +stdenv.mkDerivation rec { + version = "0.2.14"; + name = "gitlab-git-http-server-${version}"; + + srcs = fetchgit { + url = "https://gitlab.com/gitlab-org/gitlab-git-http-server.git"; + rev = "7c63f08f7051348e56b903fc0bbefcfed398fc1c"; + sha256 = "557d63a90c61371598b971a06bc056993610b58c2ef5762d9ef145ec2fdada78"; + }; + + buildInputs = [ git go ]; + + buildPhase = '' + make PREFIX=$out + ''; + + installPhase = '' + mkdir -p $out/bin + make install PREFIX=$out + ''; +} diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index 467e39f7141..5ee59c1e255 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { srcs = fetchgit { url = "https://gitlab.com/gitlab-org/gitlab-shell.git"; - rev = "823aba63e444afa2f45477819770fec3cb5f0159"; - sha256 = "0ppf547xs9pvmk49v4h043d0j93k5n4q0yx3b9ssrc4qf2smflgq"; + rev = "ebbb9d80811c23d49a7d1b75d7a7d2b8ffe7437b"; + sha256 = "fe69ab85d75a3871b4afa11ebc17f43008d135bbdbd6c581f6bebee2a4a3c75d"; }; buildInputs = [ @@ -31,16 +31,13 @@ stdenv.mkDerivation rec { substituteInPlace lib/gitlab_config.rb --replace\ "File.join(ROOT_PATH, 'config.yml')"\ "ENV['GITLAB_SHELL_CONFIG_PATH']" - substituteInPlace lib/gitlab_net.rb --replace\ - "File.read File.join(ROOT_PATH, '.gitlab_shell_secret')"\ - "File.read ENV['GITLAB_SHELL_SECRET_PATH']" # Note that we're running gitlab-shell from current-system/sw # because otherwise updating gitlab-shell won't be reflected in # the hardcoded path of the authorized-keys file: substituteInPlace lib/gitlab_keys.rb --replace\ - "auth_line = \"command=\\\"#{ROOT_PATH}/bin/gitlab-shell"\ - "auth_line = \"command=\\\"GITLAB_SHELL_CONFIG_PATH=#{ENV['GITLAB_SHELL_CONFIG_PATH']} GITLAB_SHELL_SECRET_PATH=#{ENV['GITLAB_SHELL_SECRET_PATH']} /run/current-system/sw/bin/gitlab-shell" + "\"#{ROOT_PATH}/bin/gitlab-shell"\ + "\"GITLAB_SHELL_CONFIG_PATH=#{ENV['GITLAB_SHELL_CONFIG_PATH']} /run/current-system/sw/bin/gitlab-shell" # We're setting GITLAB_SHELL_CONFIG_PATH in the ssh authorized key # environment because we need it in gitlab_configrb diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index f6f3607cbd1..66261426c01 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -8,145 +8,174 @@ def linux_only(require_as) RUBY_PLATFORM.include?('linux') && require_as end -gem "rails", "~> 4.1.0" +gem 'rails', '4.1.12' -# Make links from text -gem 'rails_autolink', '~> 1.1' +# Specify a sprockets version due to security issue +# See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY +gem 'sprockets', '~> 2.12.3' # Default values for AR models gem "default_value_for", "~> 3.0.0" # Supported DBs -gem "mysql2", group: :mysql -gem "pg", group: :postgres +gem "mysql2", '~> 0.3.16', group: :mysql +gem "pg", '~> 0.18.2', group: :postgres -# Auth -gem "devise", '3.2.4' -gem "devise-async", '0.9.0' -gem 'omniauth', "~> 1.1.3" -gem 'omniauth-google-oauth2' -gem 'omniauth-twitter' -gem 'omniauth-github' -gem 'omniauth-shibboleth' +# Authentication libraries +gem "devise", '~> 3.5.2' +gem "devise-async", '~> 0.9.0' +gem 'omniauth', "~> 1.2.2" +gem 'omniauth-google-oauth2', '~> 0.2.5' +gem 'omniauth-twitter', '~> 1.0.1' +gem 'omniauth-github', '~> 1.1.1' +gem 'omniauth-shibboleth', '~> 1.1.1' +gem 'omniauth-kerberos', '~> 0.2.0', group: :kerberos +gem 'omniauth-gitlab', '~> 1.0.0' +gem 'omniauth-bitbucket', '~> 0.0.2' +gem 'omniauth-saml', '~> 1.4.0' +gem 'doorkeeper', '~> 2.1.3' +gem 'omniauth_crowd' +gem "rack-oauth2", "~> 1.0.5" + +# Two-factor authentication +gem 'devise-two-factor', '~> 2.0.0' +gem 'rqrcode-rails3', '~> 0.1.7' +gem 'attr_encrypted', '~> 1.3.4' + +# Browser detection +gem "browser", '~> 1.0.0' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '7.0.0.rc10' - -# Ruby/Rack Git Smart-HTTP Server Handler -gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' +gem "gitlab_git", '~> 7.2.15' # LDAP Auth -gem 'gitlab_omniauth-ldap', '1.1.0', require: "omniauth-ldap" +# GitLab fork with several improvements to original library. For full list of changes +# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master +gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap" # Git Wiki -gem 'gollum-lib', '~> 3.0.0' +gem 'gollum-lib', '~> 4.0.2' # Language detection -gem "gitlab-linguist", "~> 3.0.0", require: "linguist" +# GitLab fork of linguist does not require pygments/python dependency. +# New version of original gem also dropped pygments support but it has strict +# dependency to unstable rugged version. We have internal issue for replacing +# fork with original gem when we meet on same rugged version - https://dev.gitlab.org/gitlab/gitlabhq/issues/2052. +gem "gitlab-linguist", "~> 3.0.1", require: "linguist" # API gem "grape", "~> 0.6.1" gem "grape-entity", "~> 0.4.2" -gem 'rack-cors', require: 'rack/cors' +gem 'rack-cors', '~> 0.2.9', require: 'rack/cors' # Format dates and times # based on human-friendly examples -gem "stamp" +gem "stamp", '~> 0.5.0' # Enumeration fields -gem 'enumerize' +gem 'enumerize', '~> 0.7.0' # Pagination gem "kaminari", "~> 0.15.1" # HAML -gem "haml-rails" +gem "haml-rails", '~> 0.5.3' # Files attachments -gem "carrierwave" +gem "carrierwave", '~> 0.9.0' # Drag and Drop UI -gem 'dropzonejs-rails' +gem 'dropzonejs-rails', '~> 0.7.1' # for aws storage -gem "fog", "~> 1.14" -gem "unf" +gem "fog", "~> 1.25.0" +gem "unf", '~> 0.1.4' # Authorization -gem "six" +gem "six", '~> 0.2.0' # Seed data -gem "seed-fu" +gem "seed-fu", '~> 2.3.5' -# Markup pipeline for GitLab -gem 'html-pipeline-gitlab', '~> 0.1.0' - -# Markdown to HTML -gem "github-markup" - -# Required markup gems by github-markdown -gem 'redcarpet', '~> 3.1.2' -gem 'RedCloth' -gem 'rdoc', '~>3.6' -gem 'org-ruby', '= 0.9.9' -gem 'creole', '~>0.3.6' -gem 'wikicloth', '=0.8.1' -gem 'asciidoctor', '= 0.1.4' +# Markdown and HTML processing +gem 'html-pipeline', '~> 1.11.0' +gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' +gem 'github-markup', '~> 1.3.1' +gem 'redcarpet', '~> 3.3.2' +gem 'RedCloth', '~> 4.2.9' +gem 'rdoc', '~>3.6' +gem 'org-ruby', '~> 0.9.12' +gem 'creole', '~>0.3.6' +gem 'wikicloth', '0.8.1' +gem 'asciidoctor', '~> 1.5.2' # Diffs gem 'diffy', '~> 3.0.3' # Application server group :unicorn do - gem "unicorn", '~> 4.6.3' - gem 'unicorn-worker-killer' + gem "unicorn", '~> 4.8.2' + gem 'unicorn-worker-killer', '~> 0.4.2' end # State machine -gem "state_machine" +gem "state_machine", '~> 1.2.0' +# Run events after state machine commits +gem 'after_commit_queue' # Issue tags -gem "acts-as-taggable-on" +gem 'acts-as-taggable-on', '~> 3.4' # Background jobs -gem 'slim' -gem 'sinatra', require: nil -gem 'sidekiq', '2.17.0' +gem 'slim', '~> 2.0.2' +gem 'sinatra', '~> 1.4.4', require: nil +gem 'sidekiq', '3.3.0' +gem 'sidetiq', '~> 0.6.3' # HTTP requests -gem "httparty" +gem "httparty", '~> 0.13.3' # Colored output to console -gem "colored" +gem "colored", '~> 1.2' +gem "colorize", '~> 0.5.8' # GitLab settings -gem 'settingslogic' +gem 'settingslogic', '~> 2.0.9' # Misc -gem "foreman" -gem 'version_sorter' + +gem 'version_sorter', '~> 2.0.0' # Cache -gem "redis-rails" +gem "redis-rails", '~> 4.0.0' # Campfire integration gem 'tinder', '~> 1.9.2' # HipChat integration -gem "hipchat", "~> 0.14.0" +gem 'hipchat', '~> 1.5.0' # Flowdock integration -gem "gitlab-flowdock-git-hook", "~> 0.4.2" +gem "gitlab-flowdock-git-hook", "~> 1.0.1" # Gemnasium integration gem "gemnasium-gitlab-service", "~> 0.2" # Slack integration -gem "slack-notifier", "~> 0.3.2" +gem "slack-notifier", "~> 1.0.0" + +# Asana integration +gem 'asana', '~> 0.0.6' + +# FogBugz integration +gem 'ruby-fogbugz', '~> 0.2.1' # d3 -gem "d3_rails", "~> 3.1.4" +gem 'd3_rails', '~> 3.5.5' + +#cal-heatmap +gem "cal-heatmap-rails", "~> 0.0.1" # underscore-rails gem "underscore-rails", "~> 1.4.4" @@ -155,104 +184,133 @@ gem "underscore-rails", "~> 1.4.4" gem "sanitize", '~> 2.0' # Protect against bruteforcing -gem "rack-attack" +gem "rack-attack", '~> 4.3.0' # Ace editor -gem 'ace-rails-ap' +gem 'ace-rails-ap', '~> 2.0.1' # Keyboard shortcuts -gem 'mousetrap-rails' +gem 'mousetrap-rails', '~> 1.4.6' -# Semantic UI Sass for Sidebar -gem 'semantic-ui-sass', '~> 0.16.1.0' +# Detect and convert string character encoding +gem 'charlock_holmes', '~> 0.6.9.4' -gem "sass-rails", '~> 4.0.2' -gem "coffee-rails" -gem "uglifier" -gem "therubyracer" -gem 'turbolinks' -gem 'jquery-turbolinks' +gem "sass-rails", '~> 4.0.5' +gem "coffee-rails", '~> 4.1.0' +gem "uglifier", '~> 2.3.2' +gem 'turbolinks', '~> 2.5.0' +gem 'jquery-turbolinks', '~> 2.0.1' -gem 'select2-rails' -gem 'jquery-atwho-rails', "~> 0.3.3" -gem "jquery-rails" -gem "jquery-ui-rails" -gem "jquery-scrollto-rails" -gem "raphael-rails", "~> 2.1.2" -gem 'bootstrap-sass', '~> 3.0' -gem "font-awesome-rails", '~> 4.2' -gem "gitlab_emoji", "~> 0.0.1.1" -gem "gon", '~> 5.0.0' -gem 'nprogress-rails' -gem 'request_store' -gem "virtus" +gem 'addressable', '~> 2.3.8' +gem 'bootstrap-sass', '~> 3.0' +gem 'font-awesome-rails', '~> 4.2' +gem 'gitlab_emoji', '~> 0.1' +gem 'gon', '~> 5.0.0' +gem 'jquery-atwho-rails', '~> 1.0.0' +gem 'jquery-rails', '~> 3.1.3' +gem 'jquery-scrollto-rails', '~> 1.4.3' +gem 'jquery-ui-rails', '~> 4.2.1' +gem 'nprogress-rails', '~> 0.1.2.3' +gem 'raphael-rails', '~> 2.1.2' +gem 'request_store', '~> 1.2.0' +gem 'select2-rails', '~> 3.5.9' +gem 'virtus', '~> 1.0.1' group :development do - gem "annotate", "~> 2.6.0.beta2" - gem "letter_opener" - gem 'quiet_assets', '~> 1.0.1' - gem 'rack-mini-profiler', require: false + gem "foreman" + gem 'brakeman', '3.0.1', require: false + + gem "annotate", "~> 2.6.0" + gem "letter_opener", '~> 1.1.2' + gem 'quiet_assets', '~> 1.0.2' + gem 'rack-mini-profiler', '~> 0.9.0', require: false + gem 'rerun', '~> 0.10.0' # Better errors handler - gem 'better_errors' - gem 'binding_of_caller' - - gem 'rails_best_practices' + gem 'better_errors', '~> 1.0.1' + gem 'binding_of_caller', '~> 0.7.2' # Docs generator - gem "sdoc" + gem "sdoc", '~> 0.3.20' # thin instead webrick - gem 'thin' + gem 'thin', '~> 1.6.1' end group :development, :test do - gem 'coveralls', require: false - # gem 'rails-dev-tweaks' - gem 'spinach-rails' - gem "rspec-rails" - gem "capybara", '~> 2.2.1' - gem "pry" - gem "awesome_print" - gem "database_cleaner" - gem "launchy" - gem 'factory_girl_rails' + gem 'byebug', platform: :mri + gem 'pry-rails' + + gem 'awesome_print', '~> 1.2.0' + gem 'fuubar', '~> 2.0.0' + + gem 'database_cleaner', '~> 1.4.0' + gem 'factory_girl_rails', '~> 4.3.0' + gem 'rspec-rails', '~> 3.3.0' + gem 'spinach-rails', '~> 0.2.1' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.3.0' + gem 'minitest', '~> 5.7.0' # Generate Fake data - gem "ffaker" + gem 'ffaker', '~> 2.0.0' - # Guard - gem 'guard-rspec' - gem 'guard-spinach' + gem 'capybara', '~> 2.4.0' + gem 'capybara-screenshot', '~> 1.0.0' + gem 'poltergeist', '~> 1.6.0' - # Notification - gem 'rb-fsevent', require: darwin_only('rb-fsevent') - gem 'growl', require: darwin_only('growl') - gem 'rb-inotify', require: linux_only('rb-inotify') + gem 'teaspoon', '~> 1.0.0' + gem 'teaspoon-jasmine', '~> 2.2.0' - # PhantomJS driver for Capybara - gem 'poltergeist', '~> 1.5.1' + gem 'spring', '~> 1.3.6' + gem 'spring-commands-rspec', '~> 1.0.4' + gem 'spring-commands-spinach', '~> 1.0.0' + gem 'spring-commands-teaspoon', '~> 0.0.2' - gem 'jasmine', '2.0.2' - - gem "spring", '1.1.3' - gem "spring-commands-rspec", '1.0.1' - gem "spring-commands-spinach", '1.0.0' + gem 'rubocop', '~> 0.28.0', require: false + gem 'coveralls', '~> 0.8.2', require: false + gem 'simplecov', '~> 0.10.0', require: false end group :test do - gem "simplecov", require: false - gem "shoulda-matchers", "~> 2.1.0" - gem 'email_spec' - gem "webmock" - gem 'test_after_commit' + gem 'shoulda-matchers', '~> 2.8.0', require: false + gem 'email_spec', '~> 1.6.0' + gem 'webmock', '~> 1.21.0' + gem 'test_after_commit', '~> 0.2.2' + gem 'sham_rack' end group :production do gem "gitlab_meta", '7.0' end -gem "newrelic_rpm" +gem "newrelic_rpm", '~> 3.9.4.245' +gem 'newrelic-grape' + +gem 'octokit', '~> 3.7.0' + +gem "mail_room", "~> 0.5.2" + +gem 'email_reply_parser', '~> 0.5.8' + +## CI +gem 'activerecord-deprecated_finders', '~> 1.0.3' +gem 'activerecord-session_store', '~> 0.1.0' +gem "nested_form", '~> 0.3.2' + +# Scheduled +gem 'whenever', '~> 0.8.4', require: false + +# OAuth +gem 'oauth2', '~> 1.0.0' + +# Soft deletion +gem "paranoia", "~> 2.0" + +group :development, :test do + gem 'guard-rspec', '~> 4.2.0' + + gem 'rb-fsevent', require: darwin_only('rb-fsevent') + gem 'growl', require: darwin_only('growl') + gem 'rb-inotify', require: linux_only('rb-inotify') +end diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index c7db793060e..56db3f61985 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -1,203 +1,304 @@ GEM remote: https://rubygems.org/ specs: + CFPropertyList (2.3.1) RedCloth (4.2.9) ace-rails-ap (2.0.1) - actionmailer (4.1.1) - actionpack (= 4.1.1) - actionview (= 4.1.1) - mail (~> 2.5.4) - actionpack (4.1.1) - actionview (= 4.1.1) - activesupport (= 4.1.1) + actionmailer (4.1.12) + actionpack (= 4.1.12) + actionview (= 4.1.12) + mail (~> 2.5, >= 2.5.4) + actionpack (4.1.12) + actionview (= 4.1.12) + activesupport (= 4.1.12) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.1) - activesupport (= 4.1.1) + actionview (4.1.12) + activesupport (= 4.1.12) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.1) - activesupport (= 4.1.1) + activemodel (4.1.12) + activesupport (= 4.1.12) builder (~> 3.1) - activerecord (4.1.1) - activemodel (= 4.1.1) - activesupport (= 4.1.1) + activerecord (4.1.12) + activemodel (= 4.1.12) + activesupport (= 4.1.12) arel (~> 5.0.0) - activesupport (4.1.1) + activerecord-deprecated_finders (1.0.4) + activerecord-session_store (0.1.1) + actionpack (>= 4.0.0, < 5) + activerecord (>= 4.0.0, < 5) + railties (>= 4.0.0, < 5) + activeresource (4.0.0) + activemodel (~> 4.0) + activesupport (~> 4.0) + rails-observers (~> 0.1.1) + activesupport (4.1.12) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - acts-as-taggable-on (2.4.1) - rails (>= 3, < 5) - addressable (2.3.5) - annotate (2.6.0) - activerecord (>= 2.3.0) - rake (>= 0.8.7) + acts-as-taggable-on (3.5.0) + activerecord (>= 3.2, < 5) + addressable (2.3.8) + after_commit_queue (1.1.0) + rails (>= 3.0) + annotate (2.6.10) + activerecord (>= 3.2, <= 4.3) + rake (~> 10.4) arel (5.0.1.20140414130214) - asciidoctor (0.1.4) + asana (0.0.6) + activeresource (>= 3.2.3) + asciidoctor (1.5.2) + ast (2.1.0) + astrolabe (1.3.1) + parser (~> 2.2) + attr_encrypted (1.3.4) + encryptor (>= 1.3.0) + attr_required (1.0.0) + autoprefixer-rails (5.2.1.2) + execjs + json awesome_print (1.2.0) - axiom-types (0.0.5) - descendants_tracker (~> 0.0.1) - ice_nine (~> 0.9) - bcrypt (3.1.7) + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) + bcrypt (3.1.10) better_errors (1.0.1) coderay (>= 1.0.0) erubis (>= 2.6.6) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.0.3.0) - sass (~> 3.2) + bootstrap-sass (3.3.5) + autoprefixer-rails (>= 5.0.0.1) + sass (>= 3.2.19) + brakeman (3.0.1) + erubis (~> 2.6) + fastercsv (~> 1.5) + haml (>= 3.0, < 5.0) + highline (~> 1.6.20) + multi_json (~> 1.2) + ruby2ruby (~> 2.1.1) + ruby_parser (~> 3.5.0) + sass (~> 3.0) + terminal-table (~> 1.4) + browser (1.0.0) builder (3.2.2) - capybara (2.2.1) + byebug (6.0.2) + cal-heatmap-rails (0.0.1) + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) + capybara-screenshot (1.0.11) + capybara (>= 1.0, < 3) + launchy carrierwave (0.9.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) - celluloid (0.15.2) - timers (~> 1.1.0) + celluloid (0.16.0) + timers (~> 4.0.0) charlock_holmes (0.6.9.4) + chronic (0.10.2) + chunky_png (1.3.4) cliver (0.3.2) - code_analyzer (0.4.3) - sexp_processor coderay (1.1.0) coercible (1.0.0) descendants_tracker (~> 0.0.1) - coffee-rails (4.0.1) + coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.6.3) + coffee-script-source (1.9.1.1) colored (1.2) colorize (0.5.8) - connection_pool (1.2.0) - coveralls (0.7.0) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - crack (0.4.1) - safe_yaml (~> 0.9.0) + connection_pool (2.2.0) + coveralls (0.8.2) + json (~> 1.8) + rest-client (>= 1.6.8, < 2) + simplecov (~> 0.10.0) + term-ansicolor (~> 1.3) + thor (~> 0.19.1) + crack (0.4.2) + safe_yaml (~> 1.0.0) creole (0.3.8) - d3_rails (3.1.10) + d3_rails (3.5.6) railties (>= 3.1.0) - daemons (1.1.9) - database_cleaner (1.3.0) + daemons (1.2.3) + database_cleaner (1.4.1) debug_inspector (0.0.2) - default_value_for (3.0.0) + default_value_for (3.0.1) activerecord (>= 3.2.0, < 5.0) - descendants_tracker (0.0.3) - devise (3.2.4) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) + devise (3.5.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) + responders thread_safe (~> 0.1) warden (~> 1.2.3) devise-async (0.9.0) devise (~> 3.2) + devise-two-factor (2.0.0) + activesupport + attr_encrypted (~> 1.3.2) + devise (~> 3.5.0) + railties + rotp (~> 2) diff-lcs (1.2.5) - diffy (3.0.3) + diffy (3.0.7) docile (1.1.5) - dotenv (0.9.0) - dropzonejs-rails (0.4.14) + domain_name (0.5.24) + unf (>= 0.0.5, < 1.0.0) + doorkeeper (2.1.4) + railties (>= 3.2) + dropzonejs-rails (0.7.1) rails (> 3.1) - email_spec (1.5.0) + email_reply_parser (0.5.8) + email_spec (1.6.0) launchy (~> 2.1) mail (~> 2.2) - emoji (1.0.1) - json + encryptor (1.3.0) enumerize (0.7.0) activesupport (>= 3.2) - equalizer (0.0.8) + equalizer (0.0.11) erubis (2.7.0) escape_utils (0.2.4) - eventmachine (1.0.3) - excon (0.32.1) - execjs (2.0.2) + eventmachine (1.0.8) + excon (0.45.4) + execjs (2.6.0) expression_parser (0.9.0) factory_girl (4.3.0) activesupport (>= 3.0.0) factory_girl_rails (4.3.0) factory_girl (~> 4.3.0) railties (>= 3.0.0) - faraday (0.8.9) + faraday (0.8.10) multipart-post (~> 1.2.0) - faraday_middleware (0.9.0) - faraday (>= 0.7.4, < 0.9) - ffaker (1.22.1) - ffi (1.9.3) - fog (1.21.0) - fog-brightbox - fog-core (~> 1.21, >= 1.21.1) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + fastercsv (1.5.5) + ffaker (2.0.0) + ffi (1.9.10) + fission (0.5.0) + CFPropertyList (~> 2.2) + flowdock (0.7.0) + httparty (~> 0.7) + multi_json + fog (1.25.0) + fog-brightbox (~> 0.4) + fog-core (~> 1.25) fog-json + fog-profitbricks + fog-radosgw (>= 0.0.2) + fog-sakuracloud (>= 0.0.4) + fog-softlayer + fog-terremark + fog-vmfusion + fog-voxel + fog-xml (~> 0.1.1) + ipaddress (~> 0.5) nokogiri (~> 1.5, >= 1.5.11) - fog-brightbox (0.0.1) - fog-core + opennebula + fog-brightbox (0.9.0) + fog-core (~> 1.22) fog-json - fog-core (1.21.1) + inflecto (~> 0.0.2) + fog-core (1.32.1) builder - excon (~> 0.32) - formatador (~> 0.2.0) + excon (~> 0.45) + formatador (~> 0.2) mime-types net-scp (~> 1.1) net-ssh (>= 2.1.3) - fog-json (1.0.0) - multi_json (~> 1.0) - font-awesome-rails (4.2.0.0) + fog-json (1.0.2) + fog-core (~> 1.0) + multi_json (~> 1.10) + fog-profitbricks (0.0.5) + fog-core + fog-xml + nokogiri + fog-radosgw (0.0.4) + fog-core (>= 1.21.0) + fog-json + fog-xml (>= 0.0.1) + fog-sakuracloud (1.0.1) + fog-core + fog-json + fog-softlayer (0.4.7) + fog-core + fog-json + fog-terremark (0.1.0) + fog-core + fog-xml + fog-vmfusion (0.1.0) + fission + fog-core + fog-voxel (0.1.0) + fog-core + fog-xml + fog-xml (0.1.2) + fog-core + nokogiri (~> 1.5, >= 1.5.11) + font-awesome-rails (4.4.0.0) railties (>= 3.2, < 5.0) - foreman (0.63.0) - dotenv (>= 0.7) - thor (>= 0.13.6) - formatador (0.2.4) - gemnasium-gitlab-service (0.2.2) - rugged (~> 0.19) - gherkin-ruby (0.3.1) - racc - github-markup (1.1.0) - gitlab-flowdock-git-hook (0.4.2.2) + foreman (0.78.0) + thor (~> 0.19.1) + formatador (0.2.5) + fuubar (2.0.0) + rspec (~> 3.0) + ruby-progressbar (~> 1.4) + gemnasium-gitlab-service (0.2.6) + rugged (~> 0.21) + gemojione (2.0.1) + json + get_process_mem (0.2.0) + gherkin-ruby (0.3.2) + github-markup (1.3.3) + gitlab-flowdock-git-hook (1.0.1) + flowdock (~> 0.7) gitlab-grit (>= 2.4.1) multi_json - gitlab-grack (2.0.0.pre) - rack (~> 1.5.1) - gitlab-grit (2.6.12) + gitlab-grit (2.7.3) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) mime-types (~> 1.15) posix-spawn (~> 0.3) - gitlab-linguist (3.0.0) + gitlab-linguist (3.0.1) charlock_holmes (~> 0.6.6) escape_utils (~> 0.2.4) mime-types (~> 1.19) - gitlab_emoji (0.0.1.1) - emoji (~> 1.0.1) - gitlab_git (7.0.0.rc10) + gitlab_emoji (0.1.1) + gemojione (~> 2.0) + gitlab_git (7.2.15) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) - rugged (~> 0.21.0) + rugged (~> 0.22.2) gitlab_meta (7.0) - gitlab_omniauth-ldap (1.1.0) - net-ldap (~> 0.7.0) + gitlab_omniauth-ldap (1.2.1) + net-ldap (~> 0.9) omniauth (~> 1.0) pyu-ruby-sasl (~> 0.0.3.1) - rubyntlm (~> 0.1.1) - gollum-lib (3.0.0) - github-markup (~> 1.1.0) - gitlab-grit (~> 2.6.5) - nokogiri (~> 1.6.1) - rouge (~> 1.3.3) + rubyntlm (~> 0.3) + gollum-grit_adapter (1.0.0) + gitlab-grit (~> 2.7, >= 2.7.1) + gollum-lib (4.0.3) + github-markup (~> 1.3.3) + gollum-grit_adapter (~> 1.0) + nokogiri (~> 1.6.4) + rouge (~> 1.10.1) sanitize (~> 2.1.0) stringex (~> 2.5.1) - gon (5.0.1) + gon (5.0.4) actionpack (>= 2.3.0) json grape (0.6.1) @@ -210,23 +311,23 @@ GEM rack-accept rack-mount virtus (>= 1.0.0) - grape-entity (0.4.2) + grape-entity (0.4.8) activesupport multi_json (>= 1.3.2) growl (1.0.3) - guard (2.2.4) + guard (2.13.0) formatador (>= 0.2.4) - listen (~> 2.1) + listen (>= 2.7, <= 4.0) lumberjack (~> 1.0) + nenv (~> 0.1) + notiffany (~> 0.0) pry (>= 0.9.12) + shellany (~> 0.0) thor (>= 0.18.1) - guard-rspec (4.2.0) - guard (>= 2.1.1) + guard-rspec (4.2.10) + guard (~> 2.1) rspec (>= 2.14, < 4.0) - guard-spinach (0.0.2) - guard (>= 1.1) - spinach - haml (4.0.5) + haml (4.0.7) tilt haml-rails (0.5.3) actionpack (>= 4.0.1) @@ -234,185 +335,222 @@ GEM haml (>= 3.1, < 5.0) railties (>= 4.0.1) hashie (2.1.2) + highline (1.6.21) hike (1.2.3) - hipchat (0.14.0) - httparty + hipchat (1.5.2) httparty + mimemagic + hitimes (1.2.3) html-pipeline (1.11.0) activesupport (>= 2) nokogiri (~> 1.4) - html-pipeline-gitlab (0.1.5) - actionpack (~> 4) - gitlab_emoji (~> 0.0.1) - html-pipeline (~> 1.11.0) - sanitize (~> 2.1) + http-cookie (1.0.2) + domain_name (~> 0.5) http_parser.rb (0.5.3) - httparty (0.13.0) + httparty (0.13.5) json (~> 1.8) multi_xml (>= 0.5.2) - httpauth (0.2.1) - i18n (0.6.11) - ice_nine (0.10.0) - jasmine (2.0.2) - jasmine-core (~> 2.0.0) - phantomjs - rack (>= 1.2.1) - rake - jasmine-core (2.0.0) - jquery-atwho-rails (0.3.3) - jquery-rails (3.1.0) + httpclient (2.6.0.1) + i18n (0.7.0) + ice_cube (0.11.1) + ice_nine (0.11.1) + inflecto (0.0.2) + ipaddress (0.8.0) + jquery-atwho-rails (1.0.1) + jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-scrollto-rails (1.4.3) railties (> 3.1, < 5.0) - jquery-turbolinks (2.0.1) + jquery-turbolinks (2.0.2) railties (>= 3.1.0) turbolinks jquery-ui-rails (4.2.1) railties (>= 3.2.16) - json (1.8.1) - jwt (0.1.13) - multi_json (>= 1.5) + json (1.8.3) + jwt (1.5.1) kaminari (0.15.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.8.1) - launchy (2.4.2) + kgio (2.9.3) + launchy (2.4.3) addressable (~> 2.3) letter_opener (1.1.2) launchy (~> 2.2) - libv8 (3.16.14.11) - listen (2.3.1) - celluloid (>= 0.15.2) + listen (2.10.1) + celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - lumberjack (1.0.4) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) + lumberjack (1.0.9) + macaddr (1.7.1) + systemu (~> 2.6.2) + mail (2.6.3) + mime-types (>= 1.16, < 3) + mail_room (0.5.2) method_source (0.8.2) mime-types (1.25.1) - mini_portile (0.6.0) - minitest (5.3.5) + mimemagic (0.3.0) + mini_portile (0.6.2) + minitest (5.7.0) mousetrap-rails (1.4.6) - multi_json (1.10.1) + multi_json (1.11.2) multi_xml (0.5.5) multipart-post (1.2.0) - mysql2 (0.3.16) - net-ldap (0.7.0) - net-scp (1.1.2) + mysql2 (0.3.20) + nenv (0.2.0) + nested_form (0.3.2) + net-ldap (0.11) + net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.8.0) + net-ssh (2.9.2) + netrc (0.10.3) + newrelic-grape (2.0.0) + grape + newrelic_rpm newrelic_rpm (3.9.4.245) - nokogiri (1.6.2.1) - mini_portile (= 0.6.0) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) + notiffany (0.0.7) + nenv (~> 0.1) + shellany (~> 0.0) nprogress-rails (0.1.2.3) oauth (0.4.7) - oauth2 (0.8.1) - faraday (~> 0.8) - httpauth (~> 0.1) - jwt (~> 0.1.4) - multi_json (~> 1.0) + oauth2 (1.0.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) rack (~> 1.2) - omniauth (1.1.4) - hashie (>= 1.2, < 3) - rack - omniauth-github (1.1.1) + octokit (3.7.1) + sawyer (~> 0.6.0, >= 0.5.3) + omniauth (1.2.2) + hashie (>= 1.2, < 4) + rack (~> 1.0) + omniauth-bitbucket (0.0.2) + multi_json (~> 1.7) + omniauth (~> 1.1) + omniauth-oauth (~> 1.0) + omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-google-oauth2 (0.2.5) + omniauth-gitlab (1.0.0) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.0) + omniauth-google-oauth2 (0.2.6) omniauth (> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-oauth (1.0.1) + omniauth-kerberos (0.2.0) + omniauth-multipassword + timfel-krb5-auth (~> 0.8) + omniauth-multipassword (0.4.2) + omniauth (~> 1.0) + omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.1.1) - oauth2 (~> 0.8.0) - omniauth (~> 1.0) - omniauth-shibboleth (1.1.1) + omniauth-oauth2 (1.3.1) + oauth2 (~> 1.0) + omniauth (~> 1.2) + omniauth-saml (1.4.1) + omniauth (~> 1.1) + ruby-saml (~> 1.0.0) + omniauth-shibboleth (1.1.2) omniauth (>= 1.0.0) omniauth-twitter (1.0.1) multi_json (~> 1.3) omniauth-oauth (~> 1.0) - org-ruby (0.9.9) + omniauth_crowd (2.2.3) + activesupport + nokogiri (>= 1.4.4) + omniauth (~> 1.0) + opennebula (4.12.1) + json + nokogiri + rbvmomi + org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - pg (0.15.1) - phantomjs (1.9.2.0) - poltergeist (1.5.1) + paranoia (2.1.3) + activerecord (~> 4.0) + parser (2.2.2.6) + ast (>= 1.1, < 3.0) + pg (0.18.2) + poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - polyglot (0.3.4) - posix-spawn (0.3.9) - pry (0.9.12.4) - coderay (~> 1.0) - method_source (~> 0.8) + posix-spawn (0.3.11) + powerpack (0.0.9) + pry (0.10.1) + coderay (~> 1.1.0) + method_source (~> 0.8.1) slop (~> 3.4) + pry-rails (0.3.4) + pry (>= 0.9.10) pyu-ruby-sasl (0.0.3.3) - quiet_assets (1.0.2) + quiet_assets (1.0.3) railties (>= 3.1, < 5.0) - racc (1.4.10) - rack (1.5.2) + rack (1.5.5) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (2.3.0) + rack-attack (4.3.0) rack rack-cors (0.2.9) - rack-mini-profiler (0.9.0) + rack-mini-profiler (0.9.7) rack (>= 1.1.3) rack-mount (0.8.3) rack (>= 1.0.0) - rack-protection (1.5.1) + rack-oauth2 (1.0.10) + activesupport (>= 2.3) + attr_required (>= 0.0.5) + httpclient (>= 2.4) + multi_json (>= 1.3.6) + rack (>= 1.1) + rack-protection (1.5.3) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (4.1.1) - actionmailer (= 4.1.1) - actionpack (= 4.1.1) - actionview (= 4.1.1) - activemodel (= 4.1.1) - activerecord (= 4.1.1) - activesupport (= 4.1.1) + rails (4.1.12) + actionmailer (= 4.1.12) + actionpack (= 4.1.12) + actionview (= 4.1.12) + activemodel (= 4.1.12) + activerecord (= 4.1.12) + activesupport (= 4.1.12) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.1) + railties (= 4.1.12) sprockets-rails (~> 2.0) - rails_autolink (1.1.6) - rails (> 3.1) - rails_best_practices (1.14.4) - activesupport - awesome_print - code_analyzer (>= 0.4.3) - colored - erubis - i18n - require_all - ruby-progressbar - railties (4.1.1) - actionpack (= 4.1.1) - activesupport (= 4.1.1) + rails-observers (0.1.2) + activemodel (~> 4.0) + railties (4.1.12) + actionpack (= 4.1.12) + activesupport (= 4.1.12) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.12.0) - rake (10.3.2) + rainbow (2.0.0) + raindrops (0.15.0) + rake (10.4.2) raphael-rails (2.1.2) - rb-fsevent (0.9.3) - rb-inotify (0.9.2) + rb-fsevent (0.9.5) + rb-inotify (0.9.5) ffi (>= 0.5.0) + rbvmomi (1.8.2) + builder + nokogiri (>= 1.4.1) + trollop rdoc (3.12.2) json (~> 1.4) - redcarpet (3.1.2) - redis (3.0.6) + redcarpet (3.3.2) + redis (3.2.1) redis-actionpack (4.0.0) actionpack (~> 4) redis-rack (~> 1.5.0) redis-store (~> 1.1.0) - redis-activesupport (4.0.0) + redis-activesupport (4.1.1) activesupport (~> 4) redis-store (~> 1.1.0) - redis-namespace (1.4.1) - redis (~> 3.0.4) + redis-namespace (1.5.2) + redis (~> 3.0, >= 3.0.4) redis-rack (1.5.0) rack (~> 1.5) redis-store (~> 1.1.0) @@ -420,132 +558,180 @@ GEM redis-actionpack (~> 4) redis-activesupport (~> 4) redis-store (~> 1.1.0) - redis-store (1.1.4) + redis-store (1.1.6) redis (>= 2.2) - ref (1.0.5) - request_store (1.0.5) - require_all (1.3.2) - rest-client (1.6.7) - mime-types (>= 1.16) + request_store (1.2.0) + rerun (0.10.0) + listen (~> 2.7, >= 2.7.3) + responders (1.1.2) + railties (>= 3.2, < 4.2) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) rinku (1.7.3) - rouge (1.3.3) - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-core (2.14.7) - rspec-expectations (2.14.4) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.4) - rspec-rails (2.14.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - ruby-progressbar (1.2.0) - rubyntlm (0.1.1) + rotp (2.1.1) + rouge (1.10.1) + rqrcode (0.7.0) + chunky_png + rqrcode-rails3 (0.1.7) + rqrcode (>= 0.4.2) + rspec (3.3.0) + rspec-core (~> 3.3.0) + rspec-expectations (~> 3.3.0) + rspec-mocks (~> 3.3.0) + rspec-core (3.3.2) + rspec-support (~> 3.3.0) + rspec-expectations (3.3.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.3.0) + rspec-mocks (3.3.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.3.0) + rspec-rails (3.3.3) + actionpack (>= 3.0, < 4.3) + activesupport (>= 3.0, < 4.3) + railties (>= 3.0, < 4.3) + rspec-core (~> 3.3.0) + rspec-expectations (~> 3.3.0) + rspec-mocks (~> 3.3.0) + rspec-support (~> 3.3.0) + rspec-support (3.3.0) + rubocop (0.28.0) + astrolabe (~> 1.3) + parser (>= 2.2.0.pre.7, < 3.0) + powerpack (~> 0.0.6) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.4) + ruby-fogbugz (0.2.1) + crack (~> 0.4) + ruby-progressbar (1.7.5) + ruby-saml (1.0.0) + nokogiri (>= 1.5.10) + uuid (~> 2.3) + ruby2ruby (2.1.4) + ruby_parser (~> 3.1) + sexp_processor (~> 4.0) + ruby_parser (3.5.0) + sexp_processor (~> 4.1) + rubyntlm (0.5.2) rubypants (0.2.0) - rugged (0.21.0) - safe_yaml (0.9.7) + rugged (0.22.2) + safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) sass (3.2.19) - sass-rails (4.0.3) + sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) - sass (~> 3.2.0) - sprockets (~> 2.8, <= 2.11.0) + sass (~> 3.2.2) + sprockets (~> 2.8, < 3.0) sprockets-rails (~> 2.0) + sawyer (0.6.0) + addressable (~> 2.3.5) + faraday (~> 0.8, < 0.10) sdoc (0.3.20) json (>= 1.1.3) rdoc (~> 3.10) - seed-fu (2.3.1) - activerecord (>= 3.1, < 4.2) - activesupport (>= 3.1, < 4.2) - select2-rails (3.5.2) + seed-fu (2.3.5) + activerecord (>= 3.1, < 4.3) + activesupport (>= 3.1, < 4.3) + select2-rails (3.5.9.3) thor (~> 0.14) - semantic-ui-sass (0.16.1.0) - sass (~> 3.2) settingslogic (2.0.9) - sexp_processor (4.4.0) - shoulda-matchers (2.1.0) + sexp_processor (4.6.0) + sham_rack (1.3.6) + rack + shellany (0.0.1) + shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (2.17.0) - celluloid (>= 0.15.2) - connection_pool (>= 1.0.0) + sidekiq (3.3.0) + celluloid (>= 0.16.0) + connection_pool (>= 2.0.0) json - redis (>= 3.0.4) + redis (>= 3.0.6) redis-namespace (>= 1.3.1) + sidetiq (0.6.3) + celluloid (>= 0.14.1) + ice_cube (= 0.11.1) + sidekiq (>= 3.0.0) simple_oauth (0.1.9) - simplecov (0.9.0) + simplecov (0.10.0) docile (~> 1.1.0) - multi_json - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) - sinatra (1.4.4) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + sinatra (1.4.6) rack (~> 1.4) rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) + tilt (>= 1.3, < 3) six (0.2.0) - slack-notifier (0.3.2) - slim (2.0.2) + slack-notifier (1.0.0) + slim (2.0.3) temple (~> 0.6.6) tilt (>= 1.3.3, < 2.1) - slop (3.4.7) - spinach (0.8.7) - colorize (= 0.5.8) - gherkin-ruby (>= 0.3.1) + slop (3.6.0) + spinach (0.8.10) + colorize + gherkin-ruby (>= 0.3.2) + json spinach-rails (0.2.1) capybara (>= 2.0.0) railties (>= 3) spinach (>= 0.4) - spring (1.1.3) - spring-commands-rspec (1.0.1) + spring (1.3.6) + spring-commands-rspec (1.0.4) spring (>= 0.9.1) spring-commands-spinach (1.0.0) spring (>= 0.9.1) - sprockets (2.11.0) + spring-commands-teaspoon (0.0.2) + spring (>= 0.9.1) + sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.3) + sprockets-rails (2.3.2) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) + sprockets (>= 2.8, < 4.0) stamp (0.5.0) state_machine (1.2.0) - stringex (2.5.1) - temple (0.6.7) - term-ansicolor (1.2.2) - tins (~> 0.8) - test_after_commit (0.2.2) - therubyracer (0.12.0) - libv8 (~> 3.16.14.0) - ref - thin (1.6.1) - daemons (>= 1.0.9) - eventmachine (>= 1.0.0) - rack (>= 1.0.0) - thor (0.19.1) - thread_safe (0.3.4) - tilt (1.4.1) - timers (1.1.0) - tinder (1.9.3) + stringex (2.5.2) + systemu (2.6.5) + task_list (1.0.2) + html-pipeline + teaspoon (1.0.2) + railties (>= 3.2.5, < 5) + teaspoon-jasmine (2.2.0) + teaspoon (>= 1.0.0) + temple (0.6.10) + term-ansicolor (1.3.2) + tins (~> 1.0) + terminal-table (1.5.2) + test_after_commit (0.2.7) + activerecord (>= 3.2) + thin (1.6.3) + daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0) - faraday (~> 0.8) + rack (~> 1.0) + thor (0.19.1) + thread_safe (0.3.5) + tilt (1.4.1) + timers (4.0.4) + hitimes + timfel-krb5-auth (0.8.3) + tinder (1.9.4) + eventmachine (~> 1.0) + faraday (~> 0.8.9) faraday_middleware (~> 0.9) hashie (>= 1.0, < 3) json (~> 1.8.0) mime-types (~> 1.19) multi_json (~> 1.7) twitter-stream (~> 0.1) - tins (0.13.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - turbolinks (2.0.0) + tins (1.6.0) + trollop (2.1.2) + turbolinks (2.5.3) coffee-rails twitter-stream (0.1.16) eventmachine (>= 0.12.8) @@ -553,31 +739,39 @@ GEM simple_oauth (~> 0.1.4) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.3.2) + uglifier (2.3.3) execjs (>= 0.3.0) json (>= 1.8.0) underscore-rails (1.4.4) unf (0.1.4) unf_ext - unf_ext (0.0.6) - unicorn (4.6.3) + unf_ext (0.0.7.1) + unicorn (4.8.3) kgio (~> 2.6) rack raindrops (~> 0.7) - unicorn-worker-killer (0.4.2) + unicorn-worker-killer (0.4.3) + get_process_mem (~> 0) unicorn (~> 4) - version_sorter (1.1.0) - virtus (1.0.1) - axiom-types (~> 0.0.5) + uuid (2.3.8) + macaddr (~> 1.0) + version_sorter (2.0.0) + virtus (1.0.5) + axiom-types (~> 0.1) coercible (~> 1.0) - descendants_tracker (~> 0.0.1) - equalizer (~> 0.0.7) + descendants_tracker (~> 0.0, >= 0.0.3) + equalizer (~> 0.0, >= 0.0.9) warden (1.2.3) rack (>= 1.0) - webmock (1.16.0) - addressable (>= 2.2.7) + webmock (1.21.0) + addressable (>= 2.3.6) crack (>= 0.3.2) - websocket-driver (0.3.3) + websocket-driver (0.6.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + whenever (0.8.4) + activesupport (>= 2.3.4) + chronic (>= 0.6.3) wikicloth (0.8.1) builder expression_parser @@ -589,124 +783,157 @@ PLATFORMS ruby DEPENDENCIES - RedCloth - ace-rails-ap - acts-as-taggable-on - annotate (~> 2.6.0.beta2) - asciidoctor (= 0.1.4) - awesome_print - better_errors - binding_of_caller + RedCloth (~> 4.2.9) + ace-rails-ap (~> 2.0.1) + activerecord-deprecated_finders (~> 1.0.3) + activerecord-session_store (~> 0.1.0) + acts-as-taggable-on (~> 3.4) + addressable (~> 2.3.8) + after_commit_queue + annotate (~> 2.6.0) + asana (~> 0.0.6) + asciidoctor (~> 1.5.2) + attr_encrypted (~> 1.3.4) + awesome_print (~> 1.2.0) + better_errors (~> 1.0.1) + binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.0) - capybara (~> 2.2.1) - carrierwave - coffee-rails - colored - coveralls + brakeman (= 3.0.1) + browser (~> 1.0.0) + byebug + cal-heatmap-rails (~> 0.0.1) + capybara (~> 2.4.0) + capybara-screenshot (~> 1.0.0) + carrierwave (~> 0.9.0) + charlock_holmes (~> 0.6.9.4) + coffee-rails (~> 4.1.0) + colored (~> 1.2) + colorize (~> 0.5.8) + coveralls (~> 0.8.2) creole (~> 0.3.6) - d3_rails (~> 3.1.4) - database_cleaner + d3_rails (~> 3.5.5) + database_cleaner (~> 1.4.0) default_value_for (~> 3.0.0) - devise (= 3.2.4) - devise-async (= 0.9.0) + devise (~> 3.5.2) + devise-async (~> 0.9.0) + devise-two-factor (~> 2.0.0) diffy (~> 3.0.3) - dropzonejs-rails - email_spec - enumerize - factory_girl_rails - ffaker - fog (~> 1.14) + doorkeeper (~> 2.1.3) + dropzonejs-rails (~> 0.7.1) + email_reply_parser (~> 0.5.8) + email_spec (~> 1.6.0) + enumerize (~> 0.7.0) + factory_girl_rails (~> 4.3.0) + ffaker (~> 2.0.0) + fog (~> 1.25.0) font-awesome-rails (~> 4.2) foreman + fuubar (~> 2.0.0) gemnasium-gitlab-service (~> 0.2) - github-markup - gitlab-flowdock-git-hook (~> 0.4.2) - gitlab-grack (~> 2.0.0.pre) - gitlab-linguist (~> 3.0.0) - gitlab_emoji (~> 0.0.1.1) - gitlab_git (= 7.0.0.rc10) + github-markup (~> 1.3.1) + gitlab-flowdock-git-hook (~> 1.0.1) + gitlab-linguist (~> 3.0.1) + gitlab_emoji (~> 0.1) + gitlab_git (~> 7.2.15) gitlab_meta (= 7.0) - gitlab_omniauth-ldap (= 1.1.0) - gollum-lib (~> 3.0.0) + gitlab_omniauth-ldap (~> 1.2.1) + gollum-lib (~> 4.0.2) gon (~> 5.0.0) grape (~> 0.6.1) grape-entity (~> 0.4.2) growl - guard-rspec - guard-spinach - haml-rails - hipchat (~> 0.14.0) - html-pipeline-gitlab (~> 0.1.0) - httparty - jasmine (= 2.0.2) - jquery-atwho-rails (~> 0.3.3) - jquery-rails - jquery-scrollto-rails - jquery-turbolinks - jquery-ui-rails + guard-rspec (~> 4.2.0) + haml-rails (~> 0.5.3) + hipchat (~> 1.5.0) + html-pipeline (~> 1.11.0) + httparty (~> 0.13.3) + jquery-atwho-rails (~> 1.0.0) + jquery-rails (~> 3.1.3) + jquery-scrollto-rails (~> 1.4.3) + jquery-turbolinks (~> 2.0.1) + jquery-ui-rails (~> 4.2.1) kaminari (~> 0.15.1) - launchy - letter_opener - minitest (~> 5.3.0) - mousetrap-rails - mysql2 - newrelic_rpm - nprogress-rails - omniauth (~> 1.1.3) - omniauth-github - omniauth-google-oauth2 - omniauth-shibboleth - omniauth-twitter - org-ruby (= 0.9.9) - pg - poltergeist (~> 1.5.1) - pry - quiet_assets (~> 1.0.1) - rack-attack - rack-cors - rack-mini-profiler - rails (~> 4.1.0) - rails_autolink (~> 1.1) - rails_best_practices + letter_opener (~> 1.1.2) + mail_room (~> 0.5.2) + minitest (~> 5.7.0) + mousetrap-rails (~> 1.4.6) + mysql2 (~> 0.3.16) + nested_form (~> 0.3.2) + newrelic-grape + newrelic_rpm (~> 3.9.4.245) + nprogress-rails (~> 0.1.2.3) + oauth2 (~> 1.0.0) + octokit (~> 3.7.0) + omniauth (~> 1.2.2) + omniauth-bitbucket (~> 0.0.2) + omniauth-github (~> 1.1.1) + omniauth-gitlab (~> 1.0.0) + omniauth-google-oauth2 (~> 0.2.5) + omniauth-kerberos (~> 0.2.0) + omniauth-saml (~> 1.4.0) + omniauth-shibboleth (~> 1.1.1) + omniauth-twitter (~> 1.0.1) + omniauth_crowd + org-ruby (~> 0.9.12) + paranoia (~> 2.0) + pg (~> 0.18.2) + poltergeist (~> 1.6.0) + pry-rails + quiet_assets (~> 1.0.2) + rack-attack (~> 4.3.0) + rack-cors (~> 0.2.9) + rack-mini-profiler (~> 0.9.0) + rack-oauth2 (~> 1.0.5) + rails (= 4.1.12) raphael-rails (~> 2.1.2) rb-fsevent rb-inotify rdoc (~> 3.6) - redcarpet (~> 3.1.2) - redis-rails - request_store - rspec-rails + redcarpet (~> 3.3.2) + redis-rails (~> 4.0.0) + request_store (~> 1.2.0) + rerun (~> 0.10.0) + rqrcode-rails3 (~> 0.1.7) + rspec-rails (~> 3.3.0) + rubocop (~> 0.28.0) + ruby-fogbugz (~> 0.2.1) sanitize (~> 2.0) - sass-rails (~> 4.0.2) - sdoc - seed-fu - select2-rails - semantic-ui-sass (~> 0.16.1.0) - settingslogic - shoulda-matchers (~> 2.1.0) - sidekiq (= 2.17.0) - simplecov - sinatra - six - slack-notifier (~> 0.3.2) - slim - spinach-rails - spring (= 1.1.3) - spring-commands-rspec (= 1.0.1) - spring-commands-spinach (= 1.0.0) - stamp - state_machine - test_after_commit - therubyracer - thin + sass-rails (~> 4.0.5) + sdoc (~> 0.3.20) + seed-fu (~> 2.3.5) + select2-rails (~> 3.5.9) + settingslogic (~> 2.0.9) + sham_rack + shoulda-matchers (~> 2.8.0) + sidekiq (= 3.3.0) + sidetiq (~> 0.6.3) + simplecov (~> 0.10.0) + sinatra (~> 1.4.4) + six (~> 0.2.0) + slack-notifier (~> 1.0.0) + slim (~> 2.0.2) + spinach-rails (~> 0.2.1) + spring (~> 1.3.6) + spring-commands-rspec (~> 1.0.4) + spring-commands-spinach (~> 1.0.0) + spring-commands-teaspoon (~> 0.0.2) + sprockets (~> 2.12.3) + stamp (~> 0.5.0) + state_machine (~> 1.2.0) + task_list (~> 1.0.2) + teaspoon (~> 1.0.0) + teaspoon-jasmine (~> 2.2.0) + test_after_commit (~> 0.2.2) + thin (~> 1.6.1) tinder (~> 1.9.2) - turbolinks - uglifier + turbolinks (~> 2.5.0) + uglifier (~> 2.3.2) underscore-rails (~> 1.4.4) - unf - unicorn (~> 4.6.3) - unicorn-worker-killer - version_sorter - virtus - webmock + unf (~> 0.1.4) + unicorn (~> 4.8.2) + unicorn-worker-killer (~> 0.4.2) + version_sorter (~> 2.0.0) + virtus (~> 1.0.1) + webmock (~> 1.21.0) + whenever (~> 0.8.4) wikicloth (= 0.8.1) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 4f75bb94a29..8af64ce78e9 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,15 +1,8 @@ { stdenv, lib, bundler, fetchgit, bundlerEnv, defaultGemConfig, libiconv, ruby -, tzdata, git +, tzdata, git, nodejs, procps }: let - gitlab = fetchgit { - url = "https://github.com/gitlabhq/gitlabhq.git"; - rev = "477743a154e85c411e8a533980abce460b5669fc"; - fetchSubmodules = false; - sha256 = "1gk77j886w6zvw5cawpgja6f87qirmjx7y4g5i3psxm4j67llxdp"; - }; - env = bundlerEnv { name = "gitlab"; inherit ruby; @@ -28,18 +21,18 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "7.4.2"; - buildInputs = [ ruby bundler tzdata git ]; - unpackPhase = '' - runHook preUnpack - cp -r ${gitlab}/* . - chmod -R +w . - cp ${./Gemfile} Gemfile - cp ${./Gemfile.lock} Gemfile.lock - runHook postUnpack - ''; + version = "8.0.5"; + buildInputs = [ ruby bundler tzdata git nodejs procps ]; + src = fetchgit { + url = "https://github.com/gitlabhq/gitlabhq.git"; + rev = "2866c501b5a5abb69d101cc07261a1d684b4bd4c"; + fetchSubmodules = false; + sha256 = "edc6bedd5e79940189355d8cb343d20b0781b69fcef56ccae5906fa5e81ed521"; + }; + patches = [ ./remove-hardcoded-locations.patch + ./disable-dump-schema-after-migration.patch ]; postPatch = '' # For reasons I don't understand "bundle exec" ignores the @@ -49,6 +42,10 @@ stdenv.mkDerivation rec { rm lib/tasks/test.rake mv config/gitlab.yml.example config/gitlab.yml + rm config/initializers/gitlab_shell_secret_token.rb + + substituteInPlace app/controllers/admin/background_jobs_controller.rb \ + --replace "ps -U" "${procps}/bin/ps -U" # required for some gems: cat > config/database.yml < + email_display_name: GitLab + email_reply_to: noreply@example.com - # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample). - -@@ -230,12 +230,12 @@ production: &base +@@ -298,12 +298,12 @@ production: &base # GitLab Satellites satellites: # Relative paths are relative to Rails.root (default: tmp/repo_satellites/) @@ -58,10 +62,10 @@ index e7a8d08..834ecaf 100644 backup: - path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) + path: <%= ENV['GITLAB_BACKUP_PATH'] %> + # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) # keep_time: 604800 # default: 0 (forever) (in seconds) - # upload: - # # Fog storage connection settings, see http://fog.io/storage/ . -@@ -249,11 +249,11 @@ production: &base + # pg_schema: public # default: nil, it means that all schemas will be backed up +@@ -322,15 +322,15 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -74,9 +78,14 @@ index e7a8d08..834ecaf 100644 + repos_path: <%= ENV['GITLAB_REPOSITORIES_PATH'] %> + hooks_path: <%= ENV['GITLAB_SHELL_HOOKS_PATH'] %> + # File that contains the secret key for verifying access for gitlab-shell. + # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). +- # secret_file: /home/git/gitlab/.gitlab_shell_secret ++ secret_file: <%= ENV['GITLAB_SHELL_SECRET_PATH'] %> + # Git over HTTP upload_pack: true -@@ -266,7 +266,7 @@ production: &base +@@ -343,7 +343,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: @@ -85,7 +94,7 @@ index e7a8d08..834ecaf 100644 # The next value is the maximum memory size grit can use # Given in number of bytes per git object (e.g. a commit) # This value can be increased if you have very large commits -@@ -299,7 +299,7 @@ test: +@@ -388,7 +388,7 @@ test: gravatar: enabled: true gitlab: @@ -95,14 +104,14 @@ index e7a8d08..834ecaf 100644 # When you run tests we clone and setup gitlab-shell diff --git a/lib/gitlab/app_logger.rb b/lib/gitlab/app_logger.rb -index 8e4717b..abfe2e4 100644 +index dddcb25..d61f10a 100644 --- a/lib/gitlab/app_logger.rb +++ b/lib/gitlab/app_logger.rb @@ -1,7 +1,7 @@ module Gitlab class AppLogger < Gitlab::Logger - def self.file_name -- 'application.log' + def self.file_name_noext +- 'application' + ENV["GITLAB_APPLICATION_LOG_PATH"] end diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index be10cc7744a..d0cd82039f2 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -22,7 +22,7 @@ mp4v2, mpeg2dec, x264, libmkv, fontconfig, freetype, glib, gtk, webkitgtk, intltool, libnotify, - gst_all_1, dbus_glib, udev, + gst_all_1, dbus_glib, udev, libgudev, useGtk ? true, useWebKitGtk ? false # This prevents ghb from starting in my tests }: @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { buildInputsX = stdenv.lib.optionals useGtk [ glib gtk intltool libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev + libgudev ] ++ stdenv.lib.optionals useWebKitGtk [ webkitgtk ]; # Did not test compiling with it diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 817377d900b..b02ab0eb8a9 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,8 +1,23 @@ -{ stdenv, fetchFromGitHub, kodi, steam }: +{ stdenv, fetchFromGitHub, cmake, kodi, steam, libcec_platform, tinyxml }: let - pluginDir = "/lib/kodi/plugin"; + pluginDir = "/share/kodi/addons"; + + kodi-platform = stdenv.mkDerivation rec { + project = "kodi-platform"; + version = "15.2"; + name = "${project}-${version}"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = project; + rev = "45d6ad1984fdb1dc855076ff18484dbec33939d1"; + sha256 = "1fai33mwyv5ab47b16i692g7a3vcnmxavx13xin2gh16y0qm62hi"; + }; + + buildInputs = [ cmake kodi libcec_platform tinyxml ]; + }; mkKodiPlugin = { plugin, namespace, version, src, meta, ... }: stdenv.lib.makeOverridable stdenv.mkDerivation rec { @@ -32,10 +47,10 @@ in version = "2.5.8"; src = fetchFromGitHub { - owner = "Angelscry"; - repo = namespace; - rev = "bb380b6e8b664246a791f553ddc856cbc60dae1f"; - sha256 = "0g4kk68zjl5rf6mll4g4cywq70s267471dp5r1qp3bpfpzkn0vf2"; + owner = "edwtjo"; + repo = plugin; + rev = version; + sha256 = "142vvgs37asq5m54xqhjzqvgmb0xlirvm0kz6lxaqynp0vvgrkx2"; }; meta = with stdenv.lib; { @@ -134,4 +149,36 @@ in propagatedBuildinputs = [ steam ]; }; + pvr-hts = (mkKodiPlugin rec { + plugin = "pvr-hts"; + namespace = "pvr.hts"; + version = "2.1.18"; + + src = fetchFromGitHub { + owner = "kodi-pvr"; + repo = "pvr.hts"; + rev = "016b0b3251d6d5bffaf68baf59010e4347759c4a"; + sha256 = "03lhxipz03r516pycabqc9b89kd7wih3c2dr4p602bk64bsmpi0j"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/kodi-pvr/pvr.hts; + description = "Kodi's Tvheadend HTSP client addon"; + platforms = platforms.all; + maintainers = with maintainers; [ page ]; + }; + }).override { + buildInputs = [ cmake kodi libcec_platform kodi-platform ]; + + # disables check ensuring install prefix is that of kodi + cmakeFlags = [ "-DOVERRIDE_PATHS=1" ]; + + # kodi checks for plugin .so libs existance in the addon folder (share/...) + # and the non-wrapped kodi lib/... folder before even trying to dlopen + # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use + installPhase = '' + make install + ln -s $out/lib/kodi/addons/pvr.hts/pvr.hts.so $out/share/kodi/addons/pvr.hts + ''; + }; } diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index 9f7a87f9987..716eef466fb 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper ]; buildCommand = '' - mkdir -p $out/share/kodi/addons/packages + mkdir -p $out/share/kodi/addons ${stdenv.lib.concatMapStrings (plugin: "ln -s ${plugin.out + plugin.kodiPlugin @@ -50,4 +50,4 @@ stdenv.mkDerivation { }; -} \ No newline at end of file +} diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 9515e118644..f135630a9a1 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper -, python3Packages, gst, clutter-gtk, hicolor_icon_theme +, python3Packages, gst, gtk3, hicolor_icon_theme , gobjectIntrospection, librsvg, gnome3, libnotify }: let - version = "0.94"; + version = "0.95"; in stdenv.mkDerivation rec { name = "pitivi-${version}"; src = fetchurl { url = "mirror://gnome/sources/pitivi/${version}/${name}.tar.xz"; - sha256 = "1v7s0qsibwykkmknspjhpdrj80s987pvbl01kh34k4aspi1hcapm"; + sha256 = "04ykw619aikhxk5wj7z44pvwl52053d1kamcxpscw0ixrh5j45az"; }; meta = with stdenv.lib; { @@ -29,15 +29,15 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ]; buildInputs = [ - gobjectIntrospection clutter-gtk librsvg gnome3.gnome_desktop + gobjectIntrospection gtk3 librsvg gnome3.gnome_desktop gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas libnotify ] ++ (with gst; [ gstreamer gst-editing-services gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly gst-libav + gst-plugins-bad gst-plugins-ugly gst-libav gst-validate ]) ++ (with python3Packages; [ - python pygobject3 gst-python pyxdg numpy pycairo sqlite3 + python pygobject3 gst-python pyxdg numpy pycairo sqlite3 matplotlib ]); preFixup = '' diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index d56ef964967..aed5363100b 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt5 }: stdenv.mkDerivation rec { - name = "smplayer-15.9.0"; + name = "smplayer-15.11.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "1yx6kikaj9v5aj8aavvrcklx283wl6wrnpl905hjc7v03kgp1ac5"; + sha256 = "1h8r5xjaq7p78raw1v29gsrcv221lzl8m2i2qls3khc65kx032cn"; }; patches = [ ./basegui.cpp.patch ]; diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 3076192274b..79dbf576472 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qt5 }: stdenv.mkDerivation rec { - version = "15.9.0"; + version = "15.11.0"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "1mr7iz5c2sy0yikdwybchcvgm6scs75p4cwkcpnwy2hw9p28mk1f"; + sha256 = "13pkd0462ygsdlmym6y2cfivihmi175y41jq5hjyh926cgfg7pny"; }; makeFlags = [ diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 37583648a74..5566d1aafe5 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -6,7 +6,7 @@ , mpeg2dec, udev, gnutls, avahi, libcddb, libjack2, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus -, libvdpau, libsamplerate, live555 +, libvdpau, libsamplerate, live555, fluidsynth , onlyLibVLC ? false , qt4 ? null , withQt5 ? false, qtbase ? null @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { libkate libtiger libv4l samba liboggz libass libdvbpsi libva xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555 + fluidsynth ] ++ [(if withQt5 then qtbase else qt4)] ++ optional jackSupport libjack2; diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix index 0ae461bcca9..caa72f49b94 100644 --- a/pkgs/applications/virtualization/openstack/glance.nix +++ b/pkgs/applications/virtualization/openstack/glance.nix @@ -23,11 +23,12 @@ pythonPackages.buildPythonPackage rec { # oslo componenets oslo-config oslo-context oslo-concurrency oslo-service oslo-utils oslo-db oslo-i18n oslo-log oslo-messaging oslo-middleware oslo-policy oslo-serialization + MySQL_python ]; buildInputs = with pythonPackages; [ Babel coverage fixtures mox3 mock oslosphinx requests2 testrepository pep8 - testresources testscenarios testtools psutil_1 oslotest psycopg2 MySQL_python + testresources testscenarios testtools psutil_1 oslotest psycopg2 sqlite which strace ]; diff --git a/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch b/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch new file mode 100644 index 00000000000..d7a2caa2bde --- /dev/null +++ b/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch @@ -0,0 +1,93 @@ +From 3aefdf4de76fdcdc02093bc631e339f9ecd4c707 Mon Sep 17 00:00:00 2001 +From: James Page +Date: Fri, 18 Sep 2015 16:38:47 +0100 +Subject: Add compatibility with iproute2 >= 4.0 + +The ip netns list command adds additional id data in more recent +versions of iproute2 of the format: + + qdhcp-35fc068a-750d-4add-b1d2-af392dbd8790 (id: 1) + +Update parsing to deal with old and new formats. + +Change-Id: I0d3fc4262284172f5ad31e4f2f78ae1fb33b4228 +Closes-Bug: 1497309 +--- + neutron/agent/linux/ip_lib.py | 6 +++--- + neutron/tests/functional/agent/test_l3_agent.py | 2 +- + neutron/tests/unit/agent/linux/test_ip_lib.py | 15 +++++++++++++++ + 3 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py +index 551341a..a717bf6 100644 +--- a/neutron/agent/linux/ip_lib.py ++++ b/neutron/agent/linux/ip_lib.py +@@ -208,7 +208,7 @@ class IPWrapper(SubProcessBase): + @classmethod + def get_namespaces(cls): + output = cls._execute([], 'netns', ('list',)) +- return [l.strip() for l in output.split('\n')] ++ return [l.split()[0] for l in output.splitlines()] + + + class IPDevice(SubProcessBase): +@@ -819,8 +819,8 @@ class IpNetnsCommand(IpCommandBase): + output = self._parent._execute( + ['o'], 'netns', ['list'], + run_as_root=cfg.CONF.AGENT.use_helper_for_ns_read) +- for line in output.split('\n'): +- if name == line.strip(): ++ for line in [l.split()[0] for l in output.splitlines()]: ++ if name == line: + return True + return False + +diff --git a/neutron/tests/functional/agent/test_l3_agent.py b/neutron/tests/functional/agent/test_l3_agent.py +index ffa20e6..84b16df 100644 +--- a/neutron/tests/functional/agent/test_l3_agent.py ++++ b/neutron/tests/functional/agent/test_l3_agent.py +@@ -790,7 +790,7 @@ class L3HATestFramework(L3AgentTestFramework): + get_ns_name = mock.patch.object( + namespaces.RouterNamespace, '_get_ns_name').start() + get_ns_name.return_value = "%s%s%s" % ( +- namespaces.RouterNamespace._get_ns_name(router_info['id']), ++ 'qrouter-' + router_info['id'], + self.NESTED_NAMESPACE_SEPARATOR, self.agent.host) + router1 = self.manage_router(self.agent, router_info) + +diff --git a/neutron/tests/unit/agent/linux/test_ip_lib.py b/neutron/tests/unit/agent/linux/test_ip_lib.py +index 2de408d..bdfc9d7 100644 +--- a/neutron/tests/unit/agent/linux/test_ip_lib.py ++++ b/neutron/tests/unit/agent/linux/test_ip_lib.py +@@ -27,6 +27,11 @@ NETNS_SAMPLE = [ + 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', + 'cccccccc-cccc-cccc-cccc-cccccccccccc'] + ++NETNS_SAMPLE_IPROUTE2_4 = [ ++ '12345678-1234-5678-abcd-1234567890ab (id: 1)', ++ 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb (id: 0)', ++ 'cccccccc-cccc-cccc-cccc-cccccccccccc (id: 2)'] ++ + LINK_SAMPLE = [ + '1: lo: mtu 16436 qdisc noqueue state UNKNOWN \\' + 'link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 promiscuity 0', +@@ -279,6 +284,16 @@ class TestIpWrapper(base.BaseTestCase): + + self.execute.assert_called_once_with([], 'netns', ('list',)) + ++ def test_get_namespaces_iproute2_4(self): ++ self.execute.return_value = '\n'.join(NETNS_SAMPLE_IPROUTE2_4) ++ retval = ip_lib.IPWrapper.get_namespaces() ++ self.assertEqual(retval, ++ ['12345678-1234-5678-abcd-1234567890ab', ++ 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', ++ 'cccccccc-cccc-cccc-cccc-cccccccccccc']) ++ ++ self.execute.assert_called_once_with([], 'netns', ('list',)) ++ + def test_add_tuntap(self): + ip_lib.IPWrapper().add_tuntap('tap0') + self.execute.assert_called_once_with([], 'tuntap', +-- +cgit v0.11.2 + diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix index ce3e71b16ee..ce44ed2913c 100644 --- a/pkgs/applications/virtualization/openstack/neutron.nix +++ b/pkgs/applications/virtualization/openstack/neutron.nix @@ -1,5 +1,4 @@ - -{ stdenv, fetchurl, pythonPackages, xmlsec, which }: +{ stdenv, fetchurl, pythonPackages, xmlsec, which, dnsmasq }: pythonPackages.buildPythonPackage rec { name = "neutron-${version}"; @@ -29,9 +28,11 @@ pythonPackages.buildPythonPackage rec { ]; # make sure we include migrations - patchPhase = '' + prePatch = '' echo "graft neutron" >> MANIFEST.in + substituteInPlace etc/neutron/rootwrap.d/dhcp.filters --replace "/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" ''; + patches = [ ./neutron-iproute-4.patch ]; buildInputs = with pythonPackages; [ cliff coverage fixtures mock subunit requests-mock oslosphinx testrepository diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index d3e0c4ff04d..6b3eb079f98 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -9,7 +9,7 @@ let stage1Flavours = [ "coreos" ]; in stdenv.mkDerivation rec { - version = "0.11.0"; + version = "0.12.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { rev = "v${version}"; owner = "coreos"; repo = "rkt"; - sha256 = "0qdg3m99viymran9n7rxywwbqr3xqgk8r7hsk6nj3liwqsx6agiv"; + sha256 = "1qwj3a4780lqra2c6ncw86lskzqnh59fxk577hgqym4jgxxk4bbv"; }; stage1BaseImage = fetchurl { diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 243b6464bb5..0d54489a189 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ eventlet greenlet gflags netaddr carrot routes PasteDeploy m2crypto ipy twisted sqlalchemy_migrate_0_7 - distutils_extra simplejson readline glance cheetah lockfile httplib2 + distutils_extra simplejson readline glanceclient cheetah lockfile httplib2 urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3 libvirt libxml2Python ipaddr vte libosinfo gobjectIntrospection gtk3 mox gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index adcefe6004a..62b5bea47fa 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes PasteDeploy m2crypto ipy twisted sqlalchemy_migrate - distutils_extra simplejson readline glance cheetah lockfile httplib2 + distutils_extra simplejson readline glanceclient cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that # libxml2Python is a dependency of libvirt.py. libvirt libxml2Python urlgrabber diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 5e198607676..cbdd00dc59c 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -18,7 +18,7 @@ let # revision/hash as well. See # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS # for hashes. - version = "5.0.6"; + version = "5.0.10"; forEachModule = action: '' for mod in \ @@ -39,12 +39,12 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "103037"; + extpackRevision = "104061"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! - sha256 = "4eed4f3d253bffe4ce61ee9431d79cbe1f897b3583efc2ff3746f453450787b5"; + sha256 = "c846fa26fec8587e57180c85c408cad377c48ad26830b0dc839ebf9025e3d29c"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -63,7 +63,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "0hsqd9bvbbzs3ihlfp2m15z6vx3nydjirv6drhfs6r9iqhl3zmi2"; + sha256 = "56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 0d2e0568523..a122e97f114 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "59ed9911c2bb22357345448c3df6104938b45fa780311d20c330e39c6e309991"; + sha256 = "8f7ffee3fac75793e48d1859b65a95879b3ed5bc1c3164c967e85d69244c594b"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; @@ -75,7 +75,7 @@ stdenv.mkDerivation { for i in lib/VBoxOGL*.so do - patchelf --set-rpath $out/lib:${dbus.lib}/lib $i + patchelf --set-rpath $out/lib:${dbus.lib}/lib:${libXcomposite.out}/lib:${libXdamage.out}/lib:${libXext.out}/lib:${libXfixes.out}/lib $i done # FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions diff --git a/pkgs/applications/virtualization/xen/4.5.1.nix b/pkgs/applications/virtualization/xen/4.5.2.nix similarity index 71% rename from pkgs/applications/virtualization/xen/4.5.1.nix rename to pkgs/applications/virtualization/xen/4.5.2.nix index 3412a0bd6ec..f8f7630189f 100644 --- a/pkgs/applications/virtualization/xen/4.5.1.nix +++ b/pkgs/applications/virtualization/xen/4.5.2.nix @@ -1,14 +1,14 @@ { callPackage, fetchurl, fetchgit, ... } @ args: let - # Xen 4.5.1 - xenConfig = { - name = "xen-4.5.1"; - version = "4.5.1"; + # Xen 4.5.2 + xenConfig = rec { + version = "4.5.2"; + name = "xen-${version}"; src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/4.5.1/xen-4.5.1.tar.gz"; - sha256 = "0w8kbqy7zixacrpbk3yj51xx7b3f6l8ghsg3551w8ym6zka13336"; + url = "http://bits.xensource.com/oss-xen/release/${version}/${name}.tar.gz"; + sha256 = "1s7702zrxpsmx4vqvll4x2s762cfdiss4vgpx5s4jj7a9sn5v7jc"; }; # Sources needed to build the xen tools and tools/firmware. @@ -23,25 +23,25 @@ let } { git = { name = "ovmf"; url = git://xenbits.xen.org/ovmf.git; - rev = "447d264115c476142f884af0be287622cd244423"; - sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b"; + rev = "cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"; + sha256 = "1ncb8dpqzaj3s8am44jvclhby40hwczljz0a1gd282h9yr4k4sk2"; }; } ]; toolsGits = - [ # tag qemu-xen-4.5.1 + [ # tag qemu-xen-4.5.2 { git = { name = "qemu-xen"; url = git://xenbits.xen.org/qemu-upstream-4.5-testing.git; - rev = "d9552b0af21c27535cd3c8549bb31d26bbecd506"; - sha256 = "15dbz8j26wl4vs5jijhccwgd8c6wkmpj4mz899fa7i1bbh8yysfy"; + rev = "e5a1bb22cfb307db909dbd3404c48e5bbeb9e66d"; + sha256 = "1qflb3j8qcvipavybqhi0ql7m2bx51lhzgmf7pdbls8minpvdzg2"; }; } - # tag xen-4.5.1 + # tag xen-4.5.2 { git = { name = "qemu-xen-traditional"; url = git://xenbits.xen.org/qemu-xen-4.5-testing.git; - rev = "afaa35b4bc975b2b89ad44c481d0d7623e3d1c49"; - sha256 = "906b31cf32b52d29e521abaa76d641123bdf24f33fa53c6f109b6d7834e514be"; + rev = "dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0"; + sha256 = "14fxdsnkq729z5glkifdpz26idmn7fl38w1v97xj8cf6ifvk76cz"; }; } { git = { name = "xen-libhvm"; @@ -64,4 +64,3 @@ let }; in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) - diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix index ec900949392..3b07bc5a654 100644 --- a/pkgs/applications/window-managers/clfswm/default.nix +++ b/pkgs/applications/window-managers/clfswm/default.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { # Stripping destroys the generated SBCL image dontStrip = true; + configurePhase = '' + substituteInPlace load.lisp --replace \ + ";; (setf *contrib-dir* \"/usr/local/lib/clfswm/\")" \ + "(setf *contrib-dir* \"$out/lib/clfswm/\")" + ''; + installPhase = '' mkdir -pv $out/bin make DESTDIR=$out install diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix new file mode 100644 index 00000000000..b2aa4de40c0 --- /dev/null +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }: + +stdenv.mkDerivation rec { + name = "cwm-5.6"; + + src = fetchFromGitHub { + owner = "chneukirchen"; + repo = "cwm"; + rev = "b7a8c11750d11721a897fdb8442d52f15e7a24a0"; + sha256 = "0a0x8rgqif4kxy7hj70hck7jma6c8jy4428ybl8fz9qxgxh014ml"; + }; + + buildInputs = [ libX11 libXinerama libXrandr libXft yacc pkgconfig ]; + + prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; + + meta = with stdenv.lib; { + description = "A lightweight and efficient window manager for X11"; + homepage = https://github.com/chneukirchen/cwm; + maintainers = []; + license = licenses.isc; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 6830e3a1c01..aded77a466d 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -1,8 +1,12 @@ -{ stdenv, fetchurl, pkgconfig +{ gestures ? false +, stdenv, fetchurl, pkgconfig , cairo, fontconfig, freetype, libXft, libXcursor, libXinerama , libXpm, librsvg, libpng, fribidi, perl +, libstroke ? null }: +assert gestures -> libstroke != null; + stdenv.mkDerivation rec { name = "fvwm-2.6.5"; @@ -15,7 +19,7 @@ stdenv.mkDerivation rec { pkgconfig cairo fontconfig freetype libXft libXcursor libXinerama libXpm librsvg libpng fribidi perl - ]; + ] ++ stdenv.lib.optional gestures libstroke; meta = { homepage = "http://fvwm.org"; diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix new file mode 100644 index 00000000000..466c5b7ec6f --- /dev/null +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -0,0 +1,22 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "i3blocks-${version}"; + version = "1.4"; + + src = fetchurl { + url = "https://github.com/vivien/i3blocks/releases/download/${version}/${name}.tar.gz"; + sha256 = "c64720057e22cc7cac5e8fcd58fd37e75be3a7d5a3cb8995841a7f18d30c0536"; + }; + + makeFlags = "all"; + installFlags = "PREFIX=\${out} VERSION=${version}"; + + meta = with stdenv.lib; { + description = "A flexible scheduler for your i3bar blocks."; + homepage = https://github.com/vivien/i3blocks; + license = licenses.gpl3; + maintainers = [ "MindTooth" ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch new file mode 100644 index 00000000000..e3c88a5fa55 --- /dev/null +++ b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch @@ -0,0 +1,43 @@ +From 00c5af939567429d40877845dc52b54fde2d8a50 Mon Sep 17 00:00:00 2001 +From: "Alexander V. Nikolaev" +Date: Thu, 26 Nov 2015 10:53:12 +0200 +Subject: [PATCH 1/3] Substitution vars for absolute paths + +--- + libqtile/pangocffi.py | 6 +++--- + libqtile/xcursors.py | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libqtile/pangocffi.py b/libqtile/pangocffi.py +index 27691d1..25f690d 100644 +--- a/libqtile/pangocffi.py ++++ b/libqtile/pangocffi.py +@@ -58,9 +58,9 @@ except ImportError: + else: + raise ImportError("No module named libqtile._ffi_pango, be sure to run `python ./libqtile/ffi_build.py`") + +-gobject = ffi.dlopen('libgobject-2.0.so.0') +-pango = ffi.dlopen('libpango-1.0.so.0') +-pangocairo = ffi.dlopen('libpangocairo-1.0.so.0') ++gobject = ffi.dlopen('@glib@/lib/libgobject-2.0.so.0') ++pango = ffi.dlopen('@pango@/lib/libpango-1.0.so.0') ++pangocairo = ffi.dlopen('@pango@/lib/libpangocairo-1.0.so.0') + + + def CairoContext(cairo_t): +diff --git a/libqtile/xcursors.py b/libqtile/xcursors.py +index e0e55e1..59b6428 100644 +--- a/libqtile/xcursors.py ++++ b/libqtile/xcursors.py +@@ -114,7 +114,7 @@ class Cursors(dict): + + def _setup_xcursor_binding(self): + try: +- xcursor = ffi.dlopen('libxcb-cursor.so') ++ xcursor = ffi.dlopen('@xcb-cursor@/lib/libxcb-cursor.so') + except OSError: + self.log.warning("xcb-cursor not found, fallback to font pointer") + return False +-- +2.6.3 + diff --git a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch new file mode 100644 index 00000000000..ba408b1f05b --- /dev/null +++ b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch @@ -0,0 +1,67 @@ +From f299a0aa0eefcf16bb4990f00ac3946727f43ef3 Mon Sep 17 00:00:00 2001 +From: "Alexander V. Nikolaev" +Date: Fri, 27 Nov 2015 10:49:48 +0200 +Subject: [PATCH 2/3] Restore PATH and PYTHONPATH + +--- + bin/qtile | 1 + + bin/qtile-run | 1 + + bin/qtile-session | 2 ++ + libqtile/utils.py | 7 +++++++ + 4 files changed, 11 insertions(+) + +diff --git a/bin/qtile b/bin/qtile +index 66034fe..ce3fcd1 100755 +--- a/bin/qtile ++++ b/bin/qtile +@@ -131,6 +131,7 @@ def make_qtile(): + + + if __name__ == "__main__": ++ __import__("importlib").import_module("libqtile.utils").restore_os_environment() + rename_process() + q = make_qtile() + try: +diff --git a/bin/qtile-run b/bin/qtile-run +index ccedb96..646a476 100755 +--- a/bin/qtile-run ++++ b/bin/qtile-run +@@ -50,6 +50,7 @@ def main(): + proc.wait() + + if __name__ == "__main__": ++ __import__("importlib").import_module("libqtile.utils").restore_os_environment() + try: + main() + except KeyboardInterrupt: +diff --git a/bin/qtile-session b/bin/qtile-session +index 84f6a2d..da31b12 100755 +--- a/bin/qtile-session ++++ b/bin/qtile-session +@@ -25,6 +25,8 @@ + Qtile session manager. + """ + ++__import__("importlib").import_module("libqtile.utils").restore_os_environment() ++ + from libqtile.log_utils import init_log + import logging + import os +diff --git a/libqtile/utils.py b/libqtile/utils.py +index d5f975b..0fdb080 100644 +--- a/libqtile/utils.py ++++ b/libqtile/utils.py +@@ -208,3 +208,10 @@ def get_cache_dir(): + if not os.path.exists(cache_directory): + os.makedirs(cache_directory) + return cache_directory ++ ++def restore_os_environment(): ++ pythonpath = os.environ.pop("QTILE_SAVED_PYTHONPATH", "") ++ os.environ["PYTHONPATH"] = pythonpath ++ path = os.environ.pop("QTILE_SAVED_PATH", None) ++ if path: ++ os.environ["PATH"] = path +-- +2.6.3 + diff --git a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch new file mode 100644 index 00000000000..d9377897fc6 --- /dev/null +++ b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch @@ -0,0 +1,25 @@ +From b560c11078fecc35df2c62f34beda06c4e80a10d Mon Sep 17 00:00:00 2001 +From: "Alexander V. Nikolaev" +Date: Fri, 27 Nov 2015 10:54:35 +0200 +Subject: [PATCH 3/3] Restart executable + +--- + libqtile/manager.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libqtile/manager.py b/libqtile/manager.py +index b1a38e2..110f7d8 100644 +--- a/libqtile/manager.py ++++ b/libqtile/manager.py +@@ -1339,7 +1339,7 @@ class Qtile(command.CommandObject): + argv = [s for s in argv if not s.startswith('--with-state')] + argv.append('--with-state=' + buf.getvalue().decode()) + +- self.cmd_execute(sys.executable, argv) ++ self.cmd_execute(os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:]) + + def cmd_spawn(self, cmd): + """ +-- +2.6.3 + diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 1043e3a1f64..82ff3900cc4 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,5 +1,10 @@ { stdenv, lib, fetchFromGitHub, buildPythonPackage, python27Packages, pkgs }: +let cairocffi-xcffib = python27Packages.cairocffi.override { + pythonPath = [ python27Packages.xcffib ]; + }; +in + buildPythonPackage rec { name = "qtile-${version}"; version = "0.10.2"; @@ -11,27 +16,28 @@ buildPythonPackage rec { sha256 = "0dhdwjr4pdlzli68fa8glrnsjzxp6agdab9cnmpsqlwiwh97x9a6"; }; - patches = [ ./restart_executable.patch ]; + patches = [ + ./0001-Substitution-vars-for-absolute-paths.patch + ./0002-Restore-PATH-and-PYTHONPATH.patch + ./0003-Restart-executable.patch + ]; postPatch = '' substituteInPlace libqtile/manager.py --subst-var-by out $out + substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${pkgs.glib} + substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pkgs.pango} + substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${pkgs.xorg.xcbutilcursor} ''; buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ]; - cairocffi-xcffib = python27Packages.cairocffi.override { - inherit LD_LIBRARY_PATH; - pythonPath = [ python27Packages.xcffib ]; - }; - - pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline ]; - - LD_LIBRARY_PATH = "${lib.makeLibraryPath [ pkgs.xorg.libxcb pkgs.cairo ]}"; + pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline]; postInstall = '' wrapProgram $out/bin/qtile \ - --prefix LD_LIBRARY_PATH : \ - "${LD_LIBRARY_PATH}:${lib.makeLibraryPath [ pkgs.glib pkgs.pango ]}" + --set QTILE_WRAPPER '"$0"' \ + --set QTILE_SAVED_PYTHONPATH '"$PYTHONPATH"' \ + --set QTILE_SAVED_PATH '"$PATH"' ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/qtile/restart_executable.patch b/pkgs/applications/window-managers/qtile/restart_executable.patch deleted file mode 100644 index a1e74a575d9..00000000000 --- a/pkgs/applications/window-managers/qtile/restart_executable.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruP a/libqtile/manager.py b/libqtile/manager.py ---- a/libqtile/manager.py 2015-07-26 21:26:16.947976520 +0200 -+++ b/libqtile/manager.py 2015-07-26 21:37:45.581316712 +0200 -@@ -1262,7 +1262,7 @@ - argv = [s for s in argv if not s.startswith('--with-state')] - argv.append('--with-state=' + buf.getvalue().decode()) - -- self.cmd_execute(sys.executable, argv) -+ self.cmd_execute("@out@/bin/qtile", argv[1:]) - - def cmd_spawn(self, cmd): - """ diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix index 461f4762aba..dfce8edcb23 100644 --- a/pkgs/build-support/build-fhs-chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-chrootenv/default.nix @@ -1,4 +1,4 @@ -{ stdenv } : { env } : +{ stdenv } : { env, extraInstallCommands ? "" } : let # References to shell scripts that set up or tear down the environment @@ -43,5 +43,6 @@ in stdenv.mkDerivation { -e "s|@name@|${name}|g" \ ${destroySh} > destroy-${name}-chrootenv chmod +x destroy-${name}-chrootenv + ${extraInstallCommands} ''; } diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb index 05b4914b6f6..97316ac4369 100755 --- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb +++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb @@ -140,10 +140,10 @@ if $cpid == 0 link_swdir.call swdir, Pathname.new('') # New environment - ENV.replace(Hash[ envvars.map { |x| [x, ENV[x]] } ]) + new_env = Hash[ envvars.map { |x| [x, ENV[x]] } ] # Finally, exec! - exec *execp + exec(new_env, *execp, close_others: true, unsetenv_others: true) end # Wait for a child. If we catch a signal, resend it to child and continue diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index 424adf081ca..aa95080ac52 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,4 +1,5 @@ -{ runCommand, lib, writeText, writeScriptBin, stdenv, ruby } : { env, runScript ? "bash", extraBindMounts ? [] } : +{ runCommand, lib, writeText, writeScriptBin, stdenv, ruby } : +{ env, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "" } : let name = env.pname; @@ -44,4 +45,5 @@ in runCommand name { exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init runScript} "\$(pwd)" "\$@" EOF chmod +x $out/bin/${name} + ${extraInstallCommands} '' diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 6009abd9e37..1a0726d1543 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -31,10 +31,11 @@ buildInputs ? [] , passthru ? {} +, meta ? {} }: runCommand name - rec { inherit manifest ignoreCollisions passthru pathsToLink extraPrefix postBuild buildInputs; + rec { inherit manifest ignoreCollisions passthru meta pathsToLink extraPrefix postBuild buildInputs; pkgs = builtins.toJSON (map (drv: { paths = [ drv ]; priority = drv.meta.priority or 5; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 0c7bf5b667f..f1dfd8cb666 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation { + optionalString (stdenv.isSunOS && nativePrefix != "") '' # Solaris needs an additional ld wrapper. ldPath="${nativePrefix}/bin" - ld="$out/bin/ld-solaris" + exec="$ldPath/ld" wrap ld-solaris ${./ld-solaris-wrapper.sh} '') diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh index 9216ea3198d..5a7b92b5ad7 100644 --- a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh @@ -6,7 +6,7 @@ set -u # I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( # Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 # but still no success. -cmd="@prog@ -z ignore" +cmd="@ld@ -z ignore" args=("$@"); diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index 6fd630b13f4..d41f90ebd05 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -29,6 +29,19 @@ in stdenv.mkDerivation ({ name = "emacs-${pname}${optionalString (version != null) "-${version}"}"; + unpackCmd = '' + case "$curSrc" in + *.el) + cp $curSrc $pname.el + chmod +w $pname.el + sourceRoot="." + ;; + *) + _defaultUnpack "$curSrc" + ;; + esac + ''; + buildInputs = [emacs texinfo] ++ packageRequires ++ buildInputs; propagatedBuildInputs = packageRequires; propagatedUserEnvPkgs = packageRequires; diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 64eea4ae100..4bbef1d6e62 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -6,7 +6,7 @@ source $stdenv/setup header "exporting $url (rev $rev) into $out" -$fetcher --builder --url "$url" --out "$out" --rev "$rev" \ +$SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${leaveDotGit:+--leave-dotGit} \ ${deepClone:+--deepClone} \ ${fetchSubmodules:+--fetch-submodules} \ diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index c73ee193519..127693d42f2 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -45,7 +45,7 @@ assert deepClone -> leaveDotGit; stdenv.mkDerivation { inherit name; builder = ./builder.sh; - fetcher = "${stdenv.shell} ${./nix-prefetch-git}"; + fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash. buildInputs = [git]; outputHashAlgo = if sha256 == "" then "md5" else "sha256"; diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 228a5eaa580..90dc13439a0 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -8,7 +8,7 @@ let snd = l: head (tail l); trd = l: head (tail (tail l)); path_ = reverseList (splitString "/" url); - path = if head path_ == "" then tail path_ else path_; + path = [ (removeSuffix "/" (head path_)) ] ++ (tail path_); in # ../repo/trunk -> repo if fst path == "trunk" then snd path diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index b4c8e1f992c..29565d7cdb9 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -89,10 +89,6 @@ for url in $urls; do if test -z "${!varName}"; then echo "warning: unknown mirror:// site \`$site'" else - # Assume that SourceForge/GNU/kernel mirrors have better - # bandwidth than nixos.org. - preferHashedMirrors= - mirrors=${!varName} # Allow command-line override by setting NIX_MIRRORS_$site. diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 9a3cdd5c77d..767444e7698 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -51,50 +51,12 @@ rec { # GnuPG. gnupg = [ - http://gd.tuwien.ac.at/privacy/gnupg/ - ftp://gd.tuwien.ac.at/privacy/gnupg/ - ftp://gnupg.x-zone.org/pub/gnupg/ - ftp://ftp.gnupg.cz/pub/gcrypt/ - ftp://sunsite.dk/pub/security/gcrypt/ - http://gnupg.wildyou.net/ - http://ftp.gnupg.zone-h.org/ - ftp://ftp.jyu.fi/pub/crypt/gcrypt/ - ftp://trumpetti.atm.tut.fi/gcrypt/ - ftp://mirror.cict.fr/gnupg/ - ftp://ftp.strasbourg.linuxfr.org/pub/gnupg/ - ftp://ftp.cert.dfn.de/pub/tools/crypt/gcrypt/ - ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/ - ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/ - ftp://hal.csd.auth.gr/mirrors/gnupg/ - ftp://igloo.linux.gr/pub/crypto/gnupg/ - ftp://ftp.uoi.gr/mirror/gcrypt/ - ftp://ftp.crysys.hu/pub/gnupg/ - ftp://ftp.kfki.hu/pub/packages/security/gnupg/ - ftp://ftp.hi.is/pub/mirrors/gnupg/ - ftp://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/ - ftp://ftp3.linux.it/pub/mirrors/gnupg/ - ftp://ftp.linux.it/pub/mirrors/gnupg/ - ftp://ftp.bit.nl/mirror/gnupg/ - ftp://ftp.demon.nl/pub/mirrors/gnupg/ - ftp://ftp.surfnet.nl/pub/security/gnupg/ - ftp://sunsite.icm.edu.pl/pub/security/gnupg/ - ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gnupg.org/ - http://ftp.gnupg.tsuren.net/ - http://www.mirror386.com/gnupg/ - ftp://ftp.sunet.se/pub/security/gnupg/ - ftp://mirror.switch.ch/mirror/gnupg/ - ftp://ftp.mirrorservice.org/sites/ftp.gnupg.org/gcrypt - - http://gnupg.unixmexico.org/ftp/ - ftp://ftp.gnupg.ca/ - http://gulus.usherbrooke.ca/pub/appl/GnuPG/ - http://mirrors.rootmode.com/ftp.gnupg.org/ - - ftp://ftp.planetmirror.com/pub/gnupg/ - - ftp://pgp.iijlab.net/pub/pgp/gnupg/ - ftp://ftp.ring.gr.jp/pub/net/gnupg/ - ftp://gnupg.cdpa.nsysu.edu.tw/gnupg/ + https://gnupg.org/ftp/gcrypt/ + http://www.ring.gr.jp/pub/net/ + http://gd.tuwien.ac.at/privacy/ + http://mirrors.dotsrc.org/ + http://ftp.heanet.ie/mirrors/ftp.gnupg.org/ + http://www.mirrorservice.org/sites/ftp.gnupg.org/ ]; # kernel.org's /pub (/pub/{linux,software}) tree. diff --git a/pkgs/build-support/gcc-wrapper-old/utils.sh b/pkgs/build-support/gcc-wrapper-old/utils.sh index 753b3772e95..fa19f91bf5d 100644 --- a/pkgs/build-support/gcc-wrapper-old/utils.sh +++ b/pkgs/build-support/gcc-wrapper-old/utils.sh @@ -14,6 +14,8 @@ badPath() { # the temporary build directory). if test "${p:0:1}" != "/"; then return 1; fi + @extraPathTests@ + # Otherwise, the path should refer to the store or some temporary # directory (including the build directory). test \ diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 9d8cd0217a5..38660718d0e 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -19,12 +19,12 @@ patchShebangs() { local newInterpreterLine find "$dir" -type f -perm -0100 | while read f; do - if [ "$(head -1 "$f" | head -c +2)" != '#!' ]; then + if [ "$(head -1 "$f" | head -c+2)" != '#!' ]; then # missing shebang => not a script continue fi - oldInterpreterLine=$(head -1 "$f" | tail -c +3) + oldInterpreterLine=$(head -1 "$f" | tail -c+3) read -r oldPath arg0 args <<< "$oldInterpreterLine" if $(echo "$oldPath" | grep -q "/bin/env$"); then diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/data/documentation/man-pages-posix/default.nix index 78b3aa1c8b3..3fb21a241bf 100644 --- a/pkgs/data/documentation/man-pages-posix/default.nix +++ b/pkgs/data/documentation/man-pages-posix/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "POSIX man-pages (0p, 1p, 3p)"; - homepage = http://kernel.org/pub/linux/docs/manpages/; + homepage = https://www.kernel.org/doc/man-pages/; }; } diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 923b95040fb..ae7cac62bcb 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: -let version = "4.02"; in +let version = "4.03"; in stdenv.mkDerivation rec { name = "man-pages-${version}"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "1lqdzw6n3rqhd097lk5w16jcjhwfqs5zvi42hsbk3p92smswpaj8"; + sha256 = "177w71rwsw3lsh9pjqy625s5iwz1ahdaj7prys1bpc4bqi78q5mh"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/documentation/pthread-man-pages/default.nix b/pkgs/data/documentation/pthread-man-pages/default.nix deleted file mode 100644 index cbd3234b2d4..00000000000 --- a/pkgs/data/documentation/pthread-man-pages/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -/* Pthread man pages from LinuxThreads. - - Some of these pages are superseded by those in the `man-pages' - package, but not all. Like other distros (e.g., Debian's - `glibc-doc' package) we take man pages from LinuxThreads so that - we can cover pretty much all of pthreads. */ - -{ fetchurl, stdenv, perl }: - -let version = "2.5"; -in - stdenv.mkDerivation rec { - name = "pthread-man-pages-${version}"; - - src = fetchurl { - url = "mirror://gnu/glibc/glibc-linuxthreads-${version}.tar.bz2"; - sha256 = "0b5xg7ba64d1gbqw4k1qk96qgy7h2y4qksr0qx8v7a14c6xaw9zf"; - }; - - buildInputs = [ perl ]; - - unpackPhase = '' - echo "unpacking to \`${name}'" - mkdir "${name}" - cd "${name}" - tar xjvf "$src" - ''; - - patchPhase = '' - mkdir -p "$out/share/man/man3" - - sed -i "linuxthreads/man/Makefile" \ - -e "s|MANDIR *=.*$|MANDIR = $out/share/man/man3| ; - s|3thr|3|g" - ''; - - preConfigure = "cd linuxthreads/man"; - - postInstall = '' - chmod a-x $out/share/man/man3/*.3 - ''; - - meta = { - description = "POSIX threads (pthreads) manual pages from LinuxThreads"; - homepage = http://www.gnu.org/software/libc/; - maintainers = [ stdenv.lib.maintainers.mornfall ]; - }; - } diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix new file mode 100644 index 00000000000..d08887a5cde --- /dev/null +++ b/pkgs/data/fonts/dina-pcf/default.nix @@ -0,0 +1,61 @@ +{stdenv, fetchurl, unzip, bdftopcf, mkfontdir, mkfontscale}: + +stdenv.mkDerivation rec { + version = "2.92"; + name = "dina-font-pcf-${version}"; + + src = fetchurl { + url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; + sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z"; + }; + + buildInputs = [ unzip bdftopcf mkfontdir mkfontscale ]; + + dontBuild = true; + patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf"; + installPhase = '' + _get_font_size() { + _pt=$\{1%.bdf} + _pt=$\{_pt#*-} + echo $_pt + } + + for i in Dina_i400-*.bdf; do + bdftopcf -t -o DinaItalic$(_get_font_size $i).pcf $i + done + for i in Dina_i700-*.bdf; do + bdftopcf -t -o DinaBoldItalic$(_get_font_size $i).pcf $i + done + for i in Dina_r400-*.bdf; do + bdftopcf -t -o DinaMedium$(_get_font_size $i).pcf $i + done + for i in Dina_r700-*.bdf; do + bdftopcf -t -o DinaBold$(_get_font_size $i).pcf $i + done + gzip *.pcf + + fontDir="$out/share/fonts/misc" + mkdir -p "$fontDir" + mv *.pcf.gz "$fontDir" + + cd "$fontDir" + mkfontdir + mkfontscale + ''; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + description = "A monospace bitmap font aimed at programmers"; + longDescription = '' + Dina is a monospace bitmap font, primarily aimed at programmers. It is + relatively compact to allow a lot of code on screen, while (hopefully) + clear enough to remain readable even at high resolutions. + ''; + homepage = https://www.donationcoder.com/Software/Jibz/Dina/; + downloadPage = https://www.donationcoder.com/Software/Jibz/Dina/; + license = licenses.free; + maintainers = [ maintainers.prikhi ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index be420df4886..a206bd7f911 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, bdftopcf, mkfontdir, mkfontscale}: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { version = "2.92"; @@ -9,42 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z"; }; - buildInputs = [ unzip bdftopcf mkfontdir mkfontscale ]; + nativeBuildInputs = [ unzip ]; + phases = [ "unpackPhase" "installPhase" ]; - dontBuild = true; - patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf"; - installPhase = '' - _get_font_size() { - _pt=$\{1%.bdf} - _pt=$\{_pt#*-} - echo $_pt - } - - for i in Dina_i400-*.bdf; do - bdftopcf -t -o DinaItalic$(_get_font_size $i).pcf $i - done - for i in Dina_i700-*.bdf; do - bdftopcf -t -o DinaBoldItalic$(_get_font_size $i).pcf $i - done - for i in Dina_r400-*.bdf; do - bdftopcf -t -o DinaMedium$(_get_font_size $i).pcf $i - done - for i in Dina_r700-*.bdf; do - bdftopcf -t -o DinaBold$(_get_font_size $i).pcf $i - done - gzip *.pcf - - fontDir="$out/share/fonts/misc" - mkdir -p "$fontDir" - mv *.pcf.gz "$fontDir" - - cd "$fontDir" - mkfontdir - mkfontscale + installPhase = + '' + mkdir -p $out/share/fonts + cp *.bdf $out/share/fonts ''; - preferLocalBuild = true; - meta = with stdenv.lib; { description = "A monospace bitmap font aimed at programmers"; longDescription = '' diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix new file mode 100644 index 00000000000..784dfe71007 --- /dev/null +++ b/pkgs/data/fonts/droid/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "font-droid-${version}"; + version = "2015-12-09"; + at = "2776afefa9e0829076cd15fdc41e7950e2ffab82"; + + srcs = [ + (fetchurl { + url = "https://github.com/google/fonts/raw/${at}/apache/droidsans/DroidSans.ttf"; + sha256 = "1yml18dm86rrkihb2zz0ng8b1j2bb14hxc1d3hp0998vsr9s1w4h"; + }) + (fetchurl { + url = "https://github.com/google/fonts/raw/${at}/apache/droidsans/DroidSans-Bold.ttf"; + sha256 = "1z61hz92d3l1pawmbc6iwi689v8rr0xlkx59pl89m1g9aampdrmh"; + }) + (fetchurl { + url = "https://github.com/google/fonts/raw/${at}/apache/droidsansmono/DroidSansMono.ttf"; + sha256 = "0rzspxg457q4f4cp2wz93py13lbnqbhf12q4mzgy6j30njnjwl9h"; + }) + (fetchurl { + url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif.ttf"; + sha256 = "1y7jzi7dz8j1yp8dxbmbvd6dpsck2grk3q1kd5rl7f31vlq5prj1"; + }) + (fetchurl { + url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-Bold.ttf"; + sha256 = "1c61b423sn5nnr2966jdzq6fy8pw4kg79cr3nbby83jsly389f9b"; + }) + (fetchurl { + url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-Italic.ttf"; + sha256 = "1bvrilgi0s72hiiv32hlxnzazslh3rbz8wgmsln0i9mnk7jr9bs0"; + }) + (fetchurl { + url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-BoldItalic.ttf"; + sha256 = "052vlkmhy9c5nyk4byvhzya3y57fb09lqxd6spar6adf9ajbylgi"; + }) + ]; + + phases = [ "unpackPhase" "installPhase" ]; + + sourceRoot = "./"; + + unpackCmd = '' + ttfName=$(basename $(stripHash $curSrc; echo $strippedName)) + cp $curSrc ./$ttfName + ''; + + installPhase = '' + mkdir -p $out/share/fonts/droid + cp *.ttf $out/share/fonts/droid + ''; + + meta = { + description = "Droid Family fonts by Google Android"; + homepage = [ https://github.com/google/fonts ]; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.all; + maintainers = []; + }; +} diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index 91bf95d1ea2..fe23b04c551 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ipafont-003.03"; src = fetchurl { - url = "http://ipafont.ipa.go.jp/ipafont/IPAfont00303.php"; + url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php"; sha256 = "f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5"; }; diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/data/soundfonts/fluid/default.nix new file mode 100644 index 00000000000..578e0180ec3 --- /dev/null +++ b/pkgs/data/soundfonts/fluid/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "Fluid-3"; + + src = fetchurl { + url = "http://www.musescore.org/download/fluid-soundfont.tar.gz"; + sha256 = "1f96bi0y6rms255yr8dfk436azvwk66c99j6p43iavyq8jg7c5f8"; + }; + + sourceRoot = "."; + + installPhase = '' + install -Dm644 "FluidR3 GM2-2.SF2" $out/share/soundfonts/FluidR3_GM2-2.sf2 + ''; + + meta = with stdenv.lib; { + description = "Frank Wen's pro-quality GM/GS soundfont"; + homepage = "http://www.hammersound.net/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix index bb89ef84202..f48feb20579 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart gdk_pixbuf gnome3.defaultIconTheme librsvg python3 - gnome3.grilo gnome3.grilo-plugins libxml2 python3Packages.pygobject3 libnotify - python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser - gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify + python3Packages.pycairo python3Packages.dbus python3Packages.requests2 + python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook gnome3.gsettings_desktop_schemas makeWrapper tracker ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix index 6c36f892bcc..c96e12eedde 100644 --- a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix @@ -2,12 +2,12 @@ , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }: stdenv.mkDerivation rec { - version = "${gnome3.version}.3"; + version = "${gnome3.version}.2"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "1czc707y2ksb8lgq1la0qkj3wpi202hjfiyshsndhw0pqn3qjj4a"; + sha256 = "0w9d0vbqhvc78vqlsyaywmrpzibr7137398azpfh416bm6vh6d3h"; }; buildInputs = [ intltool autoreconfHook pkgconfig vala glib diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix index 64fcab343e4..dac7a6ba20a 100644 --- a/pkgs/desktops/plasma-5.4/kscreen.nix +++ b/pkgs/desktops/plasma-5.4/kscreen.nix @@ -13,6 +13,9 @@ plasmaPackage { kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui ]; propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ]; + propagatedUserEnvPkgs = [ + libkscreen # D-Bus service + ]; postInstall = '' wrapQtProgram "$out/bin/kscreen-console" ''; diff --git a/pkgs/desktops/plasma-5.5/breeze-gtk.nix b/pkgs/desktops/plasma-5.5/breeze-gtk.nix new file mode 100644 index 00000000000..179f15dc876 --- /dev/null +++ b/pkgs/desktops/plasma-5.5/breeze-gtk.nix @@ -0,0 +1,8 @@ +{ plasmaPackage +, extra-cmake-modules +}: + +plasmaPackage { + name = "breeze-gtk"; + nativeBuildInputs = [ extra-cmake-modules ]; +} diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/plasma-5.5/default.nix index 33937aa3220..812c70c2b00 100644 --- a/pkgs/desktops/plasma-5.5/default.nix +++ b/pkgs/desktops/plasma-5.5/default.nix @@ -44,11 +44,12 @@ let addPackages = self: with self; { bluedevil = callPackage ./bluedevil.nix {}; + breeze-gtk = callPackage ./breeze-gtk.nix {}; breeze-qt4 = callPackage ./breeze-qt4.nix {}; breeze-qt5 = callPackage ./breeze-qt5.nix {}; breeze = let version = (builtins.parseDrvName breeze-qt5.name).version; - in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ]; + in symlinkJoin "breeze-${version}" [ breeze-gtk breeze-qt4 breeze-qt5 ]; kde-cli-tools = callPackage ./kde-cli-tools.nix {}; kde-gtk-config = callPackage ./kde-gtk-config {}; kdecoration = callPackage ./kdecoration.nix {}; diff --git a/pkgs/desktops/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/plasma-5.5/fetchsrcs.sh index e9b551f86b9..7ccb8e3a2e2 100755 --- a/pkgs/desktops/plasma-5.5/fetchsrcs.sh +++ b/pkgs/desktops/plasma-5.5/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/unstable/plasma/5.4.95/" +RELEASE_URL="http://download.kde.org/stable/plasma/5.5.0/" EXTRA_WGET_ARGS='-A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/desktops/plasma-5.5/kscreen.nix b/pkgs/desktops/plasma-5.5/kscreen.nix index 64fcab343e4..113c2565d07 100644 --- a/pkgs/desktops/plasma-5.5/kscreen.nix +++ b/pkgs/desktops/plasma-5.5/kscreen.nix @@ -10,9 +10,21 @@ plasmaPackage { makeQtWrapper ]; buildInputs = [ - kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui + kconfig + kconfigwidgets + kdbusaddons + kwidgetsaddons + kxmlgui + ]; + propagatedBuildInputs = [ + kglobalaccel + ki18n + libkscreen + qtdeclarative + ]; + propagatedUserEnvPkgs = [ + libkscreen # D-Bus service ]; - propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ]; postInstall = '' wrapQtProgram "$out/bin/kscreen-console" ''; diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix index 843a7c03c43..a73060ad1af 100644 --- a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix @@ -18,16 +18,46 @@ plasmaPackage rec { makeQtWrapper ]; buildInputs = [ - attica boost fontconfig kcmutils kdbusaddons kded kitemmodels - knewstuff knotifications knotifyconfig kwallet libcanberra_kde - libXcursor libpulseaudio libXft libxkbfile phonon - qtsvg xf86inputevdev xf86inputsynaptics - xkeyboard_config xinput + attica + boost + fontconfig + kcmutils + kdbusaddons + kded + kitemmodels + knewstuff + knotifications + knotifyconfig + kwallet + libcanberra_kde + libXcursor + libpulseaudio + libXft + libxkbfile + phonon + qtsvg + xf86inputevdev + xf86inputsynaptics + xkeyboard_config + xinput ]; propagatedBuildInputs = [ - baloo kactivities kauth kdeclarative kdelibs4support kemoticons - kglobalaccel ki18n kpeople krunner kwin plasma-framework - plasma-workspace qtdeclarative qtquick1 qtquickcontrols + baloo + kactivities + kauth + kdeclarative + kdelibs4support + kemoticons + kglobalaccel + ki18n + kpeople + krunner + kwin + plasma-framework + plasma-workspace + qtdeclarative + qtquick1 + qtquickcontrols qtx11extras ]; # All propagatedBuildInputs should be present in the profile because diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch index 251e1260e66..fd0d596243b 100644 --- a/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch +++ b/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch @@ -1,4 +1,4 @@ -From 1b95c8c95fb8ea097bb5236b19962c7feff9f333 Mon Sep 17 00:00:00 2001 +From ec91088ec46358f39a0374b910cd776993c63acf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Oct 2015 18:55:36 -0500 Subject: [PATCH 1/2] qt-5.5 QML import paths @@ -80,7 +80,7 @@ index a086581..6e1e8be 100755 Item { id: batterymonitor diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml -index d32e7b7..828c5fb 100644 +index 80e7e53..0083cf0 100644 --- a/applets/lock_logout/contents/ui/lockout.qml +++ b/applets/lock_logout/contents/ui/lockout.qml @@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch index d8f3e669bc7..4b458580633 100644 --- a/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch +++ b/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch @@ -1,6 +1,6 @@ -From 8e5cf662d55415a838ce8c53f854202257e9feb4 Mon Sep 17 00:00:00 2001 +From e5c11a5efc4f8e8ba4e89e0172220da921df38c6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel -Date: Sun, 22 Nov 2015 08:31:42 -0600 +Date: Wed, 9 Dec 2015 13:20:02 -0600 Subject: [PATCH 2/2] startkde NixOS patches --- @@ -8,7 +8,7 @@ Subject: [PATCH 2/2] startkde NixOS patches 1 file changed, 89 insertions(+), 122 deletions(-) diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 41a8975..130578e 100644 +index 37ab5cd..130578e 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,8 +1,31 @@ @@ -121,7 +121,7 @@ index 41a8975..130578e 100644 - } - - oxygenDir=$fontsDir/oxygen -- prefixDir="@@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen" +- prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen" - - # if the oxygen dir doesn't exist, create a symlink to be sure that the - # Oxygen font is available to the user diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix index bf8b0304a41..78db6e51511 100644 --- a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix @@ -49,7 +49,6 @@ plasmaPackage rec { wrapQtProgram "$out/bin/kcheckrunning" wrapQtProgram "$out/bin/systemmonitor" wrapQtProgram "$out/bin/kstartupconfig5" - wrapQtProgram "$out/bin/startplasmacompositor" wrapQtProgram "$out/bin/kdostartupconfig5" wrapQtProgram "$out/bin/klipper" wrapQtProgram "$out/bin/kuiserver5" @@ -57,6 +56,9 @@ plasmaPackage rec { wrapQtProgram "$out/bin/plasmashell" wrapQtProgram "$out/lib/libexec/drkonqi" + + rm "$out/bin/startplasmacompositor" rm "$out/lib/libexec/startplasma" + rm -r "$out/share/wayland-sessions" ''; } diff --git a/pkgs/desktops/plasma-5.5/srcs.nix b/pkgs/desktops/plasma-5.5/srcs.nix index f8ff0be3f85..488f4de17ff 100644 --- a/pkgs/desktops/plasma-5.5/srcs.nix +++ b/pkgs/desktops/plasma-5.5/srcs.nix @@ -3,307 +3,307 @@ { bluedevil = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/bluedevil-5.4.95.tar.xz"; - sha256 = "0ffd6vw3g0psysc4qwac55r9p32rl7jwvmwc468rpp9xvh52lx4p"; - name = "bluedevil-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/bluedevil-5.5.0.tar.xz"; + sha256 = "0h0i6npmi2llrma4d0k7jaibfjkwvi7qm003i73prza5b2lm9qgk"; + name = "bluedevil-5.5.0.tar.xz"; }; }; breeze = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/breeze-5.4.95.tar.xz"; - sha256 = "1xvxykmzp6i2qh6zgdwh1hj6pcfll7y3b63ypivnggi96crynxyr"; - name = "breeze-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/breeze-5.5.0.tar.xz"; + sha256 = "0jaw8ir5vd3ari4hx52mrnl5mrq9njdci8caq37b3k1p4irxba3p"; + name = "breeze-5.5.0.tar.xz"; }; }; breeze-gtk = { - version = "5.4.95"; + version = "5.5.0.1"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/breeze-gtk-5.4.95.tar.xz"; - sha256 = "1f8qfnm6qyxkar0kw0ryls8z19hk14vlkk1zvm19h0i2fhihgnqg"; - name = "breeze-gtk-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/breeze-gtk-5.5.0.1.tar.xz"; + sha256 = "04jjb81022k7xfzhzmdani057inmly2r7ksc1wvbg5adi7m0xn4n"; + name = "breeze-gtk-5.5.0.1.tar.xz"; }; }; discover = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/discover-5.4.95.tar.xz"; - sha256 = "1sj2b7sg23ahjix7xnwx3yja1iz8373c3dirgzr0ggwvqb5q5miz"; - name = "discover-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/discover-5.5.0.tar.xz"; + sha256 = "0ngxdgkr4ikqmi2x8dgbf6xbpvhwqcv79b7ir2jgmcjjl93958f4"; + name = "discover-5.5.0.tar.xz"; }; }; kde-cli-tools = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kde-cli-tools-5.4.95.tar.xz"; - sha256 = "0mh0bjjjji00nrsqr3988qh43jj7i4h7z2lpp2h1i0ykjczjmpj3"; - name = "kde-cli-tools-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kde-cli-tools-5.5.0.tar.xz"; + sha256 = "0l45hx1w1pyfbsg60lwdma9pgzdffprvrz12rqq6ylnjsz1askwv"; + name = "kde-cli-tools-5.5.0.tar.xz"; }; }; kdecoration = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kdecoration-5.4.95.tar.xz"; - sha256 = "1hbdr9nc50438lrrkdij7mdlg8sclaww1ky4rs0c067gnjgqlff3"; - name = "kdecoration-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kdecoration-5.5.0.tar.xz"; + sha256 = "1wdwnj3dridk745mgmi9xnyd7dy0n0444nvq1mggn2mj4ca6q9ra"; + name = "kdecoration-5.5.0.tar.xz"; }; }; kde-gtk-config = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kde-gtk-config-5.4.95.tar.xz"; - sha256 = "17l9ypm5b4s8580zi2maxlszh890svcrh1jq3czz10izlmhd1zih"; - name = "kde-gtk-config-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kde-gtk-config-5.5.0.tar.xz"; + sha256 = "1bi6dr7bv42rn5jf212qrr5bik8xglvaabz5srqwhs2n4z35913a"; + name = "kde-gtk-config-5.5.0.tar.xz"; }; }; kdeplasma-addons = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kdeplasma-addons-5.4.95.tar.xz"; - sha256 = "1a3d96pii6ljvr1sv4v1n5zqmpp0iv1la8jd44bj12d2xhrng7zq"; - name = "kdeplasma-addons-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kdeplasma-addons-5.5.0.tar.xz"; + sha256 = "1y3w97pbg24d2mzp2x882a43ljn5wqs74q6ry594a6mip2zzvlrz"; + name = "kdeplasma-addons-5.5.0.tar.xz"; }; }; kgamma5 = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kgamma5-5.4.95.tar.xz"; - sha256 = "0jpbd4342k8327ibwxwaam99gxc0h4bz3w0xk3chjv8jj2b3znnk"; - name = "kgamma5-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kgamma5-5.5.0.tar.xz"; + sha256 = "1i6c0m0dr23z09r1rdfcna168bmnaysqxwxmp55ix3jad9ilfa8f"; + name = "kgamma5-5.5.0.tar.xz"; }; }; khelpcenter = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/khelpcenter-5.4.95.tar.xz"; - sha256 = "09vrqjysz20pwcrkk2713jin062prz75h6hsc2swhz873ks3krb4"; - name = "khelpcenter-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/khelpcenter-5.5.0.tar.xz"; + sha256 = "0piwsa446ja6fmkxc8shzxqmbq7hcbydpc4xsc6bsjbzbskz8c09"; + name = "khelpcenter-5.5.0.tar.xz"; }; }; khotkeys = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/khotkeys-5.4.95.tar.xz"; - sha256 = "1haxxvs6nbva2x4i3ydx01hci2sfldqf9jdapl311hlliv7055bv"; - name = "khotkeys-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/khotkeys-5.5.0.tar.xz"; + sha256 = "197fhzm1rcm65k8idf0wlzsnfxpimdzg516syjzkwah5smg1qshl"; + name = "khotkeys-5.5.0.tar.xz"; }; }; kinfocenter = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kinfocenter-5.4.95.tar.xz"; - sha256 = "1xz7k8xqzhk8y652h1gixi6bkbz041k0b3di0c5a1wpa78pzxwjb"; - name = "kinfocenter-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kinfocenter-5.5.0.tar.xz"; + sha256 = "1xr9l8wg20n0fyg5x9rgyhbimgwmlf97cf2v3yi8aff5mx348avy"; + name = "kinfocenter-5.5.0.tar.xz"; }; }; kmenuedit = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kmenuedit-5.4.95.tar.xz"; - sha256 = "1p3agzz2zp1jbdd820kql5064my9lzbk3b8yzli0242gc36sjagq"; - name = "kmenuedit-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kmenuedit-5.5.0.tar.xz"; + sha256 = "1hbifshppw64zmsybvcnm4sjy14zjq9rg2jxb36blfnvw08i9z4n"; + name = "kmenuedit-5.5.0.tar.xz"; }; }; kscreen = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kscreen-5.4.95.tar.xz"; - sha256 = "1viwy2ia681nkw89n796r4irlf0za1fbhspmnsjw52i9c6ccard5"; - name = "kscreen-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kscreen-5.5.0.tar.xz"; + sha256 = "0mznp9lb9z65vfqb752iw7scz0hs3if3bmk9nq1i6ns3c520gcx6"; + name = "kscreen-5.5.0.tar.xz"; }; }; kscreenlocker = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kscreenlocker-5.4.95.tar.xz"; - sha256 = "08q2d39yfzfx69b6q0qsh3wlcqp6sh80jxaml2m1l8ksn354ldrg"; - name = "kscreenlocker-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kscreenlocker-5.5.0.tar.xz"; + sha256 = "1myx3ykcq4p9f04bp2w7anqnr9f6b2rjajhkvxbwa9rvxjhwf3n9"; + name = "kscreenlocker-5.5.0.tar.xz"; }; }; ksshaskpass = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/ksshaskpass-5.4.95.tar.xz"; - sha256 = "18k4200ji1k6xb6n5x3s76yx3izqaisb3m7q3icycyzxfq7y50b4"; - name = "ksshaskpass-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/ksshaskpass-5.5.0.tar.xz"; + sha256 = "12m88cvgvsnfvzvpyaji7x4pcb4b2xw977x5w50b73mbznxw9hhh"; + name = "ksshaskpass-5.5.0.tar.xz"; }; }; ksysguard = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/ksysguard-5.4.95.tar.xz"; - sha256 = "1bjrap38zpvnxgvm6xnzvwjqdnbj6ygmgv2qpyl12nkv5r12rr73"; - name = "ksysguard-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/ksysguard-5.5.0.tar.xz"; + sha256 = "1paj03yccnym83l5585scn6mhd82xpzz5pqwqc4gz45cfq6ix3bv"; + name = "ksysguard-5.5.0.tar.xz"; }; }; kwallet-pam = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwallet-pam-5.4.95.tar.xz"; - sha256 = "0vvhx582bk8hvfw3r7518g7vw104az31w6hpah7ki8kvfh35nh65"; - name = "kwallet-pam-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwallet-pam-5.5.0.tar.xz"; + sha256 = "084yyrm00i2yaikbl9sqzp2im56zb987cfqxqlrdgkkwf8p4g60g"; + name = "kwallet-pam-5.5.0.tar.xz"; }; }; kwayland = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwayland-5.4.95.tar.xz"; - sha256 = "0w4d2abxkmxgqfg1xg49x04av85lybkr6ymbpirrkfv5wwhgcnqy"; - name = "kwayland-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwayland-5.5.0.tar.xz"; + sha256 = "1dxa3xkqg96jw3gmc2jya3wym910pdzljhcdspk3n88045wn8hs9"; + name = "kwayland-5.5.0.tar.xz"; }; }; kwayland-integration = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwayland-integration-5.4.95.tar.xz"; - sha256 = "1c52hfshnw9b6qi0xb1vrwg39akd57q7mjc7a5wh3kn873v23jj6"; - name = "kwayland-integration-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwayland-integration-5.5.0.tar.xz"; + sha256 = "0x2kqy89nzswx06n0diskjs14bjcsi0wyydbcx57553r1dkhkhn4"; + name = "kwayland-integration-5.5.0.tar.xz"; }; }; kwin = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwin-5.4.95.tar.xz"; - sha256 = "09dw1vpcf20as8s172vf0mfxq1lrdmwl9m19b1pnpdi71fmmabhy"; - name = "kwin-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwin-5.5.0.tar.xz"; + sha256 = "0f7km0kj1wvm4knpskm3fa82f1nqbv8y8l7mj3nr00zm3rd2zc1l"; + name = "kwin-5.5.0.tar.xz"; }; }; kwrited = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwrited-5.4.95.tar.xz"; - sha256 = "1bzhx8yzwcx78mqkr24pcf9vdh9dbb0rd18pwhyw3xaib2gwiry2"; - name = "kwrited-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwrited-5.5.0.tar.xz"; + sha256 = "1f0zkm0xd3cff947nprcxf45cyk6jkcglv1b7dzn727afm456js8"; + name = "kwrited-5.5.0.tar.xz"; }; }; libkscreen = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/libkscreen-5.4.95.tar.xz"; - sha256 = "1hpjylkhlfd2h9rc13widyayfgvmwy2dqkc59m1lkf8qgdq6h0sa"; - name = "libkscreen-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/libkscreen-5.5.0.tar.xz"; + sha256 = "0w03fjcqazx60zzp4sx77fpz53i38hzgn400jqajiwbb6d3mrxw3"; + name = "libkscreen-5.5.0.tar.xz"; }; }; libksysguard = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/libksysguard-5.4.95.tar.xz"; - sha256 = "0kcxl1pjakk1l27hnc819r0319gpxzrhvq31mzhdfm3lcskjngzi"; - name = "libksysguard-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/libksysguard-5.5.0.tar.xz"; + sha256 = "1p2nhf9wnw8jf4sinkk6rq7b1daymb16lmhd22lji34ayv1fh9i8"; + name = "libksysguard-5.5.0.tar.xz"; }; }; milou = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/milou-5.4.95.tar.xz"; - sha256 = "09dz4jjb6adsgwx5qwdzzhwaianlfzs2hwx4qc366yj3hxrch13d"; - name = "milou-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/milou-5.5.0.tar.xz"; + sha256 = "0xh5fbf6j896dj7krd8fcapn5b10swgg0dmcv3sa8hzkpaw36gfm"; + name = "milou-5.5.0.tar.xz"; }; }; oxygen = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/oxygen-5.4.95.tar.xz"; - sha256 = "0j94yabkwlgnl2zq0wrcwrh6d9j193mf68b310nz2dfskq5wgvr5"; - name = "oxygen-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/oxygen-5.5.0.tar.xz"; + sha256 = "12l0m2b5d970grpi5mxd6rl3g8ry50mfr1pjv4ar7jhic6w4zi7x"; + name = "oxygen-5.5.0.tar.xz"; }; }; plasma-desktop = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-desktop-5.4.95.tar.xz"; - sha256 = "0rar2ms65jks0knkv9x0gb5f1gp0yhghpskzcpm4m0gj981vbgyp"; - name = "plasma-desktop-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-desktop-5.5.0.tar.xz"; + sha256 = "1iak4j4jiigm0sm8f1w2g4w52v2q1rja6s5sy5247j9wyyfc6vw4"; + name = "plasma-desktop-5.5.0.tar.xz"; }; }; plasma-mediacenter = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-mediacenter-5.4.95.tar.xz"; - sha256 = "0kzghc8whc87v1ljlxva2k3sx7c2zmvgmp3i2z2lnp7h882a1hak"; - name = "plasma-mediacenter-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-mediacenter-5.5.0.tar.xz"; + sha256 = "10jrbs3mrf3vwnw6a0rsipryfr4pd0jp5s89srcqk10p25pimq52"; + name = "plasma-mediacenter-5.5.0.tar.xz"; }; }; plasma-nm = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-nm-5.4.95.tar.xz"; - sha256 = "0cwc72lklv97yahh1672bqamlhil12b4wpjy2diqmq75xmajzjds"; - name = "plasma-nm-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-nm-5.5.0.tar.xz"; + sha256 = "1clzmrj78g1gs2d6qbnwk3snlz5rhipfrrzm5rsimjqxv111jfd4"; + name = "plasma-nm-5.5.0.tar.xz"; }; }; plasma-pa = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-pa-5.4.95.tar.xz"; - sha256 = "0mvxidlzl9nw52sl9r5z180c683iz1a7rr0yh0v88gl30brrqnmw"; - name = "plasma-pa-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-pa-5.5.0.tar.xz"; + sha256 = "0yi0snf6xndvwwzlylgyzpv90b9nsknrm3lsk4gvm49q8cvzy8km"; + name = "plasma-pa-5.5.0.tar.xz"; }; }; plasma-sdk = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-sdk-5.4.95.tar.xz"; - sha256 = "1lis04qmbca8n2ly2g58xhi3znca14dmib81rfshjqp9rldc2z6k"; - name = "plasma-sdk-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-sdk-5.5.0.tar.xz"; + sha256 = "196lna5zbqa8py082c96xl5d3c2l9p4rcnb06fyd91x3z1csq54v"; + name = "plasma-sdk-5.5.0.tar.xz"; }; }; plasma-workspace = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-workspace-5.4.95.tar.xz"; - sha256 = "1af2qx5q5pbxyv32fjiwn7cwf5z1xrgj5n22fprsfn1pyjnz4anv"; - name = "plasma-workspace-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-workspace-5.5.0.tar.xz"; + sha256 = "013z03s0iy3aw9ks703wif7m6mlxx0vrxj98zvscmiaiasryhf13"; + name = "plasma-workspace-5.5.0.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-workspace-wallpapers-5.4.95.tar.xz"; - sha256 = "0bz0hk6bnm14ppnglwjd82w9gyjm5smv7cpicj25cfwlvz3qjizz"; - name = "plasma-workspace-wallpapers-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-workspace-wallpapers-5.5.0.tar.xz"; + sha256 = "0qs547zy8qdmypa6cd60ksian94fykaysnjn7di00gjf2jpfy4dz"; + name = "plasma-workspace-wallpapers-5.5.0.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.4.95"; + version = "1-5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/polkit-kde-agent-1-5.4.95.tar.xz"; - sha256 = "0hc4a36fxn5bw77hldpklj5dwxxx3c67pni9q8d9bpdk52d89wcg"; - name = "polkit-kde-agent-1-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/polkit-kde-agent-1-5.5.0.tar.xz"; + sha256 = "0ahv82zyj42r1sp4mwp7s8iw44dw9rjx5yqvy7jvdmrvsa9n4f1c"; + name = "polkit-kde-agent-1-5.5.0.tar.xz"; }; }; powerdevil = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/powerdevil-5.4.95.tar.xz"; - sha256 = "0q3a3d654f3k4qjwq8avk2n0ppila3p8l9kkayd5hcasvvhcihq7"; - name = "powerdevil-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/powerdevil-5.5.0.tar.xz"; + sha256 = "03gayczhaxql54had50f0jf4vfcckhdxfndv1k33kf16ldyg3w4f"; + name = "powerdevil-5.5.0.tar.xz"; }; }; sddm-kcm = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/sddm-kcm-5.4.95.tar.xz"; - sha256 = "06i24nqn80j563cw2rsfficyd577j3v7qj83cvn6jwrkhbhc6v45"; - name = "sddm-kcm-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/sddm-kcm-5.5.0.tar.xz"; + sha256 = "1wvxi4z3bxzj1wgq5n76zlq7d7pydfllx7ghghkdqhl6g4vf6nk0"; + name = "sddm-kcm-5.5.0.tar.xz"; }; }; systemsettings = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/systemsettings-5.4.95.tar.xz"; - sha256 = "0zr7chjk43mqbb74p4n5n4ny783j8bnmwa4cr86i21bcbkqgp6sq"; - name = "systemsettings-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/systemsettings-5.5.0.tar.xz"; + sha256 = "1azq8zq214p2lhyq28saw3m07ngi3z4bgx4rx0pflzswqfb6fxr1"; + name = "systemsettings-5.5.0.tar.xz"; }; }; user-manager = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/user-manager-5.4.95.tar.xz"; - sha256 = "1dbfqb0w3cgkhimw195gwh9cnnx83qacqdc8j5dpvrjybv3ihv3z"; - name = "user-manager-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/user-manager-5.5.0.tar.xz"; + sha256 = "08v49rwfpq8is829z4zb04qhj49wa2d2c9l2h0di06k1km6vs729"; + name = "user-manager-5.5.0.tar.xz"; }; }; } diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index e94cbeae37f..1c684c21bf4 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "A tool for making JavaScript download and run faster"; homepage = https://developers.google.com/closure/compiler/; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 8b0f2509a91..1cd894372bb 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, curl }: +{ stdenv, fetchurl, unzip, curl, makeWrapper, gcc }: stdenv.mkDerivation { name = "dmd-2.067.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0ny99vfllvvgcl79pwisxcdnb3732i827k9zg8c0j4s0n79k5z94"; }; - buildInputs = [ unzip curl ]; + buildInputs = [ unzip curl makeWrapper ]; # Allow to use "clang++", commented in Makefile postPatch = stdenv.lib.optionalString stdenv.isDarwin '' @@ -48,6 +48,8 @@ stdenv.mkDerivation { cp -r std $out/include/d2 cp -r etc $out/include/d2 + wrapProgram $out/bin/dmd --prefix PATH ":" "${gcc}/bin/" + cd $out/bin tee dmd.conf << EOF [Environment] diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index a90d9e7c8ec..09e3751580c 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -298,7 +298,6 @@ stdenv.mkDerivation ({ ++ (optional stdenv.isDarwin gnused) ; - 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` @@ -523,6 +522,7 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd ++ + stdenv.lib.platforms.illumos ++ optionals (langAda == false) stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 07dca989c9b..2b87c8ac430 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -297,9 +297,8 @@ stdenv.mkDerivation ({ ++ (optional stdenv.isDarwin gnused) ; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl"; - preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) '' + sed -i -e "s/-lrt//g" libstdc++-v3/configure 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" @@ -522,6 +521,7 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd ++ + stdenv.lib.platforms.illumos ++ optionals (langAda == false) stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix new file mode 100644 index 00000000000..32d6b72970c --- /dev/null +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils +, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour +}: + +let + + buildMK = '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" + libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" + ${stdenv.lib.optionalString stdenv.isDarwin '' + libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" + libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" + ''} + ''; + +in + +stdenv.mkDerivation rec { + version = "7.10.3"; + name = "ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/${version}/${name}-src.tar.xz"; + sha256 = "1vsgmic8csczl62ciz51iv8nhrkm72lyhbz7p7id13y2w7fcx46g"; + }; + + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; + + enableParallelBuilding = true; + + preConfigure = '' + echo >mk/build.mk "${buildMK}" + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + ''; + + configureFlags = [ + "--with-gcc=${stdenv.cc}/bin/cc" + "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i + done + ''; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; + inherit (ghc.meta) license platforms; + }; + +} diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix index ce5c2579b89..30967ae2c15 100644 --- a/pkgs/development/compilers/go/1.5.nix +++ b/pkgs/development/compilers/go/1.5.nix @@ -15,11 +15,11 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://github.com/golang/go/archive/go${version}.tar.gz"; - sha256 = "1xd1nd1li7pdl72vq8zkh6m7ms3ajgyqz9a5d61gagm0cgj8zilz"; + sha256 = "1ggh5ll774an78yiij6xan67n38zglws0pxj36g0rcg84460h4m4"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix new file mode 100644 index 00000000000..a91b038ef2d --- /dev/null +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, emscripten }: + +let version = "0.8.5"; in + +stdenv.mkDerivation { + name = "jsonnet-${version}"; + + srcs = fetchFromGitHub { + rev = "v${version}"; + owner = "google"; + repo = "jsonnet"; + sha256 = "14raml69zfr38r4qghdgy129vdq2vq1ivl3a2y02isfpijxcajxn"; + }; + + buildInputs = [ emscripten ]; + + enableParallelBuilding = true; + + makeFlags = [''EM_CACHE=$(TMPDIR)/.em_cache'' ''all'']; + + installPhase = '' + mkdir -p $out/bin $out/lib $out/share/ + cp jsonnet $out/bin/ + cp libjsonnet.so $out/lib/ + cp -a doc $out/share/doc + cp -a include $out/include + ''; + + meta = { + description = "Purely-functional configuration language that helps you define JSON data"; + maintainers = [ lib.maintainers.benley ]; + license = lib.licenses.asl20; + homepage = https://github.com/google/jsonnet; + }; +} diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix new file mode 100644 index 00000000000..e97309f9252 --- /dev/null +++ b/pkgs/development/compilers/kotlin/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, makeWrapper, jre, unzip, which }: + +stdenv.mkDerivation rec { + version = "1.0.0-beta-3595"; + name = "kotlin-${version}"; + + src = fetchurl { + url = "https://github.com/JetBrains/kotlin/releases/download/build-${version}/kotlin-compiler-${version}.zip"; + sha256 = "1ed750a169a411349852a102d5a9c23aec656acb76d51018a4933741eb846fae"; + }; + + propagatedBuildInputs = [ jre which ] ; + buildInputs = [ makeWrapper unzip ] ; + + installPhase = '' + mkdir -p $out + rm "bin/"*.bat + mv * $out + + for p in $(ls $out/bin/) ; do + wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ; + done + ''; + + meta = { + description = "General purpose programming language"; + longDescription = '' + Kotlin is a statically typed language that targets the JVM and JavaScript. + It is a general-purpose language intended for industry use. + It is developed by a team at JetBrains although it is an OSS language + and has external contributors. + ''; + homepage = http://kotlinlang.org/; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; + [ nequissimus ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index 57fd3433fa5..045d2e4951a 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -14,6 +14,7 @@ , compiler-rt_src , libcxxabi , debugVersion ? false +, enableSharedLibraries ? !stdenv.isDarwin }: let @@ -46,10 +47,11 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" - ] ++ stdenv.lib.optionals (!isDarwin) [ + ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" + ++ stdenv.lib.optional (!isDarwin) "-DLLVM_BINUTILS_INCDIR=${binutils}/include" - ] ++ stdenv.lib.optionals ( isDarwin) [ + ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ]; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 20f7a87c254..cfa725d3d31 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { { description = "Statically typed, imperative programming language"; homepage = http://nim-lang.org/; license = licenses.mit; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux ++ platforms.darwin; # arbitrary }; } diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index 2b4a7717016..b88782517d7 100644 --- a/pkgs/development/compilers/rustc/generic.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -37,6 +37,8 @@ let version = if isRelease then name = "rustc-${version}"; + llvmShared = llvmPackages_37.llvm.override { enableSharedLibraries = true; }; + platform = if stdenv.system == "i686-linux" then "linux-i386" else if stdenv.system == "x86_64-linux" @@ -84,6 +86,8 @@ with stdenv.lib; stdenv.mkDerivation { __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; + src = if isRelease then fetchzip { url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; @@ -119,7 +123,7 @@ with stdenv.lib; stdenv.mkDerivation { # ++ [ "--jemalloc-root=${jemalloc}/lib" ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils}/bin/ar" ] ++ optional (stdenv.cc.cc ? isClang) "--enable-clang" - ++ optional (!forceBundledLLVM) "--llvm-root=${llvmPackages_37.llvm}"; + ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; inherit patches; @@ -155,11 +159,10 @@ with stdenv.lib; stdenv.mkDerivation { configureFlagsArray+=("--infodir=$out/share/info") ''; - # Procps is needed for one of the test cases - nativeBuildInputs = [ file python2 ] - ++ optionals stdenv.isLinux [ procps ]; + # ps is needed for one of the test cases + nativeBuildInputs = [ file python2 procps ]; buildInputs = [ ncurses ] - ++ optional (!forceBundledLLVM) llvmPackages_37.llvm; + ++ optional (!forceBundledLLVM) llvmShared; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index dc1bda27d97..ac232348328 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -2,11 +2,11 @@ { stdenv, callPackage }: callPackage ./generic.nix { - shortVersion = "2015-11-01"; + shortVersion = "2015-12-09"; isRelease = false; forceBundledLLVM = true; - srcRev = "1a2eaffb6"; - srcSha = "17b8zgz8j5dmz489b4zs2q4igc9x2v4isgqg3i5nzhacghxjqfyy"; + srcRev = "462ec0576"; + srcSha = "1mci0hxwnqb24j4k68rgffqk8ccznz2iddfmyhi8wxa094hqgghp"; /* Rust is bootstrapped from an earlier built version. We need to fetch these earlier versions, which vary per platform. diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index d95e3e0cd89..0114f014a51 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -23,6 +23,7 @@ let sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5"; }; armv6l-linux = armv7l-linux; + x86_64-solaris = x86_64-linux; }; cfg = options.${stdenv.system}; in diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 7b2cadc31d5..87cb5e6fcfd 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1cwrmvbx8m7n7wkcm16yz7qwx221giz7jskzkvy42pj919may36n"; + sha256 = "0ggdw2wfbl0gmfkcm3qbqvhalfb1r9wfxzmi8fd38s53f7j4grd2"; }; patchPhase = '' @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost} --disable-debugger --no-userinit --no-sysinit" + sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ''; installPhase = '' diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index ab13e0ba7dc..26fd3850190 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1ckyz31gmf2pgdl51h1raa669mkl7sqfdl3vqkrmyc46w5ysz3ci"; }; - buildInputs = [ jre makeWrapper ] ; + propagatedBuildInputs = [ jre ] ; + buildInputs = [ makeWrapper ] ; installPhase = '' mkdir -p $out diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 289c63f7bcf..ec80317c777 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1l16571fw5l339wd02w2pnr3556j804zpbsbymnad67f2dpikr7z"; }; - buildInputs = [ jre makeWrapper ] ; + propagatedBuildInputs = [ jre ] ; + buildInputs = [ makeWrapper ] ; installPhase = '' mkdir -p $out diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index 05267d6bf6c..1f1087a85d9 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "coq-flocq-${coq.coq-version}-${version}"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/33979/flocq-2.4.0.tar.gz; - sha256 = "020x4nkkrvndkvp5zwb9vads8a2jh603khcwrm40yhqldgfd8zlv"; + url = https://gforge.inria.fr/frs/download.php/file/35091/flocq-2.5.0.tar.gz; + sha256 = "0v3qiaz7vxfc5nk8rxwi39mik7hm7p5kb040q2pimb69qgfl6vml"; }; buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ]; diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 36533ab35d5..628aa973562 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, which, coq, flocq, mathcomp }: stdenv.mkDerivation { - name = "coq-interval-${coq.coq-version}-2.0.0"; + name = "coq-interval-${coq.coq-version}-2.1.0"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/34294/interval-2.0.0.tar.gz; - sha256 = "0wx0z07nhx88hwl20icgb5w4mx6s5pn7mhzyx5jn8f7yl1m46ad2"; + url = https://gforge.inria.fr/frs/download.php/file/35092/interval-2.1.0.tar.gz; + sha256 = "02sn8mh85kxwn7681h2z6r7vnac9idh4ik3hbmr2yvixizakb70b"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 4412b3d535c..bd2289723f8 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -168,6 +168,6 @@ go.stdenv.mkDerivation ( } // meta // { # add an extra maintainer to every package maintainers = (meta.maintainers or []) ++ - [ lib.maintainers.emery lib.maintainers.lethalman ]; + [ lib.maintainers.ehmry lib.maintainers.lethalman ]; }; }) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a142722f4c8..fd6d521369f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -114,7 +114,24 @@ self: super: { preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d haskakafka.cabal"; configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka"; doCheck = false; - }); + }); + + # Depends on broken "lss" package. + snaplet-lss = dontDistribute super.snaplet-lss; + + # Depends on broken "NewBinary" package. + ASN1 = dontDistribute super.ASN1; + + # Depends on broken "frame" package. + frame-markdown = dontDistribute super.frame-markdown; + + # Depends on broken "Elm" package. + hakyll-elm = dontDistribute super.hakyll-elm; + haskelm = dontDistribute super.haskelm; + snap-elm = dontDistribute super.snap-elm; + + # Depends on broken "hails" package. + hails-bin = dontDistribute super.hails-bin; # Foreign dependency name clashes with another Haskell package. libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; }; @@ -662,9 +679,6 @@ self: super: { # https://github.com/nushio3/doctest-prop/issues/1 doctest-prop = dontCheck super.doctest-prop; - # https://github.com/adamwalker/sdr/issues/1 - sdr = dontCheck super.sdr; - # https://github.com/bos/aeson/issues/253 aeson = dontCheck super.aeson; @@ -924,13 +938,6 @@ self: super: { librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ]; }); - # https://github.com/fpco/stackage/issues/1004 - gtk2hs-buildtools = super.gtk2hs-buildtools.override { alex = self.alex_3_1_4; }; - - # https://github.com/Gabriel439/Haskell-Morte-Library/issues/32 - morte = super.morte.override { alex = self.alex_3_1_4; }; - # https://github.com/mainland/language-c-quote/issues/57 language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; }; - } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7d80392944c..ffba1d42664 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -150,9 +150,7 @@ dont-distribute-packages: abstract-par-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-BuildPlatform: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fourier: [ i686-linux, x86_64-linux, x86_64-darwin ] - accelerate-io: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-utility: [ i686-linux, x86_64-linux, x86_64-darwin ] accentuateus: [ i686-linux, x86_64-linux, x86_64-darwin ] access-time: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -204,8 +202,8 @@ dont-distribute-packages: ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] alea: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] + al: [ i686-linux, x86_64-linux, x86_64-darwin ] AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] - Allure: [ i686-linux, x86_64-linux, x86_64-darwin ] alms: [ i686-linux, x86_64-linux, x86_64-darwin ] alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] alpino-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -221,7 +219,6 @@ dont-distribute-packages: altfloat: [ i686-linux, x86_64-linux, x86_64-darwin ] alure: [ i686-linux, x86_64-linux, x86_64-darwin ] ALUT: [ x86_64-darwin ] - al: [ x86_64-darwin ] amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-ec2: [ i686-linux ] amazonka-rds: [ i686-linux ] @@ -278,7 +275,6 @@ dont-distribute-packages: ascii85-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] asic: [ i686-linux, x86_64-linux, x86_64-darwin ] asil: [ i686-linux, x86_64-linux, x86_64-darwin ] - ASN1: [ i686-linux, x86_64-linux, x86_64-darwin ] AspectAG: [ i686-linux, x86_64-linux, x86_64-darwin ] assimp: [ i686-linux, x86_64-linux, x86_64-darwin ] astrds: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -310,10 +306,8 @@ dont-distribute-packages: awesomium-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] awesomium: [ i686-linux, x86_64-linux, x86_64-darwin ] awesomium-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-cloudfront-signer: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-configuration-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-elastic-transcoder: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-general: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-kinesis-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -322,8 +316,6 @@ dont-distribute-packages: aws-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-performance-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-sdk-text-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-sdk-xml-unordered: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-service-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -419,10 +411,9 @@ dont-distribute-packages: BiobaseMAF: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTrainingData: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTurner: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] bio: [ i686-linux, x86_64-linux, x86_64-darwin ] + bioinformatics-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] biosff: [ i686-linux, x86_64-linux, x86_64-darwin ] biostockholm: [ i686-linux, x86_64-linux, x86_64-darwin ] bird: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -437,7 +428,6 @@ dont-distribute-packages: bits-extras: [ x86_64-darwin ] bitspeak: [ i686-linux, x86_64-linux, x86_64-darwin ] bitstream: [ i686-linux, x86_64-linux, x86_64-darwin ] - BitSyntax: [ i686-linux, x86_64-linux, x86_64-darwin ] bittorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] bitvec: [ i686-linux, x86_64-linux, x86_64-darwin ] bit-vector: [ i686-linux ] @@ -460,7 +450,7 @@ dont-distribute-packages: blubber: [ x86_64-darwin ] Blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] bluetile: [ i686-linux, x86_64-linux, x86_64-darwin ] - bluetileutils: [ i686-linux, x86_64-linux, x86_64-darwin ] + BNFC: [ i686-linux, x86_64-linux, x86_64-darwin ] board-games: [ i686-linux, x86_64-linux, x86_64-darwin ] bogre-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] boolean-normal-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -468,7 +458,6 @@ dont-distribute-packages: boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] borel: [ i686-linux, x86_64-linux, x86_64-darwin ] bot: [ i686-linux, x86_64-linux, x86_64-darwin ] - brainfuck-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ] breakout: [ i686-linux, x86_64-linux, x86_64-darwin ] brians-brain: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -490,7 +479,6 @@ dont-distribute-packages: buster: [ i686-linux, x86_64-linux, x86_64-darwin ] Buster: [ i686-linux, x86_64-linux, x86_64-darwin ] buster-network: [ i686-linux, x86_64-linux, x86_64-darwin ] - bustle: [ i686-linux, x86_64-linux, x86_64-darwin ] bytable: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-class: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -518,14 +506,12 @@ dont-distribute-packages: cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] cabocha: [ i686-linux, x86_64-linux, x86_64-darwin ] - cairo-appbase: [ i686-linux, x86_64-linux, x86_64-darwin ] cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] calc: [ i686-linux, x86_64-linux, x86_64-darwin ] - calculator: [ i686-linux, x86_64-linux, x86_64-darwin ] caldims: [ i686-linux, x86_64-linux, x86_64-darwin ] caledon: [ i686-linux, x86_64-linux, x86_64-darwin ] call-haskell-from-anything: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -537,7 +523,6 @@ dont-distribute-packages: cap: [ i686-linux, x86_64-linux, x86_64-darwin ] capri: [ i686-linux, x86_64-linux, x86_64-darwin ] carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] - carettah: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-control: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-core: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -566,7 +551,6 @@ dont-distribute-packages: cctools-workqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] cedict: [ i686-linux, x86_64-linux, x86_64-darwin ] ceilometer-common: [ i686-linux, x86_64-linux, x86_64-darwin ] - cellrenderer-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-ieee754: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -583,8 +567,6 @@ dont-distribute-packages: charade: [ i686-linux, x86_64-linux, x86_64-darwin ] charsetdetect-ae: [ x86_64-darwin ] charsetdetect: [ x86_64-darwin ] - Chart-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - Chart-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] chatter: [ i686-linux, x86_64-linux, x86_64-darwin ] checked: [ i686-linux, x86_64-linux, x86_64-darwin ] check-pvp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -608,7 +590,6 @@ dont-distribute-packages: citeproc-hs-pandoc-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] cityhash: [ x86_64-darwin ] cjk: [ i686-linux, x86_64-linux, x86_64-darwin ] - clac: [ i686-linux, x86_64-linux, x86_64-darwin ] clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] claferIG: [ i686-linux, x86_64-linux, x86_64-darwin ] claferwiki: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -630,7 +611,6 @@ dont-distribute-packages: clogparse: [ i686-linux, x86_64-linux, x86_64-darwin ] clone-all: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudfront-signer: [ i686-linux, x86_64-linux, x86_64-darwin ] - cloud-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudyfs: [ i686-linux, x86_64-linux, x86_64-darwin ] clua: [ i686-linux, x86_64-linux, x86_64-darwin ] cluss: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -643,7 +623,6 @@ dont-distribute-packages: cmdtheline: [ i686-linux, x86_64-linux, x86_64-darwin ] cmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] cnc-spec-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] - cndict: [ i686-linux, x86_64-linux, x86_64-darwin ] Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ] Codec-Image-DevIL: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -673,12 +652,10 @@ dont-distribute-packages: comonad-random: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-map: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-string: [ i686-linux, x86_64-linux, x86_64-darwin ] - compensated: [ i686-linux, x86_64-linux, x86_64-darwin ] compilation: [ i686-linux, x86_64-linux, x86_64-darwin ] complexity: [ i686-linux, x86_64-linux, x86_64-darwin ] compose-ltr: [ i686-linux, x86_64-linux, x86_64-darwin ] compose-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] - composition-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] compression: [ i686-linux, x86_64-linux, x86_64-darwin ] compstrat: [ i686-linux, x86_64-linux, x86_64-darwin ] comptrans: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -695,8 +672,6 @@ dont-distribute-packages: conductive-hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-lame: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-samplerate: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-audio-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] - conduit-iconv: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-resumablesink: [ i686-linux, x86_64-linux, x86_64-darwin ] Configger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -711,7 +686,6 @@ dont-distribute-packages: consumers: [ x86_64-darwin ] context-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] continue: [ i686-linux, x86_64-linux, x86_64-darwin ] - continuum-client: [ i686-linux, x86_64-linux, x86_64-darwin ] continuum: [ i686-linux, x86_64-linux, x86_64-darwin ] Contract: [ i686-linux, x86_64-linux, x86_64-darwin ] control-event: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -724,16 +698,11 @@ dont-distribute-packages: contstuff-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-c99: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-cbmc: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-core: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-language: [ i686-linux, x86_64-linux, x86_64-darwin ] - copilot-libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-sbv: [ i686-linux, x86_64-linux, x86_64-darwin ] COrdering: [ i686-linux, x86_64-linux, x86_64-darwin ] corebot-bliki: [ i686-linux, x86_64-linux, x86_64-darwin ] - CoreErlang: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreFoundation: [ i686-linux, x86_64-linux, x86_64-darwin ] core-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -775,27 +744,21 @@ dont-distribute-packages: crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ] cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] csound-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-expression: [ i686-linux, x86_64-linux, x86_64-darwin ] - csound-sampler: [ i686-linux, x86_64-linux, x86_64-darwin ] csp: [ i686-linux, x86_64-linux, x86_64-darwin ] cspmchecker: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-FiringRules: [ i686-linux, x86_64-linux, x86_64-darwin ] - CSPM-Frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] - CSPM-Interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ] - CSPM-ToProlog: [ i686-linux, x86_64-linux, x86_64-darwin ] css: [ i686-linux, x86_64-linux, x86_64-darwin ] ctemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] ctkl: [ i686-linux, x86_64-linux, x86_64-darwin ] ctpl: [ i686-linux, x86_64-linux, x86_64-darwin ] + cubical: [ i686-linux, x86_64-linux, x86_64-darwin ] cubicbezier: [ i686-linux, x86_64-linux, x86_64-darwin ] cuboid: [ x86_64-darwin ] cudd: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] - cursedcsv: [ i686-linux, x86_64-linux, x86_64-darwin ] - curves: [ i686-linux, x86_64-linux, x86_64-darwin ] cv-combinators: [ x86_64-darwin ] CV: [ i686-linux, x86_64-linux, x86_64-darwin ] cyclotomic: [ i686-linux ] @@ -823,7 +786,6 @@ dont-distribute-packages: datadog: [ i686-linux ] data-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] data-ivar: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-layer: [ i686-linux, x86_64-linux, x86_64-darwin ] data-lens-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] datalog: [ i686-linux, x86_64-linux, x86_64-darwin ] data-named: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -853,7 +815,6 @@ dont-distribute-packages: ddci-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-source-tetra: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - Deadpan-DDP: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-simple-json: [ i686-linux, x86_64-linux, x86_64-darwin ] decepticons: [ i686-linux, x86_64-linux, x86_64-darwin ] DecisionTree: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -895,11 +856,9 @@ dont-distribute-packages: dgim: [ i686-linux, x86_64-linux, x86_64-darwin ] dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-hsqml: [ x86_64-darwin ] diagrams-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-pgf: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-qrcode: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-tikz: [ i686-linux, x86_64-linux, x86_64-darwin ] dice-entropy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -922,16 +881,8 @@ dont-distribute-packages: discount: [ i686-linux, x86_64-linux, x86_64-darwin ] disjoint-set: [ i686-linux, x86_64-linux, x86_64-darwin ] DisTract: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-async: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-azure: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-client-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-execution: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-registry: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-task: [ i686-linux, x86_64-linux, x86_64-darwin ] - distributed-process-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] distribution-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -971,14 +922,12 @@ dont-distribute-packages: ds-kanren: [ i686-linux, x86_64-linux, x86_64-darwin ] dsmc: [ i686-linux, x86_64-linux, x86_64-darwin ] dsmc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - dsp: [ i686-linux, x86_64-linux, x86_64-darwin ] DSTM: [ i686-linux, x86_64-linux, x86_64-darwin ] dstring: [ i686-linux, x86_64-linux, x86_64-darwin ] DTC: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd-text: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - dtw: [ i686-linux, x86_64-linux, x86_64-darwin ] duplo: [ i686-linux, x86_64-linux, x86_64-darwin ] Dust-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] Dust: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -986,7 +935,7 @@ dont-distribute-packages: Dust-tools-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] dvda: [ i686-linux, x86_64-linux, x86_64-darwin ] dvdread: [ i686-linux, x86_64-linux, x86_64-darwin ] - dynamic-graph: [ x86_64-darwin ] + dynamic-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-object: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1007,7 +956,6 @@ dont-distribute-packages: edenskel: [ i686-linux, x86_64-linux, x86_64-darwin ] edentv: [ i686-linux, x86_64-linux, x86_64-darwin ] edge: [ i686-linux, x86_64-linux, x86_64-darwin ] - EdisonCore: [ i686-linux, x86_64-linux, x86_64-darwin ] edit-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] editline: [ i686-linux, x86_64-linux, x86_64-darwin ] EditTimeReport: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1025,6 +973,7 @@ dont-distribute-packages: electrum-mnemonic: [ i686-linux ] elerea-examples: [ x86_64-darwin ] elerea-sdl: [ x86_64-darwin ] + elm-init: [ i686-linux, x86_64-linux, x86_64-darwin ] emacs-keys: [ x86_64-darwin ] email-header: [ i686-linux, x86_64-linux, x86_64-darwin ] email: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1046,8 +995,6 @@ dont-distribute-packages: epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] epubname: [ i686-linux, x86_64-linux, x86_64-darwin ] Eq: [ i686-linux, x86_64-linux, x86_64-darwin ] - equational-reasoning: [ i686-linux, x86_64-linux, x86_64-darwin ] - erlang: [ i686-linux, x86_64-linux, x86_64-darwin ] eros-client: [ i686-linux, x86_64-linux, x86_64-darwin ] error-message: [ i686-linux, x86_64-linux, x86_64-darwin ] ersatz: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1071,10 +1018,8 @@ dont-distribute-packages: eventloop: [ i686-linux, x86_64-linux, x86_64-darwin ] event-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] EventSocket: [ i686-linux, x86_64-linux, x86_64-darwin ] - eventstore: [ i686-linux, x86_64-linux, x86_64-darwin ] every-bit-counts: [ i686-linux, x86_64-linux, x86_64-darwin ] ewe: [ i686-linux, x86_64-linux, x86_64-darwin ] - exact-real: [ i686-linux, x86_64-linux, x86_64-darwin ] exif: [ i686-linux, x86_64-linux, x86_64-darwin ] exists: [ i686-linux, x86_64-linux, x86_64-darwin ] expand: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1087,7 +1032,6 @@ dont-distribute-packages: extcore: [ i686-linux, x86_64-linux, x86_64-darwin ] extemp: [ i686-linux, x86_64-linux, x86_64-darwin ] extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] - external-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] ez-couch: [ i686-linux, x86_64-linux, x86_64-darwin ] faceted: [ i686-linux, x86_64-linux, x86_64-darwin ] factory: [ i686-linux ] @@ -1147,7 +1091,6 @@ dont-distribute-packages: fixed-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-storable-array: [ i686-linux, x86_64-linux, x86_64-darwin ] fix-parser-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - fixplate: [ i686-linux, x86_64-linux, x86_64-darwin ] fix-symbols-gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] flexiwrap: [ i686-linux, x86_64-linux, x86_64-darwin ] flexiwrap-smallcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1161,7 +1104,6 @@ dont-distribute-packages: flower: [ i686-linux, x86_64-linux, x86_64-darwin ] flowlocks-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] flowsim: [ i686-linux, x86_64-linux, x86_64-darwin ] - fltkhs: [ i686-linux, x86_64-linux, x86_64-darwin ] fluidsynth: [ x86_64-darwin ] FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1188,15 +1130,15 @@ dont-distribute-packages: forml: [ i686-linux, x86_64-linux, x86_64-darwin ] ForSyDe: [ i686-linux, x86_64-linux, x86_64-darwin ] forth-hll: [ i686-linux, x86_64-linux, x86_64-darwin ] + foscam-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] Foster: [ i686-linux, x86_64-linux, x86_64-darwin ] fpco-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fpnla-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - FPretty: [ i686-linux, x86_64-linux, x86_64-darwin ] Fractaler: [ i686-linux, x86_64-linux, x86_64-darwin ] frag: [ i686-linux, x86_64-linux, x86_64-darwin ] - frame-markdown: [ i686-linux, x86_64-linux, x86_64-darwin ] franchise: [ i686-linux, x86_64-linux, x86_64-darwin ] Frank: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] free-game: [ i686-linux, x86_64-linux, x86_64-darwin ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] freenect: [ x86_64-darwin ] @@ -1213,7 +1155,6 @@ dont-distribute-packages: friday-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] frpnow-gloss: [ x86_64-darwin ] - frpnow-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] ftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1224,7 +1165,6 @@ dont-distribute-packages: full-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] fullstop: [ i686-linux, x86_64-linux, x86_64-darwin ] full-text-search: [ i686-linux, x86_64-linux, x86_64-darwin ] - funbot: [ i686-linux, x86_64-linux, x86_64-darwin ] functional-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ] function-combine: [ i686-linux, x86_64-linux, x86_64-darwin ] functorm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1233,11 +1173,9 @@ dont-distribute-packages: funsat: [ i686-linux, x86_64-linux, x86_64-darwin ] future: [ i686-linux, x86_64-linux, x86_64-darwin ] fuzzytime: [ i686-linux, x86_64-linux, x86_64-darwin ] - fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-glfw: [ x86_64-darwin ] gact: [ i686-linux, x86_64-linux, x86_64-darwin ] gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] - game-of-life: [ i686-linux, x86_64-linux, x86_64-darwin ] Gamgine: [ x86_64-darwin ] Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] gbu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1245,7 +1183,6 @@ dont-distribute-packages: gdiff-ig: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-th: [ i686-linux, x86_64-linux, x86_64-darwin ] gearbox: [ x86_64-darwin ] - GeBoP: [ i686-linux, x86_64-linux, x86_64-darwin ] geek: [ i686-linux, x86_64-linux, x86_64-darwin ] geek-server: [ i686-linux, x86_64-linux, x86_64-darwin ] gelatin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1270,10 +1207,8 @@ dont-distribute-packages: GenussFold: [ i686-linux ] GenussFold: [ i686-linux, x86_64-linux, x86_64-darwin ] GeocoderOpenCage: [ i686-linux, x86_64-linux, x86_64-darwin ] - geodetics: [ i686-linux, x86_64-linux, x86_64-darwin ] geoip2: [ i686-linux ] GeoIp: [ i686-linux, x86_64-linux, x86_64-darwin ] - geojson: [ i686-linux, x86_64-linux, x86_64-darwin ] geom2d: [ i686-linux ] GeomPredicates-SSE: [ i686-linux, x86_64-linux, x86_64-darwin ] geo-resolver: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1281,47 +1216,30 @@ dont-distribute-packages: getflag: [ i686-linux, x86_64-linux, x86_64-darwin ] ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dup: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-exactprint: [ x86_64-darwin ] ghci-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] ghci-haskeline: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghci-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-parmake: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-pkg-autofix: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-pkg-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-atk: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gdkpixbuf: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gio: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-gobject: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] - gio: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-pango: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-soup: [ i686-linux, x86_64-linux, x86_64-darwin ] gist: [ i686-linux, x86_64-linux, x86_64-darwin ] git-all: [ i686-linux, x86_64-linux, x86_64-darwin ] git-checklist: [ i686-linux, x86_64-linux, x86_64-darwin ] git-date: [ i686-linux, x86_64-linux, x86_64-darwin ] gitdo: [ i686-linux, x86_64-linux, x86_64-darwin ] - git-fmt: [ i686-linux, x86_64-linux, x86_64-darwin ] git-gpush: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-cross: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] git-repair: [ i686-linux, x86_64-linux, x86_64-darwin ] - git-vogue: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-vte: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] glade: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1336,7 +1254,6 @@ dont-distribute-packages: GLHUI: [ x86_64-darwin ] glicko: [ i686-linux, x86_64-linux, x86_64-darwin ] glider-nlp: [ i686-linux, x86_64-linux, x86_64-darwin ] - GLM: [ i686-linux, x86_64-linux, x86_64-darwin ] global: [ i686-linux, x86_64-linux, x86_64-darwin ] glome-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1353,7 +1270,7 @@ dont-distribute-packages: gloss-sodium: [ x86_64-darwin ] gloss: [ x86_64-darwin ] GLURaw: [ x86_64-darwin ] - GLUtil: [ x86_64-darwin ] + GLUtil: [ i686-linux, x86_64-linux, x86_64-darwin ] gluturtle: [ x86_64-darwin ] GLUT: [ x86_64-darwin ] gmap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1427,33 +1344,19 @@ dont-distribute-packages: gtk2hs-cast-gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-gtkglext: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk2hs-cast-gtksourceview2: [ i686-linux, x86_64-linux, x86_64-darwin ] Gtk2hsGenerics: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk2hs-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-rpn: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk3-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkglext: [ i686-linux, x86_64-linux, x86_64-darwin ] GtkGLTV: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkimageview: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-jsinput: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-largeTreeStore: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkrsync: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-serialized-event: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-simple-list-view: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtksourceview2: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtksourceview3: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-toggle-button-list: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-toy: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk-traymanager: [ i686-linux, x86_64-linux, x86_64-darwin ] - GtkTV: [ i686-linux, x86_64-linux, x86_64-darwin ] guess-combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] GuiHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] GuiTV: [ i686-linux, x86_64-linux, x86_64-darwin ] - gulcii: [ i686-linux, x86_64-linux, x86_64-darwin ] haar: [ i686-linux, x86_64-linux, x86_64-darwin ] Hach: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-happstack-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1487,8 +1390,6 @@ dont-distribute-packages: haddock-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] haggis: [ i686-linux, x86_64-linux, x86_64-darwin ] Haggressive: [ i686-linux, x86_64-linux, x86_64-darwin ] - hails-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] - hails: [ i686-linux, x86_64-linux, x86_64-darwin ] hairy: [ i686-linux, x86_64-linux, x86_64-darwin ] hakaru: [ i686-linux, x86_64-linux, x86_64-darwin ] hakismet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1496,16 +1397,15 @@ dont-distribute-packages: hakyll-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib-links: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] - hakyll-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ] halberd: [ i686-linux, x86_64-linux, x86_64-darwin ] HaLeX: [ i686-linux, x86_64-linux, x86_64-darwin ] halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] - halma: [ i686-linux, x86_64-linux, x86_64-darwin ] hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] hamtmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hamusic: [ i686-linux, x86_64-linux, x86_64-darwin ] + handsy: [ i686-linux, x86_64-linux, x86_64-darwin ] hannahci: [ i686-linux, x86_64-linux, x86_64-darwin ] happindicator3: [ i686-linux, x86_64-linux, x86_64-darwin ] happindicator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1539,6 +1439,7 @@ dont-distribute-packages: HaRe: [ i686-linux, x86_64-linux, x86_64-darwin ] hark: [ i686-linux, x86_64-linux, x86_64-darwin ] HARM: [ i686-linux, x86_64-linux, x86_64-darwin ] + harmony: [ i686-linux, x86_64-linux, x86_64-darwin ] HarmTrace-Base: [ i686-linux, x86_64-linux, x86_64-darwin ] HarmTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] haroonga-httpd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1554,6 +1455,7 @@ dont-distribute-packages: hashed-storage: [ i686-linux, x86_64-linux, x86_64-darwin ] Hashell: [ i686-linux, x86_64-linux, x86_64-darwin ] hash: [ i686-linux, x86_64-linux, x86_64-darwin ] + hashids: [ i686-linux, x86_64-linux, x86_64-darwin ] has: [ i686-linux, x86_64-linux, x86_64-darwin ] hasim: [ i686-linux, x86_64-linux, x86_64-darwin ] haskakafka: [ x86_64-darwin ] @@ -1582,15 +1484,10 @@ dont-distribute-packages: haskelldb-hsql-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-hsql-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-exp-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-gi-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-gi: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-in-space: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellLM: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-mpi: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellNN: [ i686-linux, x86_64-linux, x86_64-darwin ] Haskelloids: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1607,7 +1504,6 @@ dont-distribute-packages: haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tyrant: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskelm: [ i686-linux, x86_64-linux, x86_64-darwin ] haskgame: [ i686-linux, x86_64-linux, x86_64-darwin ] haskheap: [ i686-linux, x86_64-linux, x86_64-darwin ] haskhol-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1628,10 +1524,12 @@ dont-distribute-packages: haskore-realtime: [ i686-linux, x86_64-linux, x86_64-darwin ] haskore-supercollider: [ i686-linux, x86_64-linux, x86_64-darwin ] haskore-synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskore-vintage: [ i686-linux, x86_64-linux, x86_64-darwin ] hasloGUI: [ i686-linux, x86_64-linux, x86_64-darwin ] haslo: [ i686-linux, x86_64-linux, x86_64-darwin ] hasparql-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasql-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] has-th: [ i686-linux, x86_64-linux, x86_64-darwin ] hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1691,7 +1589,6 @@ dont-distribute-packages: hellnet: [ i686-linux, x86_64-linux, x86_64-darwin ] helm: [ i686-linux, x86_64-linux, x86_64-darwin ] hemkay: [ i686-linux, x86_64-linux, x86_64-darwin ] - hemokit: [ i686-linux, x86_64-linux, x86_64-darwin ] henet: [ i686-linux, x86_64-linux, x86_64-darwin ] hen: [ i686-linux, x86_64-linux, x86_64-darwin ] hepevt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1789,7 +1686,6 @@ dont-distribute-packages: hist-pl-lmf: [ i686-linux, x86_64-linux, x86_64-darwin ] hjs: [ i686-linux, x86_64-linux, x86_64-darwin ] HJVM: [ i686-linux, x86_64-linux, x86_64-darwin ] - hlatex: [ i686-linux, x86_64-linux, x86_64-darwin ] hlbfgsb: [ i686-linux, x86_64-linux, x86_64-darwin ] hlcm: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1808,8 +1704,6 @@ dont-distribute-packages: hmark: [ i686-linux, x86_64-linux, x86_64-darwin ] hmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-banded: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-glpk: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-gsl-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1818,7 +1712,6 @@ dont-distribute-packages: hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-svdlibc: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1876,7 +1769,6 @@ dont-distribute-packages: hops: [ i686-linux, x86_64-linux, x86_64-darwin ] hoq: [ i686-linux, x86_64-linux, x86_64-darwin ] hosts-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hotswap: [ i686-linux, x86_64-linux, x86_64-darwin ] hp2any-core: [ i686-linux, x86_64-linux, x86_64-darwin ] hp2any-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] hp2any-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1916,7 +1808,6 @@ dont-distribute-packages: hsbackup: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-blake2: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-auditor: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1926,15 +1817,12 @@ dont-distribute-packages: hsc3-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-rec: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsc3-sf-hsndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-unsafe: [ i686-linux, x86_64-linux, x86_64-darwin ] hscamwire: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-carbon-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] hscassandra: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] hsclock: [ i686-linux, x86_64-linux, x86_64-darwin ] - hscurses-fish-ex: [ i686-linux, x86_64-linux, x86_64-darwin ] - hscurses: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdev: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdip: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1962,17 +1850,13 @@ dont-distribute-packages: hskeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] hslackbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] hslibsvm: [ i686-linux, x86_64-linux, x86_64-darwin ] - hslogger-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-logo: [ i686-linux, x86_64-linux, x86_64-darwin ] - hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ] HSmarty: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-mesos: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmtpclient: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] hsndfile-storablevector: [ i686-linux, x86_64-linux, x86_64-darwin ] - hsndfile-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] hsnock: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-nombre-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] hsns: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1984,7 +1868,6 @@ dont-distribute-packages: hspear: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] - hspec-test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-pgms: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-pkpass: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2001,7 +1884,6 @@ dont-distribute-packages: hsqml: [ x86_64-darwin ] hsSqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] HsSVN: [ i686-linux, x86_64-linux, x86_64-darwin ] - hstatistics: [ i686-linux, x86_64-linux, x86_64-darwin ] hstats: [ i686-linux, x86_64-linux, x86_64-darwin ] hstest: [ i686-linux, x86_64-linux, x86_64-darwin ] hstidy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2024,7 +1906,6 @@ dont-distribute-packages: HTab: [ i686-linux, x86_64-linux, x86_64-darwin ] htaglib: [ i686-linux, x86_64-linux, x86_64-darwin ] hTalos: [ i686-linux, x86_64-linux, x86_64-darwin ] - hTensor: [ i686-linux, x86_64-linux, x86_64-darwin ] HTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] html-entities: [ i686-linux, x86_64-linux, x86_64-darwin ] html-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2054,16 +1935,11 @@ dont-distribute-packages: hunt-searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] hunt-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hurdle: [ i686-linux, x86_64-linux, x86_64-darwin ] - husk-scheme: [ i686-linux, x86_64-linux, x86_64-darwin ] - husk-scheme-libs: [ i686-linux, x86_64-linux, x86_64-darwin ] husky: [ i686-linux, x86_64-linux, x86_64-darwin ] hutton: [ i686-linux, x86_64-linux, x86_64-darwin ] huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] - hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] - hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] hws: [ i686-linux, x86_64-linux, x86_64-darwin ] - hXmixer: [ i686-linux, x86_64-linux, x86_64-darwin ] hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ] HXMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2090,7 +1966,6 @@ dont-distribute-packages: hyperpublic: [ i686-linux, x86_64-linux, x86_64-darwin ] hypher: [ i686-linux, x86_64-linux, x86_64-darwin ] i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] - iban: [ i686-linux, x86_64-linux, x86_64-darwin ] ideas: [ i686-linux, x86_64-linux, x86_64-darwin ] ideas-math: [ i686-linux, x86_64-linux, x86_64-darwin ] idiii: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2120,7 +1995,6 @@ dont-distribute-packages: incremental-sat-solver: [ i686-linux, x86_64-linux, x86_64-darwin ] increments: [ i686-linux, x86_64-linux, x86_64-darwin ] index-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - indian-language-font-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] indices: [ i686-linux, x86_64-linux, x86_64-darwin ] indieweb-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] infer-upstream: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2128,6 +2002,7 @@ dont-distribute-packages: InfixApplicative: [ i686-linux, x86_64-linux, x86_64-darwin ] infix: [ i686-linux, x86_64-linux, x86_64-darwin ] inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] + influxdb: [ i686-linux, x86_64-linux, x86_64-darwin ] informative: [ i686-linux, x86_64-linux, x86_64-darwin ] inilist: [ i686-linux, x86_64-linux, x86_64-darwin ] inline-c-cpp: [ x86_64-darwin ] @@ -2141,7 +2016,6 @@ dont-distribute-packages: internetmarke: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] - intricacy: [ i686-linux, x86_64-linux, x86_64-darwin ] intset: [ i686-linux, x86_64-linux, x86_64-darwin ] io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] IORefCAS: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2152,11 +2026,8 @@ dont-distribute-packages: ipopt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] iptables-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] iptadmin: [ i686-linux, x86_64-linux, x86_64-darwin ] - irc-fun-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] Irc: [ i686-linux, x86_64-linux, x86_64-darwin ] - ireal: [ i686-linux, x86_64-linux, x86_64-darwin ] isevaluated: [ i686-linux, x86_64-linux, x86_64-darwin ] - isiz: [ i686-linux, x86_64-linux, x86_64-darwin ] ismtp: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-compress: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2199,8 +2070,6 @@ dont-distribute-packages: jonathanscard: [ i686-linux, x86_64-linux, x86_64-darwin ] jort: [ i686-linux, x86_64-linux, x86_64-darwin ] jose-jwt: [ i686-linux ] - jsaddle-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] - jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] jsc: [ i686-linux, x86_64-linux, x86_64-darwin ] JsContracts: [ i686-linux, x86_64-linux, x86_64-darwin ] js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2225,7 +2094,6 @@ dont-distribute-packages: JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-client: [ x86_64-darwin ] kangaroo: [ i686-linux, x86_64-linux, x86_64-darwin ] - kansas-comet: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-cores: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-papilio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2236,7 +2104,6 @@ dont-distribute-packages: keera-hails-mvc-model-lightmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-model-protectedmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-solutions-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-mvc-view-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-fs: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactivelenses: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2244,8 +2111,6 @@ dont-distribute-packages: keera-hails-reactive-polling: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactivevalues: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactive-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactive-wx: [ x86_64-darwin ] keera-hails-reactive-yampa: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-posture: [ i686-linux, x86_64-linux, x86_64-darwin ] keiretsu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2274,7 +2139,6 @@ dont-distribute-packages: labyrinth-server: [ i686-linux, x86_64-linux, x86_64-darwin ] lagrangian: [ i686-linux, x86_64-linux, x86_64-darwin ] laika: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2288,7 +2152,6 @@ dont-distribute-packages: lambdacube-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-devs: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaFeed: [ i686-linux, x86_64-linux, x86_64-darwin ] - LambdaHack: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaINet: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaLit: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaNet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2332,9 +2195,6 @@ dont-distribute-packages: leaf: [ i686-linux, x86_64-linux, x86_64-darwin ] leaky: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] - leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] - leksah-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Level0: [ x86_64-darwin ] leveldb-haskell-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] leveldb-haskell: [ x86_64-darwin ] @@ -2355,12 +2215,10 @@ dont-distribute-packages: libjenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] liblinear-enumerator: [ x86_64-darwin ] libltdl: [ i686-linux, x86_64-linux, x86_64-darwin ] - libnotify: [ i686-linux, x86_64-linux, x86_64-darwin ] liboleg: [ i686-linux, x86_64-linux, x86_64-darwin ] libpafe: [ i686-linux, x86_64-linux, x86_64-darwin ] libpq: [ i686-linux, x86_64-linux, x86_64-darwin ] libssh2-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - libssh2: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-journal: [ x86_64-darwin ] libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2380,11 +2238,11 @@ dont-distribute-packages: linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-opengl: [ x86_64-darwin ] linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] - linearscan: [ i686-linux, x86_64-linux, x86_64-darwin ] LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] linkchk: [ i686-linux, x86_64-linux, x86_64-darwin ] linkcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + linode: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-blkid: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-evdev: [ x86_64-darwin ] linux-file-extents: [ x86_64-darwin ] @@ -2398,7 +2256,6 @@ dont-distribute-packages: lio-fs: [ x86_64-darwin ] lio-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] literals: [ i686-linux, x86_64-linux, x86_64-darwin ] live-sequencer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2411,7 +2268,6 @@ dont-distribute-packages: llvm-data-interop: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-ffi: [ i686-linux, x86_64-linux, x86_64-darwin ] - llvm-general: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2445,7 +2301,6 @@ dont-distribute-packages: LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ] ls-usb: [ i686-linux, x86_64-linux, x86_64-darwin ] lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ] - ltk: [ i686-linux, x86_64-linux, x86_64-darwin ] luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ] lucienne: [ i686-linux, x86_64-linux, x86_64-darwin ] Lucu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2460,7 +2315,6 @@ dont-distribute-packages: lye: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma: [ i686-linux ] lzma-streams: [ i686-linux ] - maam: [ i686-linux, x86_64-linux, x86_64-darwin ] mage: [ i686-linux, x86_64-linux, x86_64-darwin ] MagicHaskeller: [ i686-linux, x86_64-linux, x86_64-darwin ] magico: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2485,8 +2339,6 @@ dont-distribute-packages: manatee-terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-welcome: [ i686-linux, x86_64-linux, x86_64-darwin ] mandulia: [ i686-linux, x86_64-linux, x86_64-darwin ] - manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] - manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown2svg: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown-kate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2499,7 +2351,6 @@ dont-distribute-packages: masakazu-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] matchers: [ i686-linux, x86_64-linux, x86_64-darwin ] mathblog: [ i686-linux, x86_64-linux, x86_64-darwin ] - mathgenealogy: [ i686-linux, x86_64-linux, x86_64-darwin ] mathlink: [ i686-linux, x86_64-linux, x86_64-darwin ] matlab: [ i686-linux, x86_64-linux, x86_64-darwin ] matsuri: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2533,11 +2384,11 @@ dont-distribute-packages: mfsolve: [ i686-linux, x86_64-linux, x86_64-darwin ] Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] - Michelangelo: [ x86_64-darwin ] - mida: [ i686-linux, x86_64-linux, x86_64-darwin ] + Michelangelo: [ i686-linux, x86_64-linux, x86_64-darwin ] midi-alsa: [ x86_64-darwin ] midimory: [ x86_64-darwin ] midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] + mighttpd2: [ i686-linux, x86_64-linux, x86_64-darwin ] mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ] mikmod: [ x86_64-darwin ] mime-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2661,12 +2512,10 @@ dont-distribute-packages: nanocurses: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-md5: [ i686-linux, x86_64-linux, x86_64-darwin ] - nanomsg-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] nanomsg: [ x86_64-darwin ] narc: [ i686-linux, x86_64-linux, x86_64-darwin ] nats-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] natural-number: [ i686-linux, x86_64-linux, x86_64-darwin ] - nc-indicators: [ i686-linux, x86_64-linux, x86_64-darwin ] neat: [ i686-linux, x86_64-linux, x86_64-darwin ] needle: [ i686-linux, x86_64-linux, x86_64-darwin ] nehe-tuts: [ x86_64-darwin ] @@ -2677,7 +2526,6 @@ dont-distribute-packages: nested-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] netcore: [ i686-linux, x86_64-linux, x86_64-darwin ] netlines: [ i686-linux, x86_64-linux, x86_64-darwin ] - netlink: [ i686-linux, x86_64-linux, x86_64-darwin ] NetSNMP: [ i686-linux, x86_64-linux, x86_64-darwin ] netspec: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2709,7 +2557,6 @@ dont-distribute-packages: nimber: [ i686-linux ] Ninjas: [ i686-linux, x86_64-linux, x86_64-darwin ] nitro: [ i686-linux, x86_64-linux, x86_64-darwin ] - nix-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] nixfromnpm: [ i686-linux, x86_64-linux, x86_64-darwin ] nkjp: [ i686-linux, x86_64-linux, x86_64-darwin ] nme: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2721,7 +2568,6 @@ dont-distribute-packages: Nomyx-Language: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Rules: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Web: [ i686-linux, x86_64-linux, x86_64-darwin ] - nondeterminism: [ i686-linux, x86_64-linux, x86_64-darwin ] NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ] noodle: [ i686-linux, x86_64-linux, x86_64-darwin ] NoSlow: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2752,7 +2598,6 @@ dont-distribute-packages: octopus: [ i686-linux, x86_64-linux, x86_64-darwin ] oculus: [ i686-linux, x86_64-linux, x86_64-darwin ] OddWord: [ i686-linux ] - ofx: [ i686-linux, x86_64-linux, x86_64-darwin ] OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] ohloh-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] oidc-client: [ i686-linux ] @@ -2772,6 +2617,7 @@ dont-distribute-packages: OpenAL: [ x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] + opencog-atomspace: [ i686-linux, x86_64-linux, x86_64-darwin ] opencv-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] openexchangerates: [ i686-linux, x86_64-linux, x86_64-darwin ] openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2796,16 +2642,14 @@ dont-distribute-packages: OrchestrateDB: [ i686-linux, x86_64-linux, x86_64-darwin ] orchid-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] orchid: [ i686-linux, x86_64-linux, x86_64-darwin ] - OrderedBits: [ i686-linux, x86_64-linux, x86_64-darwin ] order-maintenance: [ i686-linux, x86_64-linux, x86_64-darwin ] orgmode-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] - origami: [ i686-linux, x86_64-linux, x86_64-darwin ] - osdkeys: [ i686-linux, x86_64-linux, x86_64-darwin ] osm-download: [ i686-linux, x86_64-linux, x86_64-darwin ] OSM: [ i686-linux, x86_64-linux, x86_64-darwin ] ot: [ i686-linux, x86_64-linux, x86_64-darwin ] package-vt: [ i686-linux, x86_64-linux, x86_64-darwin ] packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] + packman: [ i686-linux, x86_64-linux, x86_64-darwin ] padKONTROL: [ i686-linux, x86_64-linux, x86_64-darwin ] PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ] pam: [ x86_64-darwin ] @@ -2824,7 +2668,6 @@ dont-distribute-packages: parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] parport: [ x86_64-darwin ] Parry: [ i686-linux, x86_64-linux, x86_64-darwin ] - parsec2: [ i686-linux, x86_64-linux, x86_64-darwin ] parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] parsely: [ i686-linux, x86_64-linux, x86_64-darwin ] parser241: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2835,7 +2678,6 @@ dont-distribute-packages: passage: [ i686-linux, x86_64-linux, x86_64-darwin ] pastis: [ i686-linux, x86_64-linux, x86_64-darwin ] pasty: [ i686-linux, x86_64-linux, x86_64-darwin ] - patches-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] Pathfinder: [ i686-linux, x86_64-linux, x86_64-darwin ] pathfindingcore: [ i686-linux, x86_64-linux, x86_64-darwin ] patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2844,7 +2686,6 @@ dont-distribute-packages: pb: [ i686-linux, x86_64-linux, x86_64-darwin ] PCLT-DB: [ i686-linux, x86_64-linux, x86_64-darwin ] PCLT: [ i686-linux, x86_64-linux, x86_64-darwin ] - pdf-toolbox-viewer: [ i686-linux, x86_64-linux, x86_64-darwin ] pdynload: [ i686-linux, x86_64-linux, x86_64-darwin ] peakachu: [ i686-linux, x86_64-linux, x86_64-darwin ] pec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2880,7 +2721,6 @@ dont-distribute-packages: phybin: [ i686-linux, x86_64-linux, x86_64-darwin ] pianola: [ i686-linux, x86_64-linux, x86_64-darwin ] pi-calculus: [ i686-linux, x86_64-linux, x86_64-darwin ] - picologic: [ i686-linux, x86_64-linux, x86_64-darwin ] piet: [ i686-linux, x86_64-linux, x86_64-darwin ] piki: [ i686-linux, x86_64-linux, x86_64-darwin ] Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2896,14 +2736,8 @@ dont-distribute-packages: planar-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] plat: [ i686-linux, x86_64-linux, x86_64-darwin ] plivo: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] - Plot-ho-matic: [ i686-linux, x86_64-linux, x86_64-darwin ] - plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] - plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] plumbers: [ i686-linux, x86_64-linux, x86_64-darwin ] ply-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2916,7 +2750,6 @@ dont-distribute-packages: polar-configfile: [ i686-linux, x86_64-linux, x86_64-darwin ] polh-lexicon: [ i686-linux, x86_64-linux, x86_64-darwin ] Pollutocracy: [ x86_64-darwin ] - polynomials-bernstein: [ i686-linux, x86_64-linux, x86_64-darwin ] polyseq: [ i686-linux, x86_64-linux, x86_64-darwin ] polysoup: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2927,7 +2760,6 @@ dont-distribute-packages: pool-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] pool: [ i686-linux, x86_64-linux, x86_64-darwin ] popenhs: [ i686-linux, x86_64-linux, x86_64-darwin ] - poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] portaudio: [ x86_64-darwin ] porte: [ i686-linux, x86_64-linux, x86_64-darwin ] porter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2937,7 +2769,6 @@ dont-distribute-packages: posix-realtime: [ x86_64-darwin ] posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ] - postgresql-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] postie: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2955,7 +2786,6 @@ dont-distribute-packages: prelude-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] preprocess-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] press: [ i686-linux, x86_64-linux, x86_64-darwin ] - PrimitiveArray: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-board: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] printf-mauke: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2983,7 +2813,6 @@ dont-distribute-packages: prolog-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog-graph-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog: [ i686-linux, x86_64-linux, x86_64-darwin ] - prologue: [ i686-linux, x86_64-linux, x86_64-darwin ] propane: [ i686-linux, x86_64-linux, x86_64-darwin ] Proper: [ i686-linux, x86_64-linux, x86_64-darwin ] proplang: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3030,8 +2859,6 @@ dont-distribute-packages: QuickAnnotate: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickCheck-GenT: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-poly: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-relaxng: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] quickpull: [ i686-linux, x86_64-linux, x86_64-darwin ] quickset: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3062,7 +2889,6 @@ dont-distribute-packages: rangemin: [ i686-linux, x86_64-linux, x86_64-darwin ] Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ x86_64-darwin ] - raven-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] rbr: [ i686-linux, x86_64-linux, x86_64-darwin ] rcu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3086,9 +2912,9 @@ dont-distribute-packages: record-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] records: [ i686-linux, x86_64-linux, x86_64-darwin ] records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - recursive-line-count: [ i686-linux, x86_64-linux, x86_64-darwin ] redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] Redmine: [ i686-linux, x86_64-linux, x86_64-darwin ] + reedsolomon: [ i686-linux, x86_64-linux, x86_64-darwin ] Referees: [ i686-linux, x86_64-linux, x86_64-darwin ] refh: [ i686-linux, x86_64-linux, x86_64-darwin ] ref: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3099,7 +2925,6 @@ dont-distribute-packages: reflex-gloss-scene: [ x86_64-darwin ] regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-genex: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-pderiv: [ i686-linux, x86_64-linux, x86_64-darwin ] regexp-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3120,7 +2945,6 @@ dont-distribute-packages: rei: [ i686-linux, x86_64-linux, x86_64-darwin ] reinterpret-cast: [ i686-linux ] relational-postgresql8: [ i686-linux, x86_64-linux, x86_64-darwin ] - relational-record-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] remote: [ i686-linux, x86_64-linux, x86_64-darwin ] remotion: [ i686-linux, x86_64-linux, x86_64-darwin ] reorderable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3128,7 +2952,6 @@ dont-distribute-packages: repa-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-series: [ i686-linux, x86_64-linux, x86_64-darwin ] - repa-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-v4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] repl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3140,7 +2963,6 @@ dont-distribute-packages: resource-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] respond: [ i686-linux, x86_64-linux, x86_64-darwin ] - rest-example: [ i686-linux, x86_64-linux, x86_64-darwin ] restful-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] RESTng: [ i686-linux, x86_64-linux, x86_64-darwin ] restricted-workers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3191,6 +3013,7 @@ dont-distribute-packages: rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] + rtcm: [ i686-linux, x86_64-linux, x86_64-darwin ] rtlsdr: [ x86_64-darwin ] rtorrent-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] rubberband: [ x86_64-darwin ] @@ -3200,7 +3023,6 @@ dont-distribute-packages: RxHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-freeze: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-globals: [ i686-linux, x86_64-linux, x86_64-darwin ] - safeint: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-lazy-io: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] safer-file-handles-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3228,16 +3050,16 @@ dont-distribute-packages: sat-micro-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] sbp: [ i686-linux, x86_64-linux, x86_64-darwin ] + sbvPlugin: [ i686-linux, x86_64-linux, x86_64-darwin ] scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] scalp-webhooks: [ i686-linux, x86_64-linux, x86_64-darwin ] scan-vector-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] - scat: [ i686-linux, x86_64-linux, x86_64-darwin ] scenegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-citeproc: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] science-constants-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] - scion-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] + SciFlow: [ i686-linux, x86_64-linux, x86_64-darwin ] scion: [ i686-linux, x86_64-linux, x86_64-darwin ] scope-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] scope: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3252,11 +3074,9 @@ dont-distribute-packages: scroll: [ i686-linux, x86_64-linux, x86_64-darwin ] scrz: [ i686-linux, x86_64-linux, x86_64-darwin ] Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ] - sde-solver: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-cairo: [ x86_64-darwin ] sdl2-compositor: [ x86_64-darwin ] sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdl2-ttf: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2: [ x86_64-darwin ] SDL-gfx: [ x86_64-darwin ] SDL-image: [ x86_64-darwin ] @@ -3296,14 +3116,12 @@ dont-distribute-packages: servant-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] - servius: [ i686-linux, x86_64-linux, x86_64-darwin ] ses-html-snaplet: [ i686-linux, x86_64-linux, x86_64-darwin ] SessionLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] sexp: [ i686-linux, x86_64-linux, x86_64-darwin ] sexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] - sext: [ i686-linux, x86_64-linux, x86_64-darwin ] sfml-audio: [ x86_64-darwin ] SFML-control: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3319,7 +3137,6 @@ dont-distribute-packages: shapely-data: [ i686-linux, x86_64-linux, x86_64-darwin ] shared-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] she: [ i686-linux, x86_64-linux, x86_64-darwin ] - shelduck: [ i686-linux, x86_64-linux, x86_64-darwin ] Shellac-compatline: [ i686-linux, x86_64-linux, x86_64-darwin ] Shellac-editline: [ i686-linux, x86_64-linux, x86_64-darwin ] Shellac-haskeline: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3360,7 +3177,6 @@ dont-distribute-packages: sindre: [ i686-linux, x86_64-linux, x86_64-darwin ] sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ] sized: [ i686-linux, x86_64-linux, x86_64-darwin ] - sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] skeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] skype4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] slack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3374,13 +3190,11 @@ dont-distribute-packages: smartword: [ i686-linux, x86_64-linux, x86_64-darwin ] sme: [ i686-linux, x86_64-linux, x86_64-darwin ] Smooth: [ i686-linux, x86_64-linux, x86_64-darwin ] - smtlib2: [ i686-linux, x86_64-linux, x86_64-darwin ] smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] smtp2mta: [ i686-linux, x86_64-linux, x86_64-darwin ] smtp-mail-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] snake-game: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-accept: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-actionlog: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-css-min: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3388,7 +3202,7 @@ dont-distribute-packages: snaplet-haxl: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] - snaplet-lss: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-influxdb: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-mongodb-minimalistic: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-mysql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3407,7 +3221,6 @@ dont-distribute-packages: snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] sndfile-enumerators: [ i686-linux, x86_64-linux, x86_64-darwin ] - sneathlane-haste: [ i686-linux, x86_64-linux, x86_64-darwin ] SNet: [ i686-linux, x86_64-linux, x86_64-darwin ] snm: [ i686-linux, x86_64-linux, x86_64-darwin ] snowglobe: [ x86_64-darwin ] @@ -3418,7 +3231,6 @@ dont-distribute-packages: sock2stream: [ i686-linux, x86_64-linux, x86_64-darwin ] socketio: [ i686-linux, x86_64-linux, x86_64-darwin ] socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ] - soegtk: [ i686-linux, x86_64-linux, x86_64-darwin ] sonic-visualiser: [ i686-linux, x86_64-linux, x86_64-darwin ] SoOSiM: [ i686-linux, x86_64-linux, x86_64-darwin ] sorted: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3459,7 +3271,6 @@ dont-distribute-packages: sql-simple-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] srcinst: [ i686-linux, x86_64-linux, x86_64-darwin ] - sscgi: [ i686-linux, x86_64-linux, x86_64-darwin ] ssh: [ i686-linux, x86_64-linux, x86_64-darwin ] sssp: [ i686-linux, x86_64-linux, x86_64-darwin ] sstable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3478,7 +3289,6 @@ dont-distribute-packages: stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-chunked-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] - stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] Stomp: [ i686-linux, x86_64-linux, x86_64-darwin ] stopwatch: [ x86_64-darwin ] storable-static-array: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3522,7 +3332,6 @@ dont-distribute-packages: sylvia: [ i686-linux, x86_64-linux, x86_64-darwin ] sym-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] sync: [ i686-linux, x86_64-linux, x86_64-darwin ] - sync-mht: [ i686-linux, x86_64-linux, x86_64-darwin ] syntactic: [ i686-linux ] syntax-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] syntax-example: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3561,7 +3370,6 @@ dont-distribute-packages: tamarin-prover-theory: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] task: [ i686-linux, x86_64-linux, x86_64-darwin ] - tasty-expected-failure: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-integrate: [ i686-linux, x86_64-linux, x86_64-darwin ] TBC: [ i686-linux, x86_64-linux, x86_64-darwin ] TBit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3575,7 +3383,6 @@ dont-distribute-packages: template-default: [ i686-linux, x86_64-linux, x86_64-darwin ] template-haskell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] template-hsml: [ i686-linux, x86_64-linux, x86_64-darwin ] - templatepg: [ i686-linux, x86_64-linux, x86_64-darwin ] template-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] tempodb: [ i686-linux, x86_64-linux, x86_64-darwin ] temporal-csound: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3584,7 +3391,6 @@ dont-distribute-packages: termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] terrahs: [ i686-linux, x86_64-linux, x86_64-darwin ] - tersmu: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-doctest: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] testloop: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3598,13 +3404,11 @@ dont-distribute-packages: text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] textmatetags: [ i686-linux, x86_64-linux, x86_64-darwin ] text-normal: [ i686-linux, x86_64-linux, x86_64-darwin ] - textPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] text-register-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] tfp-th: [ i686-linux, x86_64-linux, x86_64-darwin ] tftp: [ x86_64-darwin ] - th-context: [ i686-linux, x86_64-linux, x86_64-darwin ] Theora: [ i686-linux, x86_64-linux, x86_64-darwin ] theoremquest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] thih: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3612,10 +3416,8 @@ dont-distribute-packages: Thingie: [ i686-linux, x86_64-linux, x86_64-darwin ] th-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] th-kinds: [ i686-linux, x86_64-linux, x86_64-darwin ] - threadscope: [ i686-linux, x86_64-linux, x86_64-darwin ] - thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] + threads-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] - tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] tickle: [ i686-linux ] tickle: [ i686-linux, x86_64-linux, x86_64-darwin ] tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3640,7 +3442,6 @@ dont-distribute-packages: TinyLaunchbury: [ i686-linux, x86_64-linux, x86_64-darwin ] TinyURL: [ i686-linux, x86_64-linux, x86_64-darwin ] tip-haskell-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] - tip-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] Titim: [ i686-linux, x86_64-linux, x86_64-darwin ] tkhs: [ i686-linux, x86_64-linux, x86_64-darwin ] tkyprof: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3667,21 +3468,17 @@ dont-distribute-packages: transient: [ i686-linux, x86_64-linux, x86_64-darwin ] translate: [ i686-linux, x86_64-linux, x86_64-darwin ] traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ] - treeviz: [ i686-linux, x86_64-linux, x86_64-darwin ] tremulous-query: [ i686-linux, x86_64-linux, x86_64-darwin ] TrendGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] trhsx: [ i686-linux, x86_64-linux, x86_64-darwin ] triangulation: [ i686-linux, x86_64-linux, x86_64-darwin ] TrieMap: [ i686-linux, x86_64-linux, x86_64-darwin ] - tries: [ i686-linux, x86_64-linux, x86_64-darwin ] trimpolya: [ i686-linux, x86_64-linux, x86_64-darwin ] - true-name: [ i686-linux, x86_64-linux, x86_64-darwin ] tsession-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] tsession: [ i686-linux, x86_64-linux, x86_64-darwin ] tskiplist: [ i686-linux, x86_64-linux, x86_64-darwin ] tsp-viz: [ i686-linux, x86_64-linux, x86_64-darwin ] tuntap: [ i686-linux, x86_64-linux, x86_64-darwin ] - tup-functor: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] tupleinstances: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-morph: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3698,11 +3495,8 @@ dont-distribute-packages: twine: [ i686-linux, x86_64-linux, x86_64-darwin ] twisty: [ i686-linux, x86_64-linux, x86_64-darwin ] twitch: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitter-types-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] tx: [ i686-linux, x86_64-linux, x86_64-darwin ] TYB: [ i686-linux, x86_64-linux, x86_64-darwin ] typalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3720,7 +3514,6 @@ dont-distribute-packages: type-level: [ i686-linux, x86_64-linux, x86_64-darwin ] type-level-sets: [ i686-linux, x86_64-linux, x86_64-darwin ] typelevel-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-natural: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord-spine-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] typeparams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3730,7 +3523,6 @@ dont-distribute-packages: type-spine: [ i686-linux, x86_64-linux, x86_64-darwin ] type-structure: [ i686-linux, x86_64-linux, x86_64-darwin ] type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - typography-geometry: [ i686-linux, x86_64-linux, x86_64-darwin ] tz: [ i686-linux, x86_64-linux, x86_64-darwin ] uAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] uberlast: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3749,7 +3541,6 @@ dont-distribute-packages: uniform-io: [ i686-linux, x86_64-linux, x86_64-darwin ] union-map: [ i686-linux, x86_64-linux, x86_64-darwin ] uniqueid: [ i686-linux, x86_64-linux, x86_64-darwin ] - unique-logic-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] unittyped: [ i686-linux, x86_64-linux, x86_64-darwin ] universe-th: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3779,7 +3570,6 @@ dont-distribute-packages: utf8-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] UTFTConverter: [ i686-linux, x86_64-linux, x86_64-darwin ] uuagc-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] - uu-tc: [ i686-linux, x86_64-linux, x86_64-darwin ] uvector-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] uvector: [ i686-linux, x86_64-linux, x86_64-darwin ] v4l2-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3789,14 +3579,12 @@ dont-distribute-packages: vacuum: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-ubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - validation: [ i686-linux, x86_64-linux, x86_64-darwin ] vampire: [ i686-linux, x86_64-linux, x86_64-darwin ] var: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] vcache-trie: [ x86_64-darwin ] vcache: [ x86_64-darwin ] vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] - vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-opengl: [ x86_64-darwin ] @@ -3813,22 +3601,20 @@ dont-distribute-packages: verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] versions: [ i686-linux, x86_64-linux, x86_64-darwin ] vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] - vimus: [ i686-linux, x86_64-linux, x86_64-darwin ] vintage-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] - vinyl-gl: [ x86_64-darwin ] + vinyl-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + vinyl-vectors: [ i686-linux, x86_64-linux, x86_64-darwin ] virthualenv: [ i686-linux, x86_64-linux, x86_64-darwin ] vision: [ i686-linux, x86_64-linux, x86_64-darwin ] visual-graphrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] visual-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] vivid: [ i686-linux, x86_64-linux, x86_64-darwin ] vk-aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] - VKHS: [ i686-linux, x86_64-linux, x86_64-darwin ] vorbiscomment: [ i686-linux, x86_64-linux, x86_64-darwin ] vowpal-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] voyeur: [ i686-linux, x86_64-linux, x86_64-darwin ] vtegtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] - vte: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-menu: [ i686-linux, x86_64-linux, x86_64-darwin ] vty-ui-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3843,7 +3629,6 @@ dont-distribute-packages: wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-crowd: [ i686-linux ] - wai-middleware-etag: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-headers: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-hmac-client: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3859,7 +3644,7 @@ dont-distribute-packages: watchdog: [ i686-linux, x86_64-linux, x86_64-darwin ] watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] - WaveFront: [ x86_64-darwin ] + WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ] wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] weather-api: [ i686-linux, x86_64-linux, x86_64-darwin ] WebBits-Html: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3871,9 +3656,6 @@ dont-distribute-packages: webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] web-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ] webify: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkitgtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkitgtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] - webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ] Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3902,8 +3684,8 @@ dont-distribute-packages: WMSigner: [ i686-linux ] wobsurv: [ i686-linux, x86_64-linux, x86_64-darwin ] woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] - wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] word24: [ i686-linux, x86_64-linux, x86_64-darwin ] + WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3920,7 +3702,6 @@ dont-distribute-packages: wumpus-microprint: [ i686-linux, x86_64-linux, x86_64-darwin ] wumpus-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] WURFL: [ i686-linux, x86_64-linux, x86_64-darwin ] - wxAsteroids: [ i686-linux, x86_64-linux, x86_64-darwin ] wxcore: [ x86_64-darwin ] wxc: [ x86_64-darwin ] WXDiffCtrl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3935,11 +3716,9 @@ dont-distribute-packages: X11-xdamage: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-xfixes: [ i686-linux, x86_64-linux, x86_64-darwin ] x11-xinput: [ i686-linux, x86_64-linux, x86_64-darwin ] - x509-util: [ i686-linux, x86_64-linux, x86_64-darwin ] xattr: [ x86_64-darwin ] xbattbar: [ x86_64-darwin ] xchat-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - xdot: [ i686-linux, x86_64-linux, x86_64-darwin ] x-dsp: [ i686-linux, x86_64-linux, x86_64-darwin ] Xec: [ i686-linux, x86_64-linux, x86_64-darwin ] xfconf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3960,6 +3739,8 @@ dont-distribute-packages: xml-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-prettify: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-push: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-query-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-query-xml-types: [ i686-linux, x86_64-linux, x86_64-darwin ] xmltv: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3968,7 +3749,6 @@ dont-distribute-packages: xmonad-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-contrib-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-screenshot: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-utils: [ x86_64-darwin ] xmpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] XMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4004,7 +3784,6 @@ dont-distribute-packages: yavie: [ i686-linux, x86_64-linux, x86_64-darwin ] ycextra: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-angular-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-auth-account-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap-native: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4016,10 +3795,8 @@ dont-distribute-packages: yesod-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-goodies: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-links: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-media-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-paginate: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-pagination: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-paginator: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4037,13 +3814,7 @@ dont-distribute-packages: yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] yices: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-fuzzy-open: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-monokai: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-rope: [ x86_64-darwin ] - yi-snippet: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-solarized: [ i686-linux, x86_64-linux, x86_64-darwin ] - yi-spolsky: [ i686-linux, x86_64-linux, x86_64-darwin ] yjftp: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4053,7 +3824,6 @@ dont-distribute-packages: yuiGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ] yxdb-utils: [ i686-linux ] - yxdb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] z3: [ x86_64-darwin ] zampolit: [ i686-linux, x86_64-linux, x86_64-darwin ] zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 247cf8c8470..bb60198aeaf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -634,6 +635,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1030,6 +1032,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1157,6 +1160,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1367,6 +1371,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1413,6 +1418,7 @@ self: super: { "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; "async" = doDistribute super."async_2_0_1_6"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1550,6 +1556,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1672,6 +1679,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1822,6 +1830,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1961,6 +1970,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cereal" = doDistribute super."cereal_0_4_1_0"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2500,6 +2510,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2646,6 +2657,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2921,6 +2933,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3193,9 +3206,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3232,6 +3247,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -4002,8 +4018,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_0"; "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -4628,6 +4647,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5309,6 +5329,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5948,6 +5969,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6017,6 +6039,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -6037,6 +6060,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6109,6 +6133,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6125,6 +6150,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6245,6 +6271,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6292,6 +6319,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6737,6 +6765,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6950,6 +6979,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7012,6 +7042,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7152,6 +7183,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7284,6 +7316,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7329,6 +7362,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7483,6 +7517,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7581,6 +7616,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7630,6 +7666,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7746,6 +7783,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7940,6 +7978,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -8000,6 +8039,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8031,6 +8071,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8364,6 +8405,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8434,6 +8476,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8480,6 +8523,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8624,6 +8668,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index d7817d30849..77b66031ece 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -634,6 +635,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1030,6 +1032,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1157,6 +1160,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1367,6 +1371,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1413,6 +1418,7 @@ self: super: { "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; "async" = doDistribute super."async_2_0_1_6"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1550,6 +1556,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1672,6 +1679,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1822,6 +1830,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1961,6 +1970,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cereal" = doDistribute super."cereal_0_4_1_0"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2499,6 +2509,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2645,6 +2656,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2920,6 +2932,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3192,9 +3205,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3231,6 +3246,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -4001,8 +4017,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_0"; "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -4627,6 +4646,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5308,6 +5328,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5947,6 +5968,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6016,6 +6038,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -6036,6 +6059,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6108,6 +6132,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6124,6 +6149,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6244,6 +6270,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6291,6 +6318,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6736,6 +6764,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6949,6 +6978,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7011,6 +7041,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7151,6 +7182,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7283,6 +7315,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7328,6 +7361,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7482,6 +7516,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7580,6 +7615,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7629,6 +7665,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7745,6 +7782,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7939,6 +7977,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7999,6 +8038,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8030,6 +8070,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8363,6 +8404,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8433,6 +8475,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8479,6 +8522,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8623,6 +8667,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index c785b995285..da9c527ffa9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -634,6 +635,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1030,6 +1032,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1157,6 +1160,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1367,6 +1371,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1413,6 +1418,7 @@ self: super: { "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; "async" = doDistribute super."async_2_0_1_6"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1550,6 +1556,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1672,6 +1679,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1822,6 +1830,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1961,6 +1970,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cereal" = doDistribute super."cereal_0_4_1_0"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2499,6 +2509,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2645,6 +2656,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2920,6 +2932,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3192,9 +3205,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3231,6 +3246,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -4001,8 +4017,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_0"; "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -4627,6 +4646,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5308,6 +5328,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5947,6 +5968,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6016,6 +6038,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -6036,6 +6059,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6108,6 +6132,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6124,6 +6149,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6244,6 +6270,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6291,6 +6318,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6736,6 +6764,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6949,6 +6978,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7011,6 +7041,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7151,6 +7182,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7283,6 +7315,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7328,6 +7361,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7482,6 +7516,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7580,6 +7615,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7629,6 +7665,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7745,6 +7782,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7939,6 +7977,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7999,6 +8038,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8030,6 +8070,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8363,6 +8404,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8433,6 +8475,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8479,6 +8522,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8623,6 +8667,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 4b9fb2540f1..04168fba70a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -634,6 +635,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1030,6 +1032,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1157,6 +1160,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1367,6 +1371,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1413,6 +1418,7 @@ self: super: { "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; "async" = doDistribute super."async_2_0_1_6"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1550,6 +1556,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1672,6 +1679,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1822,6 +1830,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1961,6 +1970,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cereal" = doDistribute super."cereal_0_4_1_0"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2499,6 +2509,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2645,6 +2656,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2920,6 +2932,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3192,9 +3205,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3231,6 +3246,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -4001,8 +4017,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_0"; "hasql-backend" = doDistribute super."hasql-backend_0_2_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -4627,6 +4646,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5308,6 +5328,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5947,6 +5968,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6016,6 +6038,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -6036,6 +6059,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6108,6 +6132,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6124,6 +6149,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6244,6 +6270,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6291,6 +6318,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6736,6 +6764,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6949,6 +6978,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7011,6 +7041,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7151,6 +7182,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7283,6 +7315,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7328,6 +7361,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7482,6 +7516,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7580,6 +7615,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7629,6 +7665,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7745,6 +7782,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7939,6 +7977,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7999,6 +8038,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8030,6 +8070,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8363,6 +8404,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8433,6 +8475,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8479,6 +8522,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8623,6 +8667,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index b62bc0dd632..e0cd9431130 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -634,6 +635,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1030,6 +1032,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1157,6 +1160,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1367,6 +1371,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1413,6 +1418,7 @@ self: super: { "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; "async" = doDistribute super."async_2_0_1_6"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1550,6 +1556,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1672,6 +1679,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1822,6 +1830,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1961,6 +1970,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cereal" = doDistribute super."cereal_0_4_1_0"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2499,6 +2509,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2644,6 +2655,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2919,6 +2931,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3191,9 +3204,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3230,6 +3245,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3998,8 +4014,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_1"; "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -4624,6 +4643,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5305,6 +5325,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5944,6 +5965,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6013,6 +6035,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -6033,6 +6056,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6105,6 +6129,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6121,6 +6146,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6241,6 +6267,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6288,6 +6315,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6733,6 +6761,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6945,6 +6974,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7007,6 +7037,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7147,6 +7178,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7279,6 +7311,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7324,6 +7357,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7478,6 +7512,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7575,6 +7610,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_8"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7624,6 +7660,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7740,6 +7777,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7934,6 +7972,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7994,6 +8033,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8025,6 +8065,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8358,6 +8399,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8428,6 +8470,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8474,6 +8517,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8618,6 +8662,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 74ba1e18c51..44d0e9653ad 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -634,6 +635,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1030,6 +1032,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1157,6 +1160,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1367,6 +1371,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1413,6 +1418,7 @@ self: super: { "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; "async" = doDistribute super."async_2_0_1_6"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1550,6 +1556,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1672,6 +1679,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1822,6 +1830,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1961,6 +1970,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cereal" = doDistribute super."cereal_0_4_1_0"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2499,6 +2509,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2644,6 +2655,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2919,6 +2931,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3191,9 +3204,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3230,6 +3245,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3998,8 +4014,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_1"; "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache" = doDistribute super."hastache_0_6_0"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -4624,6 +4643,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5305,6 +5325,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5944,6 +5965,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6013,6 +6035,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -6033,6 +6056,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6105,6 +6129,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6121,6 +6146,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6241,6 +6267,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6288,6 +6315,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6733,6 +6761,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6945,6 +6974,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7007,6 +7037,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7147,6 +7178,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7279,6 +7311,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7324,6 +7357,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7478,6 +7512,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7575,6 +7610,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_8"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7624,6 +7660,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7740,6 +7777,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7934,6 +7972,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7994,6 +8033,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8025,6 +8065,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8306,6 +8347,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8357,6 +8399,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8427,6 +8470,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8473,6 +8517,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8617,6 +8662,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 35938f9e12d..3f4405e5b5d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -634,6 +635,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1029,6 +1031,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1156,6 +1159,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1366,6 +1370,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1411,6 +1416,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1547,6 +1553,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1669,6 +1676,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1819,6 +1827,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1958,6 +1967,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cereal" = doDistribute super."cereal_0_4_1_0"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2496,6 +2506,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2641,6 +2652,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2916,6 +2928,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3188,9 +3201,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3227,6 +3242,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3995,8 +4011,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_1"; "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4620,6 +4639,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5301,6 +5321,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5939,6 +5960,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6008,6 +6030,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -6028,6 +6051,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6100,6 +6124,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6116,6 +6141,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6236,6 +6262,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6283,6 +6310,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6728,6 +6756,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6939,6 +6968,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7001,6 +7031,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7141,6 +7172,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7273,6 +7305,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7318,6 +7351,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7472,6 +7506,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7569,6 +7604,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_8"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7618,6 +7654,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7734,6 +7771,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7928,6 +7966,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7988,6 +8027,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8019,6 +8059,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8300,6 +8341,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8351,6 +8393,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8420,6 +8463,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8466,6 +8510,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8610,6 +8655,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 294f0f93042..f4673ed279f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -612,6 +612,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -634,6 +635,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1029,6 +1031,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1156,6 +1159,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1366,6 +1370,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1411,6 +1416,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1547,6 +1553,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1669,6 +1676,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1819,6 +1827,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1958,6 +1967,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cereal" = doDistribute super."cereal_0_4_1_0"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2496,6 +2506,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2641,6 +2652,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2916,6 +2928,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3188,9 +3201,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3227,6 +3242,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3995,8 +4011,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_4_1"; "hasql-backend" = doDistribute super."hasql-backend_0_2_2"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4620,6 +4639,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5301,6 +5321,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5939,6 +5960,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -6008,6 +6030,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -6028,6 +6051,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6100,6 +6124,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6116,6 +6141,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6236,6 +6262,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6283,6 +6310,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6728,6 +6756,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6939,6 +6968,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7001,6 +7031,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7141,6 +7172,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7273,6 +7305,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7318,6 +7351,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7472,6 +7506,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7569,6 +7604,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_8"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7618,6 +7654,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7734,6 +7771,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7928,6 +7966,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7988,6 +8027,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8019,6 +8059,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8300,6 +8341,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8351,6 +8393,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8420,6 +8463,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8466,6 +8510,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8610,6 +8655,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 53e1b874332..b8a801b5b39 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -609,6 +609,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -631,6 +632,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1025,6 +1027,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1152,6 +1155,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1362,6 +1366,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1407,6 +1412,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1543,6 +1549,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1664,6 +1671,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1812,6 +1820,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1951,6 +1960,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cereal" = doDistribute super."cereal_0_4_1_0"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2487,6 +2497,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2632,6 +2643,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2905,6 +2917,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3178,9 +3191,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3217,6 +3232,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3985,8 +4001,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_1"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4608,6 +4627,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5289,6 +5309,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5927,6 +5948,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5996,6 +6018,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -6016,6 +6039,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6088,6 +6112,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6104,6 +6129,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6223,6 +6249,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6270,6 +6297,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6714,6 +6742,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6924,6 +6953,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6986,6 +7016,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7126,6 +7157,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7258,6 +7290,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7303,6 +7336,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7456,6 +7490,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7553,6 +7588,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_8"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7602,6 +7638,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7718,6 +7755,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7912,6 +7950,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7972,6 +8011,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -8003,6 +8043,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8283,6 +8324,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8334,6 +8376,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8403,6 +8446,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8449,6 +8493,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8593,6 +8638,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index a52ab9a62d9..349496ec6c7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -609,6 +609,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -631,6 +632,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1025,6 +1027,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1152,6 +1155,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1362,6 +1366,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1407,6 +1412,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1543,6 +1549,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1664,6 +1671,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1811,6 +1819,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1949,6 +1958,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2484,6 +2494,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2629,6 +2640,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2901,6 +2913,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3174,9 +3187,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3213,6 +3228,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3980,8 +3996,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_1"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4600,6 +4619,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5281,6 +5301,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5918,6 +5939,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5987,6 +6009,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -6007,6 +6030,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6079,6 +6103,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6095,6 +6120,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6214,6 +6240,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6261,6 +6288,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6705,6 +6733,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6915,6 +6944,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6977,6 +7007,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7116,6 +7147,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7248,6 +7280,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7293,6 +7326,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7446,6 +7480,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7542,6 +7577,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_8_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7591,6 +7627,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7707,6 +7744,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7898,6 +7936,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7958,6 +7997,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7989,6 +8029,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8268,6 +8309,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8319,6 +8361,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8388,6 +8431,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8434,6 +8478,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8578,6 +8623,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index 538cc1cf028..fdb4664c342 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -630,6 +631,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1024,6 +1026,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1151,6 +1154,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1361,6 +1365,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1406,6 +1411,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1542,6 +1548,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1663,6 +1670,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1809,6 +1817,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1945,6 +1954,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2478,6 +2488,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2623,6 +2634,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2895,6 +2907,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3165,9 +3178,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpipe" = dontDistribute super."fpipe"; "fpnla" = dontDistribute super."fpnla"; @@ -3203,6 +3218,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3967,8 +3983,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4585,6 +4604,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5258,6 +5278,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5893,6 +5914,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5962,6 +5984,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5982,6 +6005,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6052,6 +6076,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6068,6 +6093,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6187,6 +6213,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6234,6 +6261,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6376,6 +6404,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6675,6 +6704,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6885,6 +6915,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6947,6 +6978,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7085,6 +7117,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7216,6 +7249,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7261,6 +7295,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7414,6 +7449,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7510,6 +7546,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7559,6 +7596,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7674,6 +7712,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7863,6 +7902,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7922,6 +7962,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7952,6 +7993,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8230,6 +8272,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8281,6 +8324,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8350,6 +8394,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8396,6 +8441,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8538,6 +8584,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index cbcb1ea8217..ddc53549cca 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -630,6 +631,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1024,6 +1026,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1151,6 +1154,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1361,6 +1365,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1406,6 +1411,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1542,6 +1548,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1663,6 +1670,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1809,6 +1817,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1945,6 +1954,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2478,6 +2488,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2623,6 +2634,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2895,6 +2907,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3164,9 +3177,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpipe" = dontDistribute super."fpipe"; "fpnla" = dontDistribute super."fpnla"; @@ -3202,6 +3217,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3966,8 +3982,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4584,6 +4603,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5254,6 +5274,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5889,6 +5910,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5958,6 +5980,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5978,6 +6001,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6048,6 +6072,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6064,6 +6089,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6183,6 +6209,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6230,6 +6257,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6372,6 +6400,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6671,6 +6700,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6881,6 +6911,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6943,6 +6974,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7081,6 +7113,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7212,6 +7245,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7257,6 +7291,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7410,6 +7445,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7506,6 +7542,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7555,6 +7592,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7670,6 +7708,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7859,6 +7898,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7918,6 +7958,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7948,6 +7989,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8226,6 +8268,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8277,6 +8320,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8346,6 +8390,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8392,6 +8437,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8534,6 +8580,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 7e6c0fb7b37..9c8020b067b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -630,6 +631,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1024,6 +1026,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1151,6 +1154,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1361,6 +1365,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1406,6 +1411,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1542,6 +1548,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1663,6 +1670,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1809,6 +1817,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1945,6 +1954,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2478,6 +2488,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2623,6 +2634,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2895,6 +2907,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3164,9 +3177,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpipe" = dontDistribute super."fpipe"; "fpnla" = dontDistribute super."fpnla"; @@ -3202,6 +3217,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3966,8 +3982,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4583,6 +4602,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5253,6 +5273,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5888,6 +5909,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5957,6 +5979,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5977,6 +6000,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6047,6 +6071,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6063,6 +6088,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6182,6 +6208,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6229,6 +6256,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6371,6 +6399,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6670,6 +6699,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6880,6 +6910,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6942,6 +6973,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7080,6 +7112,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7211,6 +7244,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7256,6 +7290,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7408,6 +7443,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7504,6 +7540,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7553,6 +7590,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7668,6 +7706,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7856,6 +7895,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7915,6 +7955,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7945,6 +7986,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8223,6 +8265,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8274,6 +8317,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8343,6 +8387,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8389,6 +8434,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8531,6 +8577,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index b485c404024..906bf0a6a41 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -630,6 +631,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1024,6 +1026,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1151,6 +1154,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1361,6 +1365,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1406,6 +1411,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1542,6 +1548,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1663,6 +1670,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1809,6 +1817,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1945,6 +1954,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2478,6 +2488,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2622,6 +2633,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2894,6 +2906,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3163,9 +3176,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpipe" = dontDistribute super."fpipe"; "fpnla" = dontDistribute super."fpnla"; @@ -3201,6 +3216,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3964,8 +3980,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4581,6 +4600,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5251,6 +5271,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5886,6 +5907,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5955,6 +5977,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5975,6 +5998,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6045,6 +6069,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6061,6 +6086,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6180,6 +6206,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6227,6 +6254,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6369,6 +6397,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6668,6 +6697,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6878,6 +6908,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6940,6 +6971,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7078,6 +7110,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7209,6 +7242,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7254,6 +7288,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7406,6 +7441,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7502,6 +7538,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7551,6 +7588,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7666,6 +7704,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7853,6 +7892,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7912,6 +7952,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7942,6 +7983,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8220,6 +8262,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8271,6 +8314,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8340,6 +8384,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8386,6 +8431,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8528,6 +8574,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index 947913cb534..9fff6650c52 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -607,6 +607,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -629,6 +630,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1023,6 +1025,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1150,6 +1153,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1360,6 +1364,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1405,6 +1410,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1540,6 +1546,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1661,6 +1668,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1807,6 +1815,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1943,6 +1952,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2475,6 +2485,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2619,6 +2630,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2891,6 +2903,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3160,9 +3173,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpipe" = dontDistribute super."fpipe"; "fpnla" = dontDistribute super."fpnla"; @@ -3198,6 +3213,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3961,8 +3977,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4577,6 +4596,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5246,6 +5266,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5879,6 +5900,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5948,6 +5970,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5968,6 +5991,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6038,6 +6062,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6054,6 +6079,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6173,6 +6199,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6220,6 +6247,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6362,6 +6390,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6660,6 +6689,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6870,6 +6900,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6932,6 +6963,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7070,6 +7102,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7201,6 +7234,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7246,6 +7280,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7398,6 +7433,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7494,6 +7530,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7543,6 +7580,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7658,6 +7696,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7845,6 +7884,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7904,6 +7944,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7934,6 +7975,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8212,6 +8254,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8263,6 +8306,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8332,6 +8376,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8378,6 +8423,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8520,6 +8566,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index f6e16481c04..4078218a73f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -607,6 +607,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -629,6 +630,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1022,6 +1024,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1149,6 +1152,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1359,6 +1363,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1404,6 +1409,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1539,6 +1545,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1660,6 +1667,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1806,6 +1814,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1942,6 +1951,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2471,6 +2481,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2615,6 +2626,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2886,6 +2898,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3155,9 +3168,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpipe" = dontDistribute super."fpipe"; "fpnla" = dontDistribute super."fpnla"; @@ -3193,6 +3208,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3956,8 +3972,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4572,6 +4591,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5241,6 +5261,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5872,6 +5893,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5941,6 +5963,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5961,6 +5984,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6031,6 +6055,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6047,6 +6072,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6166,6 +6192,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6213,6 +6240,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6355,6 +6383,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6651,6 +6680,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6861,6 +6891,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6923,6 +6954,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7061,6 +7093,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7192,6 +7225,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7237,6 +7271,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7389,6 +7424,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7484,6 +7520,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7532,6 +7569,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7647,6 +7685,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7834,6 +7873,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7893,6 +7933,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7923,6 +7964,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8201,6 +8243,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8252,6 +8295,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8321,6 +8365,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8367,6 +8412,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8508,6 +8554,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 2ef6e45d736..0c298e5d465 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -609,6 +609,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -631,6 +632,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1025,6 +1027,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1152,6 +1155,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1362,6 +1366,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1407,6 +1412,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1543,6 +1549,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1664,6 +1671,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1811,6 +1819,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1949,6 +1958,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2482,6 +2492,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2627,6 +2638,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2899,6 +2911,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3172,9 +3185,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3211,6 +3226,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3977,8 +3993,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4597,6 +4616,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5278,6 +5298,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5915,6 +5936,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5984,6 +6006,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -6004,6 +6027,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6075,6 +6099,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6091,6 +6116,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6210,6 +6236,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6257,6 +6284,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6700,6 +6728,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6910,6 +6939,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6972,6 +7002,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7110,6 +7141,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7242,6 +7274,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7287,6 +7320,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7440,6 +7474,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7536,6 +7571,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7585,6 +7621,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7701,6 +7738,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7892,6 +7930,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7952,6 +7991,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7983,6 +8023,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8262,6 +8303,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8313,6 +8355,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8382,6 +8425,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8428,6 +8472,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8572,6 +8617,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 513e4d036ff..d7f56325fbf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -630,6 +631,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1024,6 +1026,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1151,6 +1154,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1361,6 +1365,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1406,6 +1411,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1542,6 +1548,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1663,6 +1670,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1810,6 +1818,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1948,6 +1957,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2481,6 +2491,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2626,6 +2637,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2898,6 +2910,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3170,9 +3183,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3209,6 +3224,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3974,8 +3990,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4594,6 +4613,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5275,6 +5295,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5911,6 +5932,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5980,6 +6002,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -6000,6 +6023,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6071,6 +6095,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6087,6 +6112,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6206,6 +6232,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6253,6 +6280,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6695,6 +6723,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6905,6 +6934,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6967,6 +6997,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7105,6 +7136,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7237,6 +7269,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7282,6 +7315,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7435,6 +7469,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7531,6 +7566,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7580,6 +7616,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7696,6 +7733,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7886,6 +7924,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7946,6 +7985,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7977,6 +8017,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8256,6 +8297,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8307,6 +8349,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8376,6 +8419,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8422,6 +8466,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8566,6 +8611,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 4d92f5a9da1..11b2b868116 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -630,6 +631,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1024,6 +1026,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1151,6 +1154,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1361,6 +1365,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1406,6 +1411,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1542,6 +1548,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1663,6 +1670,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1810,6 +1818,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1947,6 +1956,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2480,6 +2490,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2625,6 +2636,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2897,6 +2909,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3169,9 +3182,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3208,6 +3223,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3973,8 +3989,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4593,6 +4612,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5273,6 +5293,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5909,6 +5930,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5978,6 +6000,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5998,6 +6021,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6069,6 +6093,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6085,6 +6110,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6204,6 +6230,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6251,6 +6278,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6693,6 +6721,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6903,6 +6932,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6965,6 +6995,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7103,6 +7134,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7235,6 +7267,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7280,6 +7313,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7433,6 +7467,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7529,6 +7564,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7578,6 +7614,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7694,6 +7731,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7884,6 +7922,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7943,6 +7982,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7974,6 +8014,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8252,6 +8293,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8303,6 +8345,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8372,6 +8415,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8418,6 +8462,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8562,6 +8607,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 167bacddc4f..c0097e30c76 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -630,6 +631,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1024,6 +1026,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1151,6 +1154,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1361,6 +1365,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1406,6 +1411,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1542,6 +1548,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1663,6 +1670,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1810,6 +1818,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1947,6 +1956,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2480,6 +2490,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2625,6 +2636,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2897,6 +2909,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3169,9 +3182,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3208,6 +3223,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3973,8 +3989,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4593,6 +4612,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5267,6 +5287,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5903,6 +5924,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5972,6 +5994,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5992,6 +6015,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6063,6 +6087,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6079,6 +6104,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6198,6 +6224,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6245,6 +6272,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6687,6 +6715,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6897,6 +6926,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6959,6 +6989,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7097,6 +7128,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7229,6 +7261,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7274,6 +7307,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7427,6 +7461,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7523,6 +7558,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7572,6 +7608,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7688,6 +7725,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7878,6 +7916,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7937,6 +7976,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7968,6 +8008,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8246,6 +8287,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8297,6 +8339,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8366,6 +8409,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8412,6 +8456,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8556,6 +8601,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 370b302a5b2..5d5aa564450 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -630,6 +631,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1024,6 +1026,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1151,6 +1154,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1361,6 +1365,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1406,6 +1411,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1542,6 +1548,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1663,6 +1670,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1810,6 +1818,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1947,6 +1956,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2480,6 +2490,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2625,6 +2636,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2897,6 +2909,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3167,9 +3180,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = doDistribute super."fpco-api_1_2_0_4"; "fpipe" = dontDistribute super."fpipe"; @@ -3206,6 +3221,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3970,8 +3986,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4589,6 +4608,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5262,6 +5282,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5898,6 +5919,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5967,6 +5989,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5987,6 +6010,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6058,6 +6082,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6074,6 +6099,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6193,6 +6219,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6240,6 +6267,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6682,6 +6710,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6892,6 +6921,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6954,6 +6984,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7092,6 +7123,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7224,6 +7256,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7269,6 +7302,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7422,6 +7456,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7518,6 +7553,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7567,6 +7603,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7683,6 +7720,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7873,6 +7911,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7932,6 +7971,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7962,6 +8002,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8240,6 +8281,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8291,6 +8333,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8360,6 +8403,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8406,6 +8450,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8550,6 +8595,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index 9374eab101f..d77685d0a06 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -608,6 +608,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -630,6 +631,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "List" = dontDistribute super."List"; "ListLike" = dontDistribute super."ListLike"; @@ -1024,6 +1026,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1151,6 +1154,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1361,6 +1365,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1406,6 +1411,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1542,6 +1548,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = dontDistribute super."bcrypt"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1663,6 +1670,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1810,6 +1818,7 @@ self: super: { "bytestring-read" = dontDistribute super."bytestring-read"; "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1947,6 +1956,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2480,6 +2490,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2625,6 +2636,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2897,6 +2909,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -3167,9 +3180,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpipe" = dontDistribute super."fpipe"; "fpnla" = dontDistribute super."fpnla"; @@ -3205,6 +3220,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3969,8 +3985,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_0"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4587,6 +4606,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -5260,6 +5280,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5896,6 +5917,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5965,6 +5987,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5985,6 +6008,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -6055,6 +6079,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -6071,6 +6096,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6190,6 +6216,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6237,6 +6264,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_4"; @@ -6679,6 +6707,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6889,6 +6918,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6951,6 +6981,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = dontDistribute super."sbv"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -7089,6 +7120,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7221,6 +7253,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7266,6 +7299,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7419,6 +7453,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7515,6 +7550,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7564,6 +7600,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7680,6 +7717,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_2_2_4"; @@ -7870,6 +7908,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7929,6 +7968,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7959,6 +7999,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = dontDistribute super."trifecta"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8237,6 +8278,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8288,6 +8330,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8357,6 +8400,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8403,6 +8447,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8547,6 +8592,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-to-json" = dontDistribute super."xml-to-json"; "xml-to-json-fast" = dontDistribute super."xml-to-json-fast"; "xml-types" = doDistribute super."xml-types_0_3_4"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index a8232eb6b61..dc3f8a03f8b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -602,6 +602,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -624,6 +625,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1013,6 +1015,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1140,6 +1143,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1349,6 +1353,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1393,6 +1398,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1527,6 +1533,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1648,6 +1655,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1685,6 +1693,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1792,6 +1801,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1928,6 +1938,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2452,6 +2463,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2596,6 +2608,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2867,6 +2880,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3131,9 +3145,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3170,6 +3186,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3687,6 +3704,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3928,8 +3946,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4540,6 +4561,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4881,6 +4903,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5195,6 +5218,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5813,6 +5837,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5882,6 +5907,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5902,6 +5928,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5972,6 +5999,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5988,6 +6016,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6106,6 +6135,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6153,6 +6183,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6293,6 +6324,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6589,6 +6621,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6727,6 +6760,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_13"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6798,6 +6832,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6860,6 +6895,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6996,6 +7032,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7127,6 +7164,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7172,6 +7210,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7321,6 +7360,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7415,6 +7455,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7463,6 +7504,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7576,6 +7618,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7763,6 +7806,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7822,6 +7866,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7852,6 +7897,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8129,6 +8175,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8179,6 +8226,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8247,6 +8295,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8293,6 +8342,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8432,6 +8482,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 370c1c31a1b..16ab241c515 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -602,6 +602,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -624,6 +625,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1013,6 +1015,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1140,6 +1143,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1349,6 +1353,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1393,6 +1398,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1527,6 +1533,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1648,6 +1655,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1685,6 +1693,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1791,6 +1800,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestring-trie" = doDistribute super."bytestring-trie_0_2_4"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; @@ -1927,6 +1937,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2451,6 +2462,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2595,6 +2607,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2866,6 +2879,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3130,9 +3144,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3169,6 +3185,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3686,6 +3703,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3927,8 +3945,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4538,6 +4559,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4879,6 +4901,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5193,6 +5216,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5811,6 +5835,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5880,6 +5905,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5900,6 +5926,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5970,6 +5997,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5986,6 +6014,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6104,6 +6133,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6151,6 +6181,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6291,6 +6322,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6587,6 +6619,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6725,6 +6758,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_16"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6796,6 +6830,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6858,6 +6893,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6994,6 +7030,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7125,6 +7162,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7170,6 +7208,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7319,6 +7358,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7413,6 +7453,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7461,6 +7502,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7574,6 +7616,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7761,6 +7804,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7820,6 +7864,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7850,6 +7895,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8127,6 +8173,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8176,6 +8223,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8244,6 +8292,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8290,6 +8339,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8429,6 +8479,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index ac1d32bafa3..3f109fadc73 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -623,6 +624,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1010,6 +1012,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1135,6 +1138,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1344,6 +1348,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1388,6 +1393,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1519,6 +1525,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1639,6 +1646,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1676,6 +1684,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1781,6 +1790,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1915,6 +1925,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2436,6 +2447,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2580,6 +2592,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2849,6 +2862,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3111,9 +3125,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3150,6 +3166,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3663,6 +3680,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3904,8 +3922,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_1"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4511,6 +4532,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4848,6 +4870,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5159,6 +5182,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5771,6 +5795,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5840,6 +5865,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5860,6 +5886,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5930,6 +5957,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5945,6 +5973,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6061,6 +6090,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6108,6 +6138,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6245,6 +6276,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6540,6 +6572,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6677,6 +6710,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_18"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6748,6 +6782,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6809,6 +6844,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6945,6 +6981,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7075,6 +7112,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7120,6 +7158,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7268,6 +7307,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7356,6 +7396,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7404,6 +7445,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7515,6 +7557,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7702,6 +7745,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7759,6 +7803,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7789,6 +7834,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8066,6 +8112,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8115,6 +8162,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8183,6 +8231,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8229,6 +8278,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8366,6 +8416,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index f5234f88368..af11314a5ba 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -623,6 +624,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1010,6 +1012,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1135,6 +1138,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1343,6 +1347,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1387,6 +1392,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1518,6 +1524,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1638,6 +1645,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1675,6 +1683,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1780,6 +1789,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1914,6 +1924,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2435,6 +2446,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2579,6 +2591,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2848,6 +2861,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3110,9 +3124,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3149,6 +3165,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3661,6 +3678,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3902,8 +3920,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4507,6 +4528,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4843,6 +4865,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5154,6 +5177,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5765,6 +5789,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5834,6 +5859,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5854,6 +5880,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5923,6 +5950,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5938,6 +5966,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6054,6 +6083,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6101,6 +6131,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6238,6 +6269,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6533,6 +6565,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6669,6 +6702,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_18"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6740,6 +6774,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6801,6 +6836,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6937,6 +6973,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7067,6 +7104,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7112,6 +7150,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7260,6 +7299,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7347,6 +7387,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7395,6 +7436,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7505,6 +7547,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7692,6 +7735,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7749,6 +7793,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7779,6 +7824,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8056,6 +8102,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8105,6 +8152,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8173,6 +8221,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8219,6 +8268,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8356,6 +8406,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 8b83a3b3ae1..439771557df 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -623,6 +624,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1010,6 +1012,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1135,6 +1138,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1343,6 +1347,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1387,6 +1392,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1518,6 +1524,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1638,6 +1645,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1675,6 +1683,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1780,6 +1789,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1914,6 +1924,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2435,6 +2446,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2579,6 +2591,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2848,6 +2861,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3110,9 +3124,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3149,6 +3165,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3661,6 +3678,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3902,8 +3920,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4507,6 +4528,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4843,6 +4865,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5154,6 +5177,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5765,6 +5789,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5834,6 +5859,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5854,6 +5880,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5923,6 +5950,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5938,6 +5966,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6054,6 +6083,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6101,6 +6131,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6238,6 +6269,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6533,6 +6565,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6669,6 +6702,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_18"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6740,6 +6774,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6801,6 +6836,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6936,6 +6972,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7066,6 +7103,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7111,6 +7149,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7259,6 +7298,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7346,6 +7386,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7394,6 +7435,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7504,6 +7546,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7691,6 +7734,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7748,6 +7792,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7778,6 +7823,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8055,6 +8101,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8104,6 +8151,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8172,6 +8220,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8218,6 +8267,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8355,6 +8405,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 6316dfd77e5..681a3bbcce6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -623,6 +624,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1010,6 +1012,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1135,6 +1138,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1343,6 +1347,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1387,6 +1392,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1518,6 +1524,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1638,6 +1645,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1675,6 +1683,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1780,6 +1789,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1914,6 +1924,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2435,6 +2446,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2579,6 +2591,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2848,6 +2861,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3110,9 +3124,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3149,6 +3165,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3660,6 +3677,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3901,8 +3919,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4506,6 +4527,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4841,6 +4863,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5152,6 +5175,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5762,6 +5786,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5831,6 +5856,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5851,6 +5877,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5920,6 +5947,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5935,6 +5963,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6051,6 +6080,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6098,6 +6128,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6235,6 +6266,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6530,6 +6562,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6666,6 +6699,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_18"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6737,6 +6771,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6798,6 +6833,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6933,6 +6969,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7063,6 +7100,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7108,6 +7146,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7256,6 +7295,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7343,6 +7383,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7391,6 +7432,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7501,6 +7543,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7688,6 +7731,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7745,6 +7789,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7775,6 +7820,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8052,6 +8098,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8101,6 +8148,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8169,6 +8217,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8215,6 +8264,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8352,6 +8402,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index af45b6d7d95..65ec277782b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -623,6 +624,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1010,6 +1012,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1135,6 +1138,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1342,6 +1346,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1386,6 +1391,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1517,6 +1523,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1637,6 +1644,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1674,6 +1682,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1779,6 +1788,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1913,6 +1923,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2434,6 +2445,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2578,6 +2590,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2847,6 +2860,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3108,9 +3122,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3147,6 +3163,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3658,6 +3675,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3899,8 +3917,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4503,6 +4524,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4838,6 +4860,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5149,6 +5172,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5759,6 +5783,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5828,6 +5853,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5848,6 +5874,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5917,6 +5944,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5932,6 +5960,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6048,6 +6077,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6095,6 +6125,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6232,6 +6263,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6526,6 +6558,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6662,6 +6695,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_18"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6733,6 +6767,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6794,6 +6829,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6929,6 +6965,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7058,6 +7095,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7103,6 +7141,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7251,6 +7290,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7338,6 +7378,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7386,6 +7427,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7496,6 +7538,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7683,6 +7726,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7740,6 +7784,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7770,6 +7815,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8047,6 +8093,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8096,6 +8143,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8163,6 +8211,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8209,6 +8258,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8345,6 +8395,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 54efbc0a9ee..835f61f8334 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -623,6 +624,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1010,6 +1012,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1135,6 +1138,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1342,6 +1346,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1386,6 +1391,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1517,6 +1523,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1637,6 +1644,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1674,6 +1682,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1779,6 +1788,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1913,6 +1923,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2434,6 +2445,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2578,6 +2590,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2846,6 +2859,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3107,9 +3121,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3146,6 +3162,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3657,6 +3674,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3898,8 +3916,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4502,6 +4523,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4837,6 +4859,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5148,6 +5171,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5755,6 +5779,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5824,6 +5849,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5844,6 +5870,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5913,6 +5940,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5928,6 +5956,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6044,6 +6073,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6091,6 +6121,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6228,6 +6259,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6522,6 +6554,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6658,6 +6691,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_18"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6729,6 +6763,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6790,6 +6825,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6925,6 +6961,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7054,6 +7091,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7099,6 +7137,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7246,6 +7285,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7333,6 +7373,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7381,6 +7422,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7491,6 +7533,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7678,6 +7721,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7735,6 +7779,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7765,6 +7810,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8042,6 +8088,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8091,6 +8138,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8158,6 +8206,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8204,6 +8253,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8340,6 +8390,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 2f69f9785d6..c6d5421a1be 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -600,6 +600,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -622,6 +623,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1009,6 +1011,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1134,6 +1137,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1341,6 +1345,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1385,6 +1390,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1516,6 +1522,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1636,6 +1643,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1673,6 +1681,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1778,6 +1787,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1912,6 +1922,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2431,6 +2442,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2574,6 +2586,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2842,6 +2855,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3101,9 +3115,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3140,6 +3156,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3651,6 +3668,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3891,8 +3909,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4495,6 +4516,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4830,6 +4852,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5140,6 +5163,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5747,6 +5771,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5816,6 +5841,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5836,6 +5862,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5905,6 +5932,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5920,6 +5948,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6036,6 +6065,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6083,6 +6113,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6220,6 +6251,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6514,6 +6546,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6650,6 +6683,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_18"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6721,6 +6755,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6782,6 +6817,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6917,6 +6953,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7046,6 +7083,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7091,6 +7129,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7237,6 +7276,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7324,6 +7364,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7372,6 +7413,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7482,6 +7524,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7669,6 +7712,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7726,6 +7770,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7756,6 +7801,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8033,6 +8079,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8082,6 +8129,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8149,6 +8197,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8195,6 +8244,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8331,6 +8381,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_5"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index c5b5eba33de..b0ec9efa812 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -600,6 +600,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -622,6 +623,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1009,6 +1011,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1134,6 +1137,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1341,6 +1345,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1384,6 +1389,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1514,6 +1520,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1634,6 +1641,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1671,6 +1679,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1775,6 +1784,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1909,6 +1919,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2428,6 +2439,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2571,6 +2583,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2839,6 +2852,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3096,9 +3110,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3135,6 +3151,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3645,6 +3662,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3884,8 +3902,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4488,6 +4509,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4823,6 +4845,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5133,6 +5156,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5740,6 +5764,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5808,6 +5833,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5828,6 +5854,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5897,6 +5924,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5912,6 +5940,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6028,6 +6057,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6075,6 +6105,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6212,6 +6243,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6506,6 +6538,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6641,6 +6674,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_19"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6712,6 +6746,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6773,6 +6808,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6908,6 +6944,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7037,6 +7074,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7082,6 +7120,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7228,6 +7267,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7315,6 +7355,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7363,6 +7404,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7473,6 +7515,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7660,6 +7703,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7717,6 +7761,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7747,6 +7792,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8024,6 +8070,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8073,6 +8120,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8140,6 +8188,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8150,6 +8199,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "waitra" = doDistribute super."waitra_0_0_3_0"; @@ -8185,6 +8235,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8321,6 +8372,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_5"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index e828d012ed3..18328bd080e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -600,6 +600,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -622,6 +623,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1009,6 +1011,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1134,6 +1137,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1341,6 +1345,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1384,6 +1389,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1514,6 +1520,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1634,6 +1641,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1671,6 +1679,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1758,6 +1767,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1772,6 +1782,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1906,6 +1917,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2425,6 +2437,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2568,6 +2581,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2835,6 +2849,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3092,9 +3107,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3131,6 +3148,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3640,6 +3658,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3879,8 +3898,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4482,6 +4504,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4817,6 +4840,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5127,6 +5151,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5733,6 +5758,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5801,6 +5827,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5821,6 +5848,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5890,6 +5918,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5905,6 +5934,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6021,6 +6051,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6068,6 +6099,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6204,6 +6236,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6498,6 +6531,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6633,6 +6667,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_19"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6704,6 +6739,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6765,6 +6801,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6900,6 +6937,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7029,6 +7067,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7074,6 +7113,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7220,6 +7260,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7307,6 +7348,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -7354,6 +7396,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7464,6 +7507,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7651,6 +7695,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7708,6 +7753,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7738,6 +7784,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8015,6 +8062,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8064,6 +8112,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8130,6 +8179,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8140,6 +8190,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "waitra" = doDistribute super."waitra_0_0_3_0"; @@ -8175,6 +8226,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8311,6 +8363,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index 795101af294..f4fbe751b3b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -600,6 +600,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -622,6 +623,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1009,6 +1011,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1134,6 +1137,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1341,6 +1345,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1384,6 +1389,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1514,6 +1520,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1634,6 +1641,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1671,6 +1679,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1758,6 +1767,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1772,6 +1782,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1906,6 +1917,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2425,6 +2437,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2568,6 +2581,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2835,6 +2849,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3091,9 +3106,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3130,6 +3147,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3639,6 +3657,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3878,8 +3897,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4481,6 +4503,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4816,6 +4839,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5126,6 +5150,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5730,6 +5755,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5798,6 +5824,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5818,6 +5845,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5887,6 +5915,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5902,6 +5931,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6018,6 +6048,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6065,6 +6096,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6201,6 +6233,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6495,6 +6528,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6630,6 +6664,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_19"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6701,6 +6736,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6762,6 +6798,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6897,6 +6934,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7026,6 +7064,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7070,6 +7109,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7215,6 +7255,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7302,6 +7343,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -7349,6 +7391,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7459,6 +7502,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7646,6 +7690,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7703,6 +7748,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7733,6 +7779,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8010,6 +8057,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8059,6 +8107,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8125,6 +8174,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8135,6 +8185,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "waitra" = doDistribute super."waitra_0_0_3_0"; @@ -8170,6 +8221,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8305,6 +8357,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 1e37ab41340..fa88242206f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -602,6 +602,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -624,6 +625,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1012,6 +1014,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1139,6 +1142,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1348,6 +1352,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1392,6 +1397,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1526,6 +1532,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1647,6 +1654,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1684,6 +1692,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1789,6 +1798,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1924,6 +1934,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2448,6 +2459,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2592,6 +2604,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2863,6 +2876,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3127,9 +3141,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3166,6 +3182,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3682,6 +3699,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3923,8 +3941,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4534,6 +4555,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4875,6 +4897,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5189,6 +5212,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5807,6 +5831,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5876,6 +5901,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5896,6 +5922,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5966,6 +5993,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5982,6 +6010,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6099,6 +6128,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6146,6 +6176,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6286,6 +6317,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6582,6 +6614,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6720,6 +6753,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_16"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6791,6 +6825,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6853,6 +6888,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6989,6 +7025,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7120,6 +7157,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7165,6 +7203,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7314,6 +7353,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7408,6 +7448,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7456,6 +7497,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7569,6 +7611,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7756,6 +7799,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7815,6 +7859,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7845,6 +7890,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8122,6 +8168,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8171,6 +8218,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8239,6 +8287,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8285,6 +8334,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8423,6 +8473,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 6f486e10294..beb329bab16 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -600,6 +600,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -622,6 +623,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1009,6 +1011,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1134,6 +1137,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1341,6 +1345,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1384,6 +1389,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1514,6 +1520,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1634,6 +1641,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1671,6 +1679,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1758,6 +1767,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1772,6 +1782,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1906,6 +1917,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2133,6 +2145,7 @@ self: super: { "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-combinators" = doDistribute super."conduit-combinators_0_3_1"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2423,6 +2436,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2566,6 +2580,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2833,6 +2848,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3088,9 +3104,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3127,6 +3145,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3636,6 +3655,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3874,8 +3894,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4477,6 +4500,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4812,6 +4836,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5122,6 +5147,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5726,6 +5752,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5794,6 +5821,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5814,6 +5842,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5883,6 +5912,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5898,6 +5928,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6014,6 +6045,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6061,6 +6093,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6196,6 +6229,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6490,6 +6524,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6625,6 +6660,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_19"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6696,6 +6732,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6757,6 +6794,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6892,6 +6930,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7020,6 +7059,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7064,6 +7104,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7209,6 +7250,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7296,6 +7338,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -7343,6 +7386,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7453,6 +7497,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7640,6 +7685,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7697,6 +7743,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7727,6 +7774,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8004,6 +8052,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8053,6 +8102,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8119,6 +8169,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8129,6 +8180,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "waitra" = doDistribute super."waitra_0_0_3_0"; @@ -8164,6 +8216,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8299,6 +8352,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 407c6533760..962ee75a7bc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -600,6 +600,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -622,6 +623,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1009,6 +1011,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1134,6 +1137,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1341,6 +1345,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1384,6 +1389,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1514,6 +1520,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1634,6 +1641,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1671,6 +1679,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1758,6 +1767,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1772,6 +1782,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1906,6 +1917,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2133,6 +2145,7 @@ self: super: { "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-combinators" = doDistribute super."conduit-combinators_0_3_1"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2423,6 +2436,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2566,6 +2580,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2833,6 +2848,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3088,9 +3104,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3127,6 +3145,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3635,6 +3654,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3873,8 +3893,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4476,6 +4499,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4811,6 +4835,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5120,6 +5145,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5724,6 +5750,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5792,6 +5819,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5812,6 +5840,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5881,6 +5910,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5896,6 +5926,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6012,6 +6043,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6059,6 +6091,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6193,6 +6226,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6487,6 +6521,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6604,6 +6639,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; @@ -6621,6 +6657,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_19"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6692,6 +6729,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6753,6 +6791,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6888,6 +6927,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7016,6 +7056,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7060,6 +7101,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7205,6 +7247,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7292,6 +7335,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -7339,6 +7383,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7449,6 +7494,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7636,6 +7682,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7693,6 +7740,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7723,6 +7771,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7998,6 +8047,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8047,6 +8097,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8113,6 +8164,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8123,6 +8175,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "waitra" = doDistribute super."waitra_0_0_3_0"; @@ -8158,6 +8211,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8293,6 +8347,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 29afcdc0f17..800e96ff390 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -600,6 +600,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -622,6 +623,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1008,6 +1010,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1133,6 +1136,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1340,6 +1344,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1383,6 +1388,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1513,6 +1519,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1633,6 +1640,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1670,6 +1678,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1757,6 +1766,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1771,6 +1781,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1905,6 +1916,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2132,6 +2144,7 @@ self: super: { "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-combinators" = doDistribute super."conduit-combinators_0_3_1"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2422,6 +2435,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2565,6 +2579,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2832,6 +2847,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3087,9 +3103,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3126,6 +3144,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3634,6 +3653,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3872,8 +3892,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_2"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_4_0"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4474,6 +4497,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4808,6 +4832,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5117,6 +5142,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5720,6 +5746,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5788,6 +5815,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5808,6 +5836,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5877,6 +5906,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5892,6 +5922,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6008,6 +6039,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6055,6 +6087,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -6189,6 +6222,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6483,6 +6517,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6600,6 +6635,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_35_1"; @@ -6617,6 +6653,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_19"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6688,6 +6725,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6749,6 +6787,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6884,6 +6923,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7012,6 +7052,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7056,6 +7097,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7201,6 +7243,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7288,6 +7331,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -7335,6 +7379,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7445,6 +7490,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7632,6 +7678,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7689,6 +7736,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7719,6 +7767,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7994,6 +8043,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8043,6 +8093,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8109,6 +8160,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8119,6 +8171,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "waitra" = doDistribute super."waitra_0_0_3_0"; @@ -8154,6 +8207,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8289,6 +8343,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index b038a33d90c..732e6c33b7f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -602,6 +602,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -624,6 +625,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1012,6 +1014,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1139,6 +1142,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1348,6 +1352,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1392,6 +1397,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1526,6 +1532,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1647,6 +1654,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1684,6 +1692,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1789,6 +1798,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1924,6 +1934,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2448,6 +2459,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2592,6 +2604,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2863,6 +2876,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3126,9 +3140,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3165,6 +3181,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3681,6 +3698,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3922,8 +3940,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4533,6 +4554,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4873,6 +4895,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5187,6 +5210,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5805,6 +5829,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5874,6 +5899,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5894,6 +5920,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5964,6 +5991,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5980,6 +6008,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6097,6 +6126,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6144,6 +6174,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6284,6 +6315,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6580,6 +6612,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6718,6 +6751,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_16"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6789,6 +6823,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6851,6 +6886,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6987,6 +7023,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7117,6 +7154,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7162,6 +7200,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7311,6 +7350,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7405,6 +7445,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_11"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7453,6 +7494,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7566,6 +7608,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7753,6 +7796,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7812,6 +7856,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7842,6 +7887,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8119,6 +8165,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8168,6 +8215,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8236,6 +8284,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8282,6 +8331,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8420,6 +8470,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 8067758d331..d39ef0b551d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -602,6 +602,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -624,6 +625,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1012,6 +1014,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1139,6 +1142,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1348,6 +1352,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1392,6 +1397,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1526,6 +1532,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1646,6 +1653,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1683,6 +1691,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1788,6 +1797,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1923,6 +1933,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2447,6 +2458,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2591,6 +2603,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2862,6 +2875,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3125,9 +3139,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3164,6 +3180,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3680,6 +3697,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3921,8 +3939,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4532,6 +4553,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4872,6 +4894,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5186,6 +5209,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5803,6 +5827,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5872,6 +5897,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5892,6 +5918,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5962,6 +5989,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5977,6 +6005,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6093,6 +6122,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6140,6 +6170,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6280,6 +6311,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6576,6 +6608,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6713,6 +6746,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_16"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6784,6 +6818,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6846,6 +6881,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6982,6 +7018,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7112,6 +7149,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7157,6 +7195,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7306,6 +7345,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7400,6 +7440,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7448,6 +7489,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7561,6 +7603,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7748,6 +7791,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7807,6 +7851,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7837,6 +7882,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8114,6 +8160,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8163,6 +8210,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8231,6 +8279,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8277,6 +8326,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8415,6 +8465,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index dacae57c949..bc182e5e660 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -602,6 +602,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -624,6 +625,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1012,6 +1014,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1139,6 +1142,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1348,6 +1352,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1392,6 +1397,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1526,6 +1532,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1646,6 +1653,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1683,6 +1691,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1788,6 +1797,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1923,6 +1933,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2446,6 +2457,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2590,6 +2602,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2861,6 +2874,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3124,9 +3138,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3163,6 +3179,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3679,6 +3696,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3920,8 +3938,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4531,6 +4552,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4871,6 +4893,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5184,6 +5207,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5801,6 +5825,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5870,6 +5895,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5890,6 +5916,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5960,6 +5987,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5975,6 +6003,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6091,6 +6120,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6138,6 +6168,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6278,6 +6309,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6574,6 +6606,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6711,6 +6744,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_16"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6782,6 +6816,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6844,6 +6879,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6980,6 +7016,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7110,6 +7147,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7155,6 +7193,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7304,6 +7343,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7397,6 +7437,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7445,6 +7486,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7558,6 +7600,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7745,6 +7788,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7804,6 +7848,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7834,6 +7879,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8111,6 +8157,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8160,6 +8207,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8228,6 +8276,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8274,6 +8323,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8412,6 +8462,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index d1b359f7e40..c37a385b4a6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -602,6 +602,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -624,6 +625,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1012,6 +1014,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1137,6 +1140,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1346,6 +1350,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1390,6 +1395,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1523,6 +1529,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1643,6 +1650,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1680,6 +1688,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1785,6 +1794,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1920,6 +1930,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2443,6 +2454,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2587,6 +2599,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2858,6 +2871,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3121,9 +3135,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3160,6 +3176,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3674,6 +3691,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3915,8 +3933,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4526,6 +4547,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4866,6 +4888,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5179,6 +5202,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5795,6 +5819,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5864,6 +5889,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5884,6 +5910,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5954,6 +5981,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5969,6 +5997,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6085,6 +6114,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6132,6 +6162,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6272,6 +6303,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6568,6 +6600,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6705,6 +6738,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_18"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6776,6 +6810,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6838,6 +6873,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6974,6 +7010,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7104,6 +7141,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7149,6 +7187,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7298,6 +7337,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7391,6 +7431,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7439,6 +7480,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7552,6 +7594,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7739,6 +7782,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7796,6 +7840,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7826,6 +7871,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8103,6 +8149,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8152,6 +8199,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8220,6 +8268,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8266,6 +8315,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8404,6 +8454,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 386c514424a..761dd29669a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -623,6 +624,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1011,6 +1013,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1136,6 +1139,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1345,6 +1349,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1389,6 +1394,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1522,6 +1528,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1642,6 +1649,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1679,6 +1687,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1784,6 +1793,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1919,6 +1929,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2442,6 +2453,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2586,6 +2598,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2857,6 +2870,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3120,9 +3134,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3159,6 +3175,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3673,6 +3690,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3914,8 +3932,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4525,6 +4546,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4865,6 +4887,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5178,6 +5201,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5794,6 +5818,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5863,6 +5888,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5883,6 +5909,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5953,6 +5980,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5968,6 +5996,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6084,6 +6113,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6131,6 +6161,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6271,6 +6302,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6567,6 +6599,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6704,6 +6737,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_18"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6775,6 +6809,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6837,6 +6872,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6973,6 +7009,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7103,6 +7140,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7148,6 +7186,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7297,6 +7336,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7390,6 +7430,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7438,6 +7479,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7551,6 +7593,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7738,6 +7781,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7795,6 +7839,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7825,6 +7870,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8102,6 +8148,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8151,6 +8198,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8219,6 +8267,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8265,6 +8314,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8403,6 +8453,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index ddf1e714dbb..1745628da63 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -623,6 +624,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1010,6 +1012,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1135,6 +1138,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1344,6 +1348,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1388,6 +1393,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1521,6 +1527,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1641,6 +1648,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_5"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1678,6 +1686,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1783,6 +1792,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1918,6 +1928,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2441,6 +2452,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2585,6 +2597,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2856,6 +2869,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3118,9 +3132,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3157,6 +3173,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3671,6 +3688,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3912,8 +3930,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4522,6 +4543,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4861,6 +4883,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5174,6 +5197,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5790,6 +5814,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5859,6 +5884,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5879,6 +5905,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5949,6 +5976,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5964,6 +5992,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6080,6 +6109,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6127,6 +6157,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6267,6 +6298,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6563,6 +6595,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6700,6 +6733,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_18"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6771,6 +6805,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6832,6 +6867,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6968,6 +7004,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7098,6 +7135,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7143,6 +7181,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7291,6 +7330,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7382,6 +7422,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7430,6 +7471,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7543,6 +7585,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7730,6 +7773,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7787,6 +7831,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7817,6 +7862,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8094,6 +8140,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8143,6 +8190,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8211,6 +8259,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8257,6 +8306,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8395,6 +8445,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index a5cc8877cf6..cd600bcdea7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -601,6 +601,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -623,6 +624,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -1010,6 +1012,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1135,6 +1138,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1344,6 +1348,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1388,6 +1393,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1519,6 +1525,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1639,6 +1646,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = doDistribute super."biophd_0_0_7"; "biostockholm" = dontDistribute super."biostockholm"; "bird" = dontDistribute super."bird"; @@ -1676,6 +1684,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -1781,6 +1790,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1915,6 +1925,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2438,6 +2449,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2582,6 +2594,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2851,6 +2864,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -3113,9 +3127,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3152,6 +3168,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3665,6 +3682,7 @@ self: super: { "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-db" = dontDistribute super."hackage-db"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3906,8 +3924,11 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_7_3_1"; "hasql-backend" = doDistribute super."hasql-backend_0_4_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_1"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4514,6 +4535,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4853,6 +4875,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -5165,6 +5188,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5780,6 +5804,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5849,6 +5874,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5869,6 +5895,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5939,6 +5966,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5954,6 +5982,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6070,6 +6099,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6117,6 +6147,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_5"; @@ -6255,6 +6286,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6551,6 +6583,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_1"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6688,6 +6721,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_18"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6759,6 +6793,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6820,6 +6855,7 @@ self: super: { "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; "sbv" = doDistribute super."sbv_4_2"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6956,6 +6992,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7086,6 +7123,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7131,6 +7169,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -7279,6 +7318,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = dontDistribute super."stack"; @@ -7368,6 +7408,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "streams" = doDistribute super."streams_3_2"; "strict-base-types" = dontDistribute super."strict-base-types"; @@ -7416,6 +7457,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7527,6 +7569,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7714,6 +7757,7 @@ self: super: { "timeconsole" = dontDistribute super."timeconsole"; "timeit" = dontDistribute super."timeit"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7771,6 +7815,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7801,6 +7846,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -8078,6 +8124,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -8127,6 +8174,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -8195,6 +8243,7 @@ self: super: { "wai-routes" = dontDistribute super."wai-routes"; "wai-routing" = dontDistribute super."wai-routing"; "wai-session" = dontDistribute super."wai-session"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -8241,6 +8290,7 @@ self: super: { "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; "web-routing" = dontDistribute super."web-routing"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8378,6 +8428,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml-types" = doDistribute super."xml-types_0_3_4"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 15d31b6de23..906696b4b9f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -586,6 +586,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -608,6 +609,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -984,6 +986,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1108,6 +1111,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1301,6 +1305,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1343,6 +1348,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1466,6 +1472,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1583,6 +1590,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1696,6 +1704,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1708,6 +1717,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1839,6 +1849,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2059,6 +2070,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2342,6 +2354,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2476,6 +2489,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2734,6 +2748,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "errors" = doDistribute super."errors_2_0_0"; "ersatz" = dontDistribute super."ersatz"; @@ -2979,9 +2994,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3017,6 +3034,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3516,6 +3534,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3750,8 +3769,11 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4335,6 +4357,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4515,6 +4538,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4940,6 +4964,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5248,6 +5273,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5520,6 +5546,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5585,6 +5612,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5605,6 +5633,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5671,6 +5700,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5685,6 +5715,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5799,6 +5830,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5843,6 +5875,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -5970,6 +6003,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6046,6 +6080,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6258,6 +6293,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6377,6 +6413,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_5"; @@ -6393,6 +6430,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_19"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6464,6 +6502,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6523,6 +6562,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6648,6 +6688,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6774,6 +6815,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6816,6 +6858,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6962,6 +7005,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_3_0"; @@ -7041,6 +7085,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -7086,6 +7131,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7194,6 +7240,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7376,6 +7423,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7429,6 +7477,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7457,6 +7506,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7721,6 +7771,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7768,6 +7819,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7831,6 +7883,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7841,6 +7894,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "waitra" = doDistribute super."waitra_0_0_3_0"; @@ -7875,6 +7929,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -8007,6 +8062,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 0d985079e1a..77d7e97b3e5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -586,6 +586,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -608,6 +609,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -984,6 +986,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1108,6 +1111,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1300,6 +1304,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1342,6 +1347,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1464,6 +1470,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1581,6 +1588,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1694,6 +1702,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1706,6 +1715,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1837,6 +1847,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2057,6 +2068,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2340,6 +2352,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2474,6 +2487,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2732,6 +2746,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "errors" = doDistribute super."errors_2_0_0"; "ersatz" = dontDistribute super."ersatz"; @@ -2974,9 +2989,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3012,6 +3029,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3511,6 +3529,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3745,8 +3764,11 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4329,6 +4351,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4509,6 +4532,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4934,6 +4958,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5241,6 +5266,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5512,6 +5538,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5577,6 +5604,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5597,6 +5625,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5663,6 +5692,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5677,6 +5707,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5791,6 +5822,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5834,6 +5866,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -5961,6 +5994,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6037,6 +6071,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6249,6 +6284,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6367,6 +6403,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_5"; @@ -6383,6 +6420,7 @@ self: super: { "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_19"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6454,6 +6492,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6513,6 +6552,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6638,6 +6678,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6764,6 +6805,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6806,6 +6848,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6952,6 +6995,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_3_1"; @@ -7031,6 +7075,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -7076,6 +7121,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7184,6 +7230,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7366,6 +7413,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7419,6 +7467,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7447,6 +7496,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7711,6 +7761,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7757,6 +7808,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7820,6 +7872,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7830,6 +7883,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "waitra" = doDistribute super."waitra_0_0_3_0"; @@ -7864,6 +7918,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7996,6 +8051,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index 132915a05ca..d0f30d12556 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -579,6 +579,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -601,6 +602,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListTree" = dontDistribute super."ListTree"; "ListWriter" = dontDistribute super."ListWriter"; @@ -976,6 +978,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1099,6 +1102,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1287,6 +1291,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1326,6 +1331,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1447,6 +1453,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1562,6 +1569,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1673,6 +1681,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1685,6 +1694,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1811,6 +1821,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2029,6 +2040,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2307,6 +2319,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2396,6 +2409,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; @@ -2434,6 +2448,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2687,6 +2702,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -2917,9 +2933,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -2955,6 +2973,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3450,6 +3469,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3681,7 +3701,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4002,6 +4025,7 @@ self: super: { "hpodder" = dontDistribute super."hpodder"; "hpp" = dontDistribute super."hpp"; "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc" = doDistribute super."hprotoc_2_1_7"; "hprotoc-fork" = dontDistribute super."hprotoc-fork"; "hps" = dontDistribute super."hps"; "hps-cairo" = dontDistribute super."hps-cairo"; @@ -4257,6 +4281,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4432,6 +4457,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4849,6 +4875,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -4886,6 +4913,7 @@ self: super: { "lock-file" = dontDistribute super."lock-file"; "lockfree-queue" = dontDistribute super."lockfree-queue"; "log" = dontDistribute super."log"; + "log-domain" = doDistribute super."log-domain_0_10_3"; "log-effect" = dontDistribute super."log-effect"; "log2json" = dontDistribute super."log2json"; "logfloat" = dontDistribute super."logfloat"; @@ -5150,6 +5178,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5416,6 +5445,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5481,6 +5511,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5500,6 +5531,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5566,6 +5598,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5580,6 +5613,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5692,6 +5726,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5735,6 +5770,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -5858,6 +5894,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -5928,6 +5965,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -5951,6 +5989,8 @@ self: super: { "proteaaudio" = dontDistribute super."proteaaudio"; "protobuf" = dontDistribute super."protobuf"; "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers" = doDistribute super."protocol-buffers_2_1_7"; + "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; "proton-haskell" = dontDistribute super."proton-haskell"; @@ -6134,6 +6174,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6251,6 +6292,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; @@ -6266,6 +6308,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6337,6 +6380,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6396,6 +6440,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6513,6 +6558,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6556,6 +6602,7 @@ self: super: { "shell-pipe" = dontDistribute super."shell-pipe"; "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; + "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; @@ -6636,6 +6683,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6676,6 +6724,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6819,6 +6868,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_6_0"; @@ -6897,6 +6947,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -6941,6 +6992,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7047,6 +7099,7 @@ self: super: { "task" = dontDistribute super."task"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; @@ -7224,6 +7277,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7277,6 +7331,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7304,6 +7359,7 @@ self: super: { "triangulation" = dontDistribute super."triangulation"; "tries" = dontDistribute super."tries"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7565,6 +7621,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7610,6 +7667,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7629,6 +7687,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_1"; "wai-cors" = doDistribute super."wai-cors_0_2_3"; @@ -7668,6 +7727,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7678,6 +7738,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; @@ -7711,6 +7772,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7835,6 +7897,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7879,6 +7944,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_1"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -7903,19 +7969,23 @@ self: super: { "yes-precure5-command" = dontDistribute super."yes-precure5-command"; "yesod-angular" = dontDistribute super."yesod-angular"; "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth" = doDistribute super."yesod-auth_1_4_8"; "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index 59fe8b9bac8..98e84ca9f10 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -579,6 +579,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -601,6 +602,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListTree" = dontDistribute super."ListTree"; "ListWriter" = dontDistribute super."ListWriter"; @@ -976,6 +978,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1099,6 +1102,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1276,6 +1280,7 @@ self: super: { "apply-refact" = dontDistribute super."apply-refact"; "apportionment" = dontDistribute super."apportionment"; "approx-rand-test" = dontDistribute super."approx-rand-test"; + "approximate" = doDistribute super."approximate_0_2_2_2"; "approximate-equality" = dontDistribute super."approximate-equality"; "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; @@ -1286,6 +1291,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1325,6 +1331,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1446,6 +1453,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1560,6 +1568,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1671,6 +1680,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1682,6 +1692,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1808,6 +1819,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2020,11 +2032,13 @@ self: super: { "conductive-clock" = dontDistribute super."conductive-clock"; "conductive-hsc3" = dontDistribute super."conductive-hsc3"; "conductive-song" = dontDistribute super."conductive-song"; + "conduit" = doDistribute super."conduit_1_2_5_1"; "conduit-audio" = dontDistribute super."conduit-audio"; "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2303,6 +2317,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2392,6 +2407,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; @@ -2430,6 +2446,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2683,6 +2700,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -2912,9 +2930,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -2950,6 +2970,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3444,6 +3465,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3674,7 +3696,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -3995,6 +4020,7 @@ self: super: { "hpodder" = dontDistribute super."hpodder"; "hpp" = dontDistribute super."hpp"; "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc" = doDistribute super."hprotoc_2_1_7"; "hprotoc-fork" = dontDistribute super."hprotoc-fork"; "hps" = dontDistribute super."hps"; "hps-cairo" = dontDistribute super."hps-cairo"; @@ -4249,6 +4275,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4424,6 +4451,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4841,6 +4869,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -4878,6 +4907,7 @@ self: super: { "lock-file" = dontDistribute super."lock-file"; "lockfree-queue" = dontDistribute super."lockfree-queue"; "log" = dontDistribute super."log"; + "log-domain" = doDistribute super."log-domain_0_10_3"; "log-effect" = dontDistribute super."log-effect"; "log2json" = dontDistribute super."log2json"; "logfloat" = dontDistribute super."logfloat"; @@ -5142,6 +5172,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5408,6 +5439,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5473,6 +5505,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5492,6 +5525,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5558,6 +5592,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5572,6 +5607,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5684,6 +5720,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; "persistent-odbc" = dontDistribute super."persistent-odbc"; @@ -5725,6 +5762,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -5848,6 +5886,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -5918,6 +5957,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -5941,6 +5981,8 @@ self: super: { "proteaaudio" = dontDistribute super."proteaaudio"; "protobuf" = dontDistribute super."protobuf"; "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers" = doDistribute super."protocol-buffers_2_1_7"; + "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; "proton-haskell" = dontDistribute super."proton-haskell"; @@ -6124,6 +6166,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6241,6 +6284,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; @@ -6256,6 +6300,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6327,6 +6372,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6385,6 +6431,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6502,6 +6549,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6544,6 +6592,7 @@ self: super: { "shell-pipe" = dontDistribute super."shell-pipe"; "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; + "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; @@ -6624,6 +6673,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6664,6 +6714,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6807,6 +6858,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_6_0"; @@ -6885,6 +6937,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -6929,6 +6982,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7034,6 +7088,7 @@ self: super: { "task" = dontDistribute super."task"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; @@ -7211,6 +7266,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7264,6 +7320,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7291,6 +7348,7 @@ self: super: { "triangulation" = dontDistribute super."triangulation"; "tries" = dontDistribute super."tries"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7552,6 +7610,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7597,6 +7656,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7616,6 +7676,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_1"; "wai-cors" = doDistribute super."wai-cors_0_2_3"; @@ -7655,6 +7716,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7665,6 +7727,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; @@ -7698,6 +7761,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7822,6 +7886,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7866,6 +7933,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_1"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -7890,25 +7958,30 @@ self: super: { "yes-precure5-command" = dontDistribute super."yes-precure5-command"; "yesod-angular" = dontDistribute super."yesod-angular"; "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth" = doDistribute super."yesod-auth_1_4_8"; "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; "yesod-datatables" = dontDistribute super."yesod-datatables"; "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index 9d134f77663..154bd227acc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -559,6 +559,7 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_2"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct"; @@ -577,6 +578,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -599,6 +601,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListTree" = dontDistribute super."ListTree"; "ListWriter" = dontDistribute super."ListWriter"; @@ -974,6 +977,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1097,6 +1101,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1274,6 +1279,7 @@ self: super: { "apply-refact" = dontDistribute super."apply-refact"; "apportionment" = dontDistribute super."apportionment"; "approx-rand-test" = dontDistribute super."approx-rand-test"; + "approximate" = doDistribute super."approximate_0_2_2_2"; "approximate-equality" = dontDistribute super."approximate-equality"; "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; @@ -1284,6 +1290,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1323,6 +1330,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1444,6 +1452,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1558,6 +1567,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1669,6 +1679,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1680,6 +1691,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1806,6 +1818,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2014,11 +2027,13 @@ self: super: { "conductive-clock" = dontDistribute super."conductive-clock"; "conductive-hsc3" = dontDistribute super."conductive-hsc3"; "conductive-song" = dontDistribute super."conductive-song"; + "conduit" = doDistribute super."conduit_1_2_5_1"; "conduit-audio" = dontDistribute super."conduit-audio"; "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2297,6 +2312,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2386,6 +2402,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; @@ -2424,6 +2441,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2677,6 +2695,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -2906,9 +2925,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -2944,6 +2965,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3437,6 +3459,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3667,7 +3690,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -3987,6 +4013,7 @@ self: super: { "hpodder" = dontDistribute super."hpodder"; "hpp" = dontDistribute super."hpp"; "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc" = doDistribute super."hprotoc_2_1_7"; "hprotoc-fork" = dontDistribute super."hprotoc-fork"; "hps" = dontDistribute super."hps"; "hps-cairo" = dontDistribute super."hps-cairo"; @@ -4241,6 +4268,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4416,6 +4444,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4833,6 +4862,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -4870,6 +4900,7 @@ self: super: { "lock-file" = dontDistribute super."lock-file"; "lockfree-queue" = dontDistribute super."lockfree-queue"; "log" = dontDistribute super."log"; + "log-domain" = doDistribute super."log-domain_0_10_3"; "log-effect" = dontDistribute super."log-effect"; "log2json" = dontDistribute super."log2json"; "logfloat" = dontDistribute super."logfloat"; @@ -5133,6 +5164,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5399,6 +5431,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5464,6 +5497,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5483,6 +5517,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5549,6 +5584,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5563,6 +5599,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5674,6 +5711,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; "persistent-odbc" = dontDistribute super."persistent-odbc"; @@ -5715,6 +5753,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -5838,6 +5877,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -5908,6 +5948,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -5931,6 +5972,8 @@ self: super: { "proteaaudio" = dontDistribute super."proteaaudio"; "protobuf" = dontDistribute super."protobuf"; "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers" = doDistribute super."protocol-buffers_2_1_7"; + "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; "proton-haskell" = dontDistribute super."proton-haskell"; @@ -6114,6 +6157,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6231,6 +6275,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; @@ -6246,6 +6291,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6317,6 +6363,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6375,6 +6422,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6492,6 +6540,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6534,6 +6583,7 @@ self: super: { "shell-pipe" = dontDistribute super."shell-pipe"; "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; + "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; @@ -6614,6 +6664,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6654,6 +6705,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6797,6 +6849,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_6_0"; @@ -6875,6 +6928,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -6919,6 +6973,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7023,6 +7078,7 @@ self: super: { "task" = dontDistribute super."task"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; @@ -7198,6 +7254,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7251,6 +7308,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7278,6 +7336,7 @@ self: super: { "triangulation" = dontDistribute super."triangulation"; "tries" = dontDistribute super."tries"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7474,6 +7533,7 @@ self: super: { "ureader" = dontDistribute super."ureader"; "urembed" = dontDistribute super."urembed"; "uri" = dontDistribute super."uri"; + "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_1"; "uri-conduit" = dontDistribute super."uri-conduit"; "uri-enumerator" = dontDistribute super."uri-enumerator"; "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; @@ -7538,6 +7598,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7583,6 +7644,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7602,6 +7664,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_1"; "wai-cors" = doDistribute super."wai-cors_0_2_3"; @@ -7641,6 +7704,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7651,6 +7715,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; @@ -7684,6 +7749,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7808,6 +7874,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7852,6 +7921,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_1"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -7876,25 +7946,30 @@ self: super: { "yes-precure5-command" = dontDistribute super."yes-precure5-command"; "yesod-angular" = dontDistribute super."yesod-angular"; "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth" = doDistribute super."yesod-auth_1_4_8"; "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; "yesod-datatables" = dontDistribute super."yesod-datatables"; "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index 9376f15df7c..2e000577048 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -559,6 +559,7 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_2"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct"; @@ -577,6 +578,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -599,6 +601,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListTree" = dontDistribute super."ListTree"; "ListWriter" = dontDistribute super."ListWriter"; @@ -974,6 +977,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1097,6 +1101,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1274,6 +1279,7 @@ self: super: { "apply-refact" = dontDistribute super."apply-refact"; "apportionment" = dontDistribute super."apportionment"; "approx-rand-test" = dontDistribute super."approx-rand-test"; + "approximate" = doDistribute super."approximate_0_2_2_2"; "approximate-equality" = dontDistribute super."approximate-equality"; "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; @@ -1284,6 +1290,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1323,6 +1330,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1444,6 +1452,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1558,6 +1567,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1669,6 +1679,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1680,6 +1691,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1806,6 +1818,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2014,11 +2027,13 @@ self: super: { "conductive-clock" = dontDistribute super."conductive-clock"; "conductive-hsc3" = dontDistribute super."conductive-hsc3"; "conductive-song" = dontDistribute super."conductive-song"; + "conduit" = doDistribute super."conduit_1_2_5_1"; "conduit-audio" = dontDistribute super."conduit-audio"; "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2297,6 +2312,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2386,6 +2402,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; @@ -2424,6 +2441,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2677,6 +2695,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -2906,9 +2925,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -2944,6 +2965,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3437,6 +3459,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3667,7 +3690,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -3986,6 +4012,7 @@ self: super: { "hpodder" = dontDistribute super."hpodder"; "hpp" = dontDistribute super."hpp"; "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc" = doDistribute super."hprotoc_2_1_7"; "hprotoc-fork" = dontDistribute super."hprotoc-fork"; "hps" = dontDistribute super."hps"; "hps-cairo" = dontDistribute super."hps-cairo"; @@ -4240,6 +4267,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4415,6 +4443,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4831,6 +4860,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -4868,6 +4898,7 @@ self: super: { "lock-file" = dontDistribute super."lock-file"; "lockfree-queue" = dontDistribute super."lockfree-queue"; "log" = dontDistribute super."log"; + "log-domain" = doDistribute super."log-domain_0_10_3"; "log-effect" = dontDistribute super."log-effect"; "log2json" = dontDistribute super."log2json"; "logfloat" = dontDistribute super."logfloat"; @@ -5131,6 +5162,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5396,6 +5428,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5461,6 +5494,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5480,6 +5514,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5546,6 +5581,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5560,6 +5596,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5670,6 +5707,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; "persistent-odbc" = dontDistribute super."persistent-odbc"; @@ -5711,6 +5749,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -5834,6 +5873,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -5904,6 +5944,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -5927,6 +5968,8 @@ self: super: { "proteaaudio" = dontDistribute super."proteaaudio"; "protobuf" = dontDistribute super."protobuf"; "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers" = doDistribute super."protocol-buffers_2_1_7"; + "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; "proton-haskell" = dontDistribute super."proton-haskell"; @@ -6110,6 +6153,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6227,6 +6271,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; @@ -6242,6 +6287,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6313,6 +6359,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6371,6 +6418,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6488,6 +6536,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6530,6 +6579,7 @@ self: super: { "shell-pipe" = dontDistribute super."shell-pipe"; "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; + "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; @@ -6610,6 +6660,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6650,6 +6701,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6793,6 +6845,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_6_0"; @@ -6871,6 +6924,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -6915,6 +6969,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7018,6 +7073,7 @@ self: super: { "task" = dontDistribute super."task"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; @@ -7193,6 +7249,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7246,6 +7303,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7273,6 +7331,7 @@ self: super: { "triangulation" = dontDistribute super."triangulation"; "tries" = dontDistribute super."tries"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7469,6 +7528,7 @@ self: super: { "ureader" = dontDistribute super."ureader"; "urembed" = dontDistribute super."urembed"; "uri" = dontDistribute super."uri"; + "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_1"; "uri-conduit" = dontDistribute super."uri-conduit"; "uri-enumerator" = dontDistribute super."uri-enumerator"; "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; @@ -7533,6 +7593,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7578,6 +7639,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7597,6 +7659,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_1"; "wai-devel" = dontDistribute super."wai-devel"; @@ -7635,6 +7698,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7645,6 +7709,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; @@ -7678,6 +7743,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7802,6 +7868,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7846,6 +7915,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_1"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -7870,25 +7940,30 @@ self: super: { "yes-precure5-command" = dontDistribute super."yes-precure5-command"; "yesod-angular" = dontDistribute super."yesod-angular"; "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth" = doDistribute super."yesod-auth_1_4_8"; "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; "yesod-datatables" = dontDistribute super."yesod-datatables"; "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index 595b86f3693..15706031f7a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -559,6 +559,7 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_2"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct"; @@ -577,6 +578,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -599,6 +601,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListTree" = dontDistribute super."ListTree"; "ListWriter" = dontDistribute super."ListWriter"; @@ -974,6 +977,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1094,6 +1098,7 @@ self: super: { "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1271,6 +1276,7 @@ self: super: { "apply-refact" = dontDistribute super."apply-refact"; "apportionment" = dontDistribute super."apportionment"; "approx-rand-test" = dontDistribute super."approx-rand-test"; + "approximate" = doDistribute super."approximate_0_2_2_2"; "approximate-equality" = dontDistribute super."approximate-equality"; "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; @@ -1281,6 +1287,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1320,6 +1327,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1441,6 +1449,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1555,6 +1564,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1665,6 +1675,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1676,6 +1687,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1802,6 +1814,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2010,11 +2023,13 @@ self: super: { "conductive-clock" = dontDistribute super."conductive-clock"; "conductive-hsc3" = dontDistribute super."conductive-hsc3"; "conductive-song" = dontDistribute super."conductive-song"; + "conduit" = doDistribute super."conduit_1_2_5_1"; "conduit-audio" = dontDistribute super."conduit-audio"; "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2292,6 +2307,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2381,6 +2397,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; @@ -2415,6 +2432,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2667,6 +2685,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -2896,9 +2915,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -2934,6 +2955,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3427,6 +3449,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3656,7 +3679,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -3975,6 +4001,7 @@ self: super: { "hpodder" = dontDistribute super."hpodder"; "hpp" = dontDistribute super."hpp"; "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc" = doDistribute super."hprotoc_2_1_7"; "hprotoc-fork" = dontDistribute super."hprotoc-fork"; "hps" = dontDistribute super."hps"; "hps-cairo" = dontDistribute super."hps-cairo"; @@ -4228,6 +4255,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4403,6 +4431,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4819,6 +4848,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -4856,6 +4886,7 @@ self: super: { "lock-file" = dontDistribute super."lock-file"; "lockfree-queue" = dontDistribute super."lockfree-queue"; "log" = dontDistribute super."log"; + "log-domain" = doDistribute super."log-domain_0_10_3"; "log-effect" = dontDistribute super."log-effect"; "log2json" = dontDistribute super."log2json"; "logfloat" = dontDistribute super."logfloat"; @@ -5118,6 +5149,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5382,6 +5414,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5447,6 +5480,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5466,6 +5500,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5532,6 +5567,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5546,6 +5582,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5651,13 +5688,16 @@ self: super: { "persist2er" = dontDistribute super."persist2er"; "persistable-record" = dontDistribute super."persistable-record"; "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg"; + "persistent" = doDistribute super."persistent_2_2_2_1"; "persistent-cereal" = dontDistribute super."persistent-cereal"; "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_1"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; @@ -5695,6 +5735,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; @@ -5817,6 +5858,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -5887,6 +5929,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -5910,6 +5953,8 @@ self: super: { "proteaaudio" = dontDistribute super."proteaaudio"; "protobuf" = dontDistribute super."protobuf"; "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers" = doDistribute super."protocol-buffers_2_1_7"; + "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; "proton-haskell" = dontDistribute super."proton-haskell"; @@ -6093,6 +6138,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6210,6 +6256,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; @@ -6225,6 +6272,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6296,6 +6344,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6354,6 +6403,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6471,6 +6521,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6513,6 +6564,7 @@ self: super: { "shell-pipe" = dontDistribute super."shell-pipe"; "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; + "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; @@ -6593,6 +6645,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6633,6 +6686,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6776,6 +6830,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_6_0"; @@ -6854,6 +6909,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -6898,6 +6954,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7001,6 +7058,7 @@ self: super: { "task" = dontDistribute super."task"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; @@ -7175,6 +7233,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7228,6 +7287,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7255,6 +7315,7 @@ self: super: { "triangulation" = dontDistribute super."triangulation"; "tries" = dontDistribute super."tries"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7450,6 +7511,7 @@ self: super: { "ureader" = dontDistribute super."ureader"; "urembed" = dontDistribute super."urembed"; "uri" = dontDistribute super."uri"; + "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_1"; "uri-conduit" = dontDistribute super."uri-conduit"; "uri-enumerator" = dontDistribute super."uri-enumerator"; "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; @@ -7514,6 +7576,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7559,6 +7622,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7578,6 +7642,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_2"; "wai-devel" = dontDistribute super."wai-devel"; @@ -7615,6 +7680,7 @@ self: super: { "wai-responsible" = dontDistribute super."wai-responsible"; "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7625,6 +7691,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; @@ -7658,6 +7725,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7781,6 +7849,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7825,6 +7896,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_1"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -7849,25 +7921,30 @@ self: super: { "yes-precure5-command" = dontDistribute super."yes-precure5-command"; "yesod-angular" = dontDistribute super."yesod-angular"; "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth" = doDistribute super."yesod-auth_1_4_8"; "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; "yesod-datatables" = dontDistribute super."yesod-datatables"; "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index 8fd54e6be80..a7dfcdb3f68 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -559,6 +559,7 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_2"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct"; @@ -577,6 +578,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -599,6 +601,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListTree" = dontDistribute super."ListTree"; "ListWriter" = dontDistribute super."ListWriter"; @@ -973,6 +976,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1093,6 +1097,7 @@ self: super: { "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1270,6 +1275,7 @@ self: super: { "apply-refact" = dontDistribute super."apply-refact"; "apportionment" = dontDistribute super."apportionment"; "approx-rand-test" = dontDistribute super."approx-rand-test"; + "approximate" = doDistribute super."approximate_0_2_2_2"; "approximate-equality" = dontDistribute super."approximate-equality"; "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; @@ -1280,6 +1286,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1319,6 +1326,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1440,6 +1448,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1554,6 +1563,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1664,6 +1674,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1675,6 +1686,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1801,6 +1813,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2009,11 +2022,13 @@ self: super: { "conductive-clock" = dontDistribute super."conductive-clock"; "conductive-hsc3" = dontDistribute super."conductive-hsc3"; "conductive-song" = dontDistribute super."conductive-song"; + "conduit" = doDistribute super."conduit_1_2_5_1"; "conduit-audio" = dontDistribute super."conduit-audio"; "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2291,6 +2306,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2380,6 +2396,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; @@ -2414,6 +2431,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2666,6 +2684,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -2895,9 +2914,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -2933,6 +2954,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3425,6 +3447,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3653,7 +3676,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -3971,6 +3997,7 @@ self: super: { "hpodder" = dontDistribute super."hpodder"; "hpp" = dontDistribute super."hpp"; "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc" = doDistribute super."hprotoc_2_1_7"; "hprotoc-fork" = dontDistribute super."hprotoc-fork"; "hps" = dontDistribute super."hps"; "hps-cairo" = dontDistribute super."hps-cairo"; @@ -4223,6 +4250,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4337,6 +4365,7 @@ self: super: { "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; "incremental-computing" = dontDistribute super."incremental-computing"; + "incremental-parser" = doDistribute super."incremental-parser_0_2_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; "indentation" = dontDistribute super."indentation"; @@ -4397,6 +4426,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4813,6 +4843,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -4850,6 +4881,7 @@ self: super: { "lock-file" = dontDistribute super."lock-file"; "lockfree-queue" = dontDistribute super."lockfree-queue"; "log" = dontDistribute super."log"; + "log-domain" = doDistribute super."log-domain_0_10_3"; "log-effect" = dontDistribute super."log-effect"; "log2json" = dontDistribute super."log2json"; "logfloat" = dontDistribute super."logfloat"; @@ -5112,6 +5144,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5376,6 +5409,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5441,6 +5475,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5460,6 +5495,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5526,6 +5562,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5539,6 +5576,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5644,13 +5682,16 @@ self: super: { "persist2er" = dontDistribute super."persist2er"; "persistable-record" = dontDistribute super."persistable-record"; "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg"; + "persistent" = doDistribute super."persistent_2_2_2_1"; "persistent-cereal" = dontDistribute super."persistent-cereal"; "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_1"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; @@ -5688,6 +5729,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; @@ -5810,6 +5852,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -5880,6 +5923,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -5903,6 +5947,8 @@ self: super: { "proteaaudio" = dontDistribute super."proteaaudio"; "protobuf" = dontDistribute super."protobuf"; "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers" = doDistribute super."protocol-buffers_2_1_7"; + "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; "proton-haskell" = dontDistribute super."proton-haskell"; @@ -6085,6 +6131,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6202,6 +6249,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; @@ -6217,6 +6265,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6288,6 +6337,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6346,6 +6396,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6462,6 +6513,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6504,6 +6556,7 @@ self: super: { "shell-pipe" = dontDistribute super."shell-pipe"; "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; + "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; @@ -6584,6 +6637,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6624,6 +6678,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6767,8 +6822,10 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_0_1_8_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run-auto" = dontDistribute super."stack-run-auto"; @@ -6844,6 +6901,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -6888,6 +6946,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -6991,6 +7050,7 @@ self: super: { "task" = dontDistribute super."task"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; @@ -7164,6 +7224,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7217,6 +7278,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7244,6 +7306,7 @@ self: super: { "triangulation" = dontDistribute super."triangulation"; "tries" = dontDistribute super."tries"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7439,6 +7502,7 @@ self: super: { "ureader" = dontDistribute super."ureader"; "urembed" = dontDistribute super."urembed"; "uri" = dontDistribute super."uri"; + "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_1"; "uri-conduit" = dontDistribute super."uri-conduit"; "uri-enumerator" = dontDistribute super."uri-enumerator"; "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; @@ -7503,6 +7567,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7548,6 +7613,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7567,6 +7633,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-devel" = dontDistribute super."wai-devel"; "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; @@ -7602,6 +7669,7 @@ self: super: { "wai-responsible" = dontDistribute super."wai-responsible"; "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7612,6 +7680,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; @@ -7645,6 +7714,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7768,6 +7838,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7812,6 +7885,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_1"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -7836,25 +7910,30 @@ self: super: { "yes-precure5-command" = dontDistribute super."yes-precure5-command"; "yesod-angular" = dontDistribute super."yesod-angular"; "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth" = doDistribute super."yesod-auth_1_4_8"; "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; "yesod-datatables" = dontDistribute super."yesod-datatables"; "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index 518e6f71ef2..ad66fe7f027 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -459,6 +459,7 @@ self: super: { "HSoundFile" = dontDistribute super."HSoundFile"; "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; "HSvm" = dontDistribute super."HSvm"; + "HTTP" = doDistribute super."HTTP_4000_2_21"; "HTTP-Simple" = dontDistribute super."HTTP-Simple"; "HTab" = dontDistribute super."HTab"; "HTicTacToe" = dontDistribute super."HTicTacToe"; @@ -558,6 +559,7 @@ self: super: { "Javav" = dontDistribute super."Javav"; "JsContracts" = dontDistribute super."JsContracts"; "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_2"; "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct"; @@ -576,6 +578,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -598,6 +601,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListTree" = dontDistribute super."ListTree"; "ListWriter" = dontDistribute super."ListWriter"; @@ -971,6 +975,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1091,6 +1096,7 @@ self: super: { "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1125,6 +1131,7 @@ self: super: { "ajhc" = dontDistribute super."ajhc"; "al" = dontDistribute super."al"; "alea" = dontDistribute super."alea"; + "alex" = doDistribute super."alex_3_1_5"; "alex-meta" = dontDistribute super."alex-meta"; "alfred" = dontDistribute super."alfred"; "alga" = dontDistribute super."alga"; @@ -1267,6 +1274,7 @@ self: super: { "apply-refact" = dontDistribute super."apply-refact"; "apportionment" = dontDistribute super."apportionment"; "approx-rand-test" = dontDistribute super."approx-rand-test"; + "approximate" = doDistribute super."approximate_0_2_2_2"; "approximate-equality" = dontDistribute super."approximate-equality"; "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; @@ -1277,6 +1285,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1316,6 +1325,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1436,6 +1446,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1550,6 +1561,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1660,6 +1672,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1671,6 +1684,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1797,6 +1811,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2005,11 +2020,13 @@ self: super: { "conductive-clock" = dontDistribute super."conductive-clock"; "conductive-hsc3" = dontDistribute super."conductive-hsc3"; "conductive-song" = dontDistribute super."conductive-song"; + "conduit" = doDistribute super."conduit_1_2_5_1"; "conduit-audio" = dontDistribute super."conduit-audio"; "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2287,6 +2304,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2376,6 +2394,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; @@ -2410,6 +2429,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2662,6 +2682,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -2890,9 +2911,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -2928,6 +2951,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3419,6 +3443,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3647,7 +3672,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -3965,6 +3993,7 @@ self: super: { "hpodder" = dontDistribute super."hpodder"; "hpp" = dontDistribute super."hpp"; "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc" = doDistribute super."hprotoc_2_1_7"; "hprotoc-fork" = dontDistribute super."hprotoc-fork"; "hps" = dontDistribute super."hps"; "hps-cairo" = dontDistribute super."hps-cairo"; @@ -4217,6 +4246,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4331,6 +4361,7 @@ self: super: { "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; "incremental-computing" = dontDistribute super."incremental-computing"; + "incremental-parser" = doDistribute super."incremental-parser_0_2_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; "indentation" = dontDistribute super."indentation"; @@ -4391,6 +4422,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4805,6 +4837,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -4842,6 +4875,7 @@ self: super: { "lock-file" = dontDistribute super."lock-file"; "lockfree-queue" = dontDistribute super."lockfree-queue"; "log" = dontDistribute super."log"; + "log-domain" = doDistribute super."log-domain_0_10_3"; "log-effect" = dontDistribute super."log-effect"; "log2json" = dontDistribute super."log2json"; "logfloat" = dontDistribute super."logfloat"; @@ -5103,6 +5137,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5367,6 +5402,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5432,6 +5468,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5451,6 +5488,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5517,6 +5555,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5530,6 +5569,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5634,13 +5674,16 @@ self: super: { "persist2er" = dontDistribute super."persist2er"; "persistable-record" = dontDistribute super."persistable-record"; "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg"; + "persistent" = doDistribute super."persistent_2_2_2_1"; "persistent-cereal" = dontDistribute super."persistent-cereal"; "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_1"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; @@ -5678,6 +5721,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; @@ -5799,6 +5843,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -5869,6 +5914,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -5892,6 +5938,8 @@ self: super: { "proteaaudio" = dontDistribute super."proteaaudio"; "protobuf" = dontDistribute super."protobuf"; "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers" = doDistribute super."protocol-buffers_2_1_7"; + "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; "proton-haskell" = dontDistribute super."proton-haskell"; @@ -6074,6 +6122,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6190,6 +6239,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; "rest-example" = dontDistribute super."rest-example"; @@ -6204,6 +6254,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6275,6 +6326,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6333,6 +6385,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6448,6 +6501,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6490,6 +6544,7 @@ self: super: { "shell-pipe" = dontDistribute super."shell-pipe"; "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; + "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; @@ -6570,6 +6625,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6610,6 +6666,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6753,8 +6810,10 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_0_1_8_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run-auto" = dontDistribute super."stack-run-auto"; @@ -6829,6 +6888,7 @@ self: super: { "streaming-bytestring" = dontDistribute super."streaming-bytestring"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -6873,6 +6933,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -6976,6 +7037,7 @@ self: super: { "task" = dontDistribute super."task"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-html" = dontDistribute super."tasty-html"; @@ -7146,6 +7208,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7199,6 +7262,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7226,6 +7290,7 @@ self: super: { "triangulation" = dontDistribute super."triangulation"; "tries" = dontDistribute super."tries"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7421,6 +7486,7 @@ self: super: { "ureader" = dontDistribute super."ureader"; "urembed" = dontDistribute super."urembed"; "uri" = dontDistribute super."uri"; + "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_1"; "uri-conduit" = dontDistribute super."uri-conduit"; "uri-enumerator" = dontDistribute super."uri-enumerator"; "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; @@ -7485,6 +7551,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7530,6 +7597,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7549,6 +7617,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-devel" = dontDistribute super."wai-devel"; "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; @@ -7584,6 +7653,7 @@ self: super: { "wai-responsible" = dontDistribute super."wai-responsible"; "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7594,6 +7664,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; @@ -7627,6 +7698,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7749,6 +7821,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7793,6 +7868,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_1"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -7817,25 +7893,30 @@ self: super: { "yes-precure5-command" = dontDistribute super."yes-precure5-command"; "yesod-angular" = dontDistribute super."yesod-angular"; "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth" = doDistribute super."yesod-auth_1_4_8"; "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; "yesod-datatables" = dontDistribute super."yesod-datatables"; "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix new file mode 100644 index 00000000000..261627066da --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix @@ -0,0 +1,7991 @@ +{ pkgs }: + +with import ./lib.nix { inherit pkgs; }; + +self: super: { + + # core libraries provided by the compiler + Cabal = null; + array = null; + base = null; + bin-package-db = null; + binary = null; + bytestring = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-prim = null; + hoopl = null; + hpc = null; + integer-gmp = null; + pretty = null; + process = null; + rts = null; + template-haskell = null; + time = null; + transformers = null; + unix = null; + + # lts-3.17 packages + "3d-graphics-examples" = dontDistribute super."3d-graphics-examples"; + "3dmodels" = dontDistribute super."3dmodels"; + "4Blocks" = dontDistribute super."4Blocks"; + "AAI" = dontDistribute super."AAI"; + "ABList" = dontDistribute super."ABList"; + "AC-Angle" = dontDistribute super."AC-Angle"; + "AC-Boolean" = dontDistribute super."AC-Boolean"; + "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform"; + "AC-Colour" = dontDistribute super."AC-Colour"; + "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK"; + "AC-HalfInteger" = dontDistribute super."AC-HalfInteger"; + "AC-MiniTest" = dontDistribute super."AC-MiniTest"; + "AC-PPM" = dontDistribute super."AC-PPM"; + "AC-Random" = dontDistribute super."AC-Random"; + "AC-Terminal" = dontDistribute super."AC-Terminal"; + "AC-VanillaArray" = dontDistribute super."AC-VanillaArray"; + "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy"; + "ACME" = dontDistribute super."ACME"; + "ADPfusion" = dontDistribute super."ADPfusion"; + "AERN-Basics" = dontDistribute super."AERN-Basics"; + "AERN-Net" = dontDistribute super."AERN-Net"; + "AERN-Real" = dontDistribute super."AERN-Real"; + "AERN-Real-Double" = dontDistribute super."AERN-Real-Double"; + "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval"; + "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; + "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; + "AES" = dontDistribute super."AES"; + "AGI" = dontDistribute super."AGI"; + "ALUT" = dontDistribute super."ALUT"; + "AMI" = dontDistribute super."AMI"; + "ANum" = dontDistribute super."ANum"; + "ASN1" = dontDistribute super."ASN1"; + "AVar" = dontDistribute super."AVar"; + "AWin32Console" = dontDistribute super."AWin32Console"; + "AbortT-monadstf" = dontDistribute super."AbortT-monadstf"; + "AbortT-mtl" = dontDistribute super."AbortT-mtl"; + "AbortT-transformers" = dontDistribute super."AbortT-transformers"; + "ActionKid" = dontDistribute super."ActionKid"; + "Adaptive" = dontDistribute super."Adaptive"; + "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade"; + "Advgame" = dontDistribute super."Advgame"; + "AesonBson" = dontDistribute super."AesonBson"; + "Agata" = dontDistribute super."Agata"; + "Agda-executable" = dontDistribute super."Agda-executable"; + "AhoCorasick" = dontDistribute super."AhoCorasick"; + "AlgorithmW" = dontDistribute super."AlgorithmW"; + "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms"; + "Allure" = dontDistribute super."Allure"; + "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter"; + "Animas" = dontDistribute super."Animas"; + "Annotations" = dontDistribute super."Annotations"; + "Ansi2Html" = dontDistribute super."Ansi2Html"; + "ApplePush" = dontDistribute super."ApplePush"; + "AppleScript" = dontDistribute super."AppleScript"; + "ApproxFun-hs" = dontDistribute super."ApproxFun-hs"; + "ArrayRef" = dontDistribute super."ArrayRef"; + "ArrowVHDL" = dontDistribute super."ArrowVHDL"; + "AspectAG" = dontDistribute super."AspectAG"; + "AttoBencode" = dontDistribute super."AttoBencode"; + "AttoJson" = dontDistribute super."AttoJson"; + "Attrac" = dontDistribute super."Attrac"; + "Aurochs" = dontDistribute super."Aurochs"; + "AutoForms" = dontDistribute super."AutoForms"; + "AvlTree" = dontDistribute super."AvlTree"; + "BASIC" = dontDistribute super."BASIC"; + "BCMtools" = dontDistribute super."BCMtools"; + "BNFC" = dontDistribute super."BNFC"; + "BNFC-meta" = dontDistribute super."BNFC-meta"; + "Baggins" = dontDistribute super."Baggins"; + "Bang" = dontDistribute super."Bang"; + "Barracuda" = dontDistribute super."Barracuda"; + "Befunge93" = dontDistribute super."Befunge93"; + "BenchmarkHistory" = dontDistribute super."BenchmarkHistory"; + "BerkeleyDB" = dontDistribute super."BerkeleyDB"; + "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML"; + "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm"; + "BigPixel" = dontDistribute super."BigPixel"; + "Binpack" = dontDistribute super."Binpack"; + "Biobase" = dontDistribute super."Biobase"; + "BiobaseBlast" = dontDistribute super."BiobaseBlast"; + "BiobaseDotP" = dontDistribute super."BiobaseDotP"; + "BiobaseFR3D" = dontDistribute super."BiobaseFR3D"; + "BiobaseFasta" = dontDistribute super."BiobaseFasta"; + "BiobaseInfernal" = dontDistribute super."BiobaseInfernal"; + "BiobaseMAF" = dontDistribute super."BiobaseMAF"; + "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData"; + "BiobaseTurner" = dontDistribute super."BiobaseTurner"; + "BiobaseTypes" = dontDistribute super."BiobaseTypes"; + "BiobaseVienna" = dontDistribute super."BiobaseVienna"; + "BiobaseXNA" = dontDistribute super."BiobaseXNA"; + "BirdPP" = dontDistribute super."BirdPP"; + "BitSyntax" = dontDistribute super."BitSyntax"; + "Bitly" = dontDistribute super."Bitly"; + "Blobs" = dontDistribute super."Blobs"; + "BluePrintCSS" = dontDistribute super."BluePrintCSS"; + "Blueprint" = dontDistribute super."Blueprint"; + "Bookshelf" = dontDistribute super."Bookshelf"; + "Bravo" = dontDistribute super."Bravo"; + "BufferedSocket" = dontDistribute super."BufferedSocket"; + "Buster" = dontDistribute super."Buster"; + "CBOR" = dontDistribute super."CBOR"; + "CC-delcont" = dontDistribute super."CC-delcont"; + "CC-delcont-alt" = dontDistribute super."CC-delcont-alt"; + "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe"; + "CC-delcont-exc" = dontDistribute super."CC-delcont-exc"; + "CC-delcont-ref" = dontDistribute super."CC-delcont-ref"; + "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf"; + "CCA" = dontDistribute super."CCA"; + "CHXHtml" = dontDistribute super."CHXHtml"; + "CLASE" = dontDistribute super."CLASE"; + "CLI" = dontDistribute super."CLI"; + "CMCompare" = dontDistribute super."CMCompare"; + "CMQ" = dontDistribute super."CMQ"; + "COrdering" = dontDistribute super."COrdering"; + "CPBrainfuck" = dontDistribute super."CPBrainfuck"; + "CPL" = dontDistribute super."CPL"; + "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage"; + "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules"; + "CSPM-Frontend" = dontDistribute super."CSPM-Frontend"; + "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter"; + "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog"; + "CSPM-cspm" = dontDistribute super."CSPM-cspm"; + "CTRex" = dontDistribute super."CTRex"; + "CV" = dontDistribute super."CV"; + "CabalSearch" = dontDistribute super."CabalSearch"; + "Capabilities" = dontDistribute super."Capabilities"; + "Cardinality" = dontDistribute super."Cardinality"; + "CarneadesDSL" = dontDistribute super."CarneadesDSL"; + "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung"; + "Cartesian" = dontDistribute super."Cartesian"; + "Cascade" = dontDistribute super."Cascade"; + "Catana" = dontDistribute super."Catana"; + "Chart-gtk" = dontDistribute super."Chart-gtk"; + "Chart-simple" = dontDistribute super."Chart-simple"; + "CheatSheet" = dontDistribute super."CheatSheet"; + "Checked" = dontDistribute super."Checked"; + "Chitra" = dontDistribute super."Chitra"; + "ChristmasTree" = dontDistribute super."ChristmasTree"; + "CirruParser" = dontDistribute super."CirruParser"; + "ClassLaws" = dontDistribute super."ClassLaws"; + "ClassyPrelude" = dontDistribute super."ClassyPrelude"; + "Clean" = dontDistribute super."Clean"; + "Clipboard" = dontDistribute super."Clipboard"; + "ClustalParser" = dontDistribute super."ClustalParser"; + "Coadjute" = dontDistribute super."Coadjute"; + "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF"; + "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL"; + "Combinatorrent" = dontDistribute super."Combinatorrent"; + "Command" = dontDistribute super."Command"; + "Commando" = dontDistribute super."Commando"; + "ComonadSheet" = dontDistribute super."ComonadSheet"; + "ConcurrentUtils" = dontDistribute super."ConcurrentUtils"; + "Concurrential" = dontDistribute super."Concurrential"; + "Condor" = dontDistribute super."Condor"; + "ConfigFileTH" = dontDistribute super."ConfigFileTH"; + "Configger" = dontDistribute super."Configger"; + "Configurable" = dontDistribute super."Configurable"; + "ConsStream" = dontDistribute super."ConsStream"; + "Conscript" = dontDistribute super."Conscript"; + "ConstraintKinds" = dontDistribute super."ConstraintKinds"; + "Consumer" = dontDistribute super."Consumer"; + "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; + "Contract" = dontDistribute super."Contract"; + "Control-Engine" = dontDistribute super."Control-Engine"; + "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; + "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2"; + "CoreDump" = dontDistribute super."CoreDump"; + "CoreErlang" = dontDistribute super."CoreErlang"; + "CoreFoundation" = dontDistribute super."CoreFoundation"; + "Coroutine" = dontDistribute super."Coroutine"; + "CouchDB" = dontDistribute super."CouchDB"; + "Craft3e" = dontDistribute super."Craft3e"; + "Crypto" = dontDistribute super."Crypto"; + "CurryDB" = dontDistribute super."CurryDB"; + "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; + "DBlimited" = dontDistribute super."DBlimited"; + "DBus" = dontDistribute super."DBus"; + "DCFL" = dontDistribute super."DCFL"; + "DMuCheck" = dontDistribute super."DMuCheck"; + "DOM" = dontDistribute super."DOM"; + "DP" = dontDistribute super."DP"; + "DPM" = dontDistribute super."DPM"; + "DSA" = dontDistribute super."DSA"; + "DSH" = dontDistribute super."DSH"; + "DSTM" = dontDistribute super."DSTM"; + "DTC" = dontDistribute super."DTC"; + "Dangerous" = dontDistribute super."Dangerous"; + "Dao" = dontDistribute super."Dao"; + "DarcsHelpers" = dontDistribute super."DarcsHelpers"; + "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent"; + "Data-Rope" = dontDistribute super."Data-Rope"; + "DataTreeView" = dontDistribute super."DataTreeView"; + "Deadpan-DDP" = dontDistribute super."Deadpan-DDP"; + "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers"; + "DecisionTree" = dontDistribute super."DecisionTree"; + "DeepArrow" = dontDistribute super."DeepArrow"; + "DefendTheKing" = dontDistribute super."DefendTheKing"; + "DescriptiveKeys" = dontDistribute super."DescriptiveKeys"; + "Dflow" = dontDistribute super."Dflow"; + "DifferenceLogic" = dontDistribute super."DifferenceLogic"; + "DifferentialEvolution" = dontDistribute super."DifferentialEvolution"; + "Digit" = dontDistribute super."Digit"; + "DigitalOcean" = dontDistribute super."DigitalOcean"; + "DimensionalHash" = dontDistribute super."DimensionalHash"; + "DirectSound" = dontDistribute super."DirectSound"; + "DisTract" = dontDistribute super."DisTract"; + "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem"; + "Dish" = dontDistribute super."Dish"; + "Dist" = dontDistribute super."Dist"; + "DistanceTransform" = dontDistribute super."DistanceTransform"; + "DistanceUnits" = dontDistribute super."DistanceUnits"; + "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment"; + "DocTest" = dontDistribute super."DocTest"; + "Docs" = dontDistribute super."Docs"; + "DrHylo" = dontDistribute super."DrHylo"; + "DrIFT" = dontDistribute super."DrIFT"; + "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized"; + "Dung" = dontDistribute super."Dung"; + "Dust" = dontDistribute super."Dust"; + "Dust-crypto" = dontDistribute super."Dust-crypto"; + "Dust-tools" = dontDistribute super."Dust-tools"; + "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap"; + "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp"; + "DysFRP" = dontDistribute super."DysFRP"; + "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo"; + "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk"; + "EEConfig" = dontDistribute super."EEConfig"; + "Earley" = doDistribute super."Earley_0_9_0"; + "Ebnf2ps" = dontDistribute super."Ebnf2ps"; + "EdisonAPI" = dontDistribute super."EdisonAPI"; + "EdisonCore" = dontDistribute super."EdisonCore"; + "EditTimeReport" = dontDistribute super."EditTimeReport"; + "EitherT" = dontDistribute super."EitherT"; + "Elm" = dontDistribute super."Elm"; + "Emping" = dontDistribute super."Emping"; + "Encode" = dontDistribute super."Encode"; + "EntrezHTTP" = dontDistribute super."EntrezHTTP"; + "EnumContainers" = dontDistribute super."EnumContainers"; + "EnumMap" = dontDistribute super."EnumMap"; + "Eq" = dontDistribute super."Eq"; + "EqualitySolver" = dontDistribute super."EqualitySolver"; + "EsounD" = dontDistribute super."EsounD"; + "EstProgress" = dontDistribute super."EstProgress"; + "EtaMOO" = dontDistribute super."EtaMOO"; + "Etage" = dontDistribute super."Etage"; + "Etage-Graph" = dontDistribute super."Etage-Graph"; + "Eternal10Seconds" = dontDistribute super."Eternal10Seconds"; + "Etherbunny" = dontDistribute super."Etherbunny"; + "EuroIT" = dontDistribute super."EuroIT"; + "Euterpea" = dontDistribute super."Euterpea"; + "EventSocket" = dontDistribute super."EventSocket"; + "Extra" = dontDistribute super."Extra"; + "FComp" = dontDistribute super."FComp"; + "FM-SBLEX" = dontDistribute super."FM-SBLEX"; + "FModExRaw" = dontDistribute super."FModExRaw"; + "FPretty" = dontDistribute super."FPretty"; + "FTGL" = dontDistribute super."FTGL"; + "FTGL-bytestring" = dontDistribute super."FTGL-bytestring"; + "FTPLine" = dontDistribute super."FTPLine"; + "Facts" = dontDistribute super."Facts"; + "FailureT" = dontDistribute super."FailureT"; + "FastxPipe" = dontDistribute super."FastxPipe"; + "FermatsLastMargin" = dontDistribute super."FermatsLastMargin"; + "FerryCore" = dontDistribute super."FerryCore"; + "Feval" = dontDistribute super."Feval"; + "FieldTrip" = dontDistribute super."FieldTrip"; + "FileManip" = dontDistribute super."FileManip"; + "FileManipCompat" = dontDistribute super."FileManipCompat"; + "FilePather" = dontDistribute super."FilePather"; + "FileSystem" = dontDistribute super."FileSystem"; + "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo"; + "Finance-Treasury" = dontDistribute super."Finance-Treasury"; + "FindBin" = dontDistribute super."FindBin"; + "FiniteMap" = dontDistribute super."FiniteMap"; + "FirstOrderTheory" = dontDistribute super."FirstOrderTheory"; + "FixedPoint-simple" = dontDistribute super."FixedPoint-simple"; + "Flippi" = dontDistribute super."Flippi"; + "Focus" = dontDistribute super."Focus"; + "Folly" = dontDistribute super."Folly"; + "ForSyDe" = dontDistribute super."ForSyDe"; + "ForkableT" = dontDistribute super."ForkableT"; + "FormalGrammars" = dontDistribute super."FormalGrammars"; + "Foster" = dontDistribute super."Foster"; + "FpMLv53" = dontDistribute super."FpMLv53"; + "Fractaler" = dontDistribute super."Fractaler"; + "Frames" = dontDistribute super."Frames"; + "Frank" = dontDistribute super."Frank"; + "FreeTypeGL" = dontDistribute super."FreeTypeGL"; + "FunGEn" = dontDistribute super."FunGEn"; + "Fungi" = dontDistribute super."Fungi"; + "GA" = dontDistribute super."GA"; + "GGg" = dontDistribute super."GGg"; + "GHood" = dontDistribute super."GHood"; + "GLFW" = dontDistribute super."GLFW"; + "GLFW-OGL" = dontDistribute super."GLFW-OGL"; + "GLFW-b" = dontDistribute super."GLFW-b"; + "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; + "GLFW-task" = dontDistribute super."GLFW-task"; + "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; + "GLMatrix" = dontDistribute super."GLMatrix"; + "GLURaw" = dontDistribute super."GLURaw"; + "GLUT" = dontDistribute super."GLUT"; + "GLUtil" = dontDistribute super."GLUtil"; + "GPX" = dontDistribute super."GPX"; + "GPipe" = dontDistribute super."GPipe"; + "GPipe-Collada" = dontDistribute super."GPipe-Collada"; + "GPipe-Examples" = dontDistribute super."GPipe-Examples"; + "GPipe-GLFW" = dontDistribute super."GPipe-GLFW"; + "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad"; + "GTALib" = dontDistribute super."GTALib"; + "Gamgine" = dontDistribute super."Gamgine"; + "Ganymede" = dontDistribute super."Ganymede"; + "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration"; + "GeBoP" = dontDistribute super."GeBoP"; + "GenI" = dontDistribute super."GenI"; + "GenSmsPdu" = dontDistribute super."GenSmsPdu"; + "Genbank" = dontDistribute super."Genbank"; + "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe"; + "GenussFold" = dontDistribute super."GenussFold"; + "GeoIp" = dontDistribute super."GeoIp"; + "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage"; + "Geodetic" = dontDistribute super."Geodetic"; + "GeomPredicates" = dontDistribute super."GeomPredicates"; + "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; + "GiST" = dontDistribute super."GiST"; + "GiveYouAHead" = dontDistribute super."GiveYouAHead"; + "GlomeTrace" = dontDistribute super."GlomeTrace"; + "GlomeVec" = dontDistribute super."GlomeVec"; + "GlomeView" = dontDistribute super."GlomeView"; + "GoogleChart" = dontDistribute super."GoogleChart"; + "GoogleDirections" = dontDistribute super."GoogleDirections"; + "GoogleSB" = dontDistribute super."GoogleSB"; + "GoogleSuggest" = dontDistribute super."GoogleSuggest"; + "GoogleTranslate" = dontDistribute super."GoogleTranslate"; + "GotoT-transformers" = dontDistribute super."GotoT-transformers"; + "GrammarProducts" = dontDistribute super."GrammarProducts"; + "Graph500" = dontDistribute super."Graph500"; + "GraphHammer" = dontDistribute super."GraphHammer"; + "GraphHammer-examples" = dontDistribute super."GraphHammer-examples"; + "Graphalyze" = dontDistribute super."Graphalyze"; + "Grempa" = dontDistribute super."Grempa"; + "GroteTrap" = dontDistribute super."GroteTrap"; + "Grow" = dontDistribute super."Grow"; + "GrowlNotify" = dontDistribute super."GrowlNotify"; + "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics"; + "GtkGLTV" = dontDistribute super."GtkGLTV"; + "GtkTV" = dontDistribute super."GtkTV"; + "GuiHaskell" = dontDistribute super."GuiHaskell"; + "GuiTV" = dontDistribute super."GuiTV"; + "H" = dontDistribute super."H"; + "HARM" = dontDistribute super."HARM"; + "HAppS-Data" = dontDistribute super."HAppS-Data"; + "HAppS-IxSet" = dontDistribute super."HAppS-IxSet"; + "HAppS-Server" = dontDistribute super."HAppS-Server"; + "HAppS-State" = dontDistribute super."HAppS-State"; + "HAppS-Util" = dontDistribute super."HAppS-Util"; + "HAppSHelpers" = dontDistribute super."HAppSHelpers"; + "HCL" = dontDistribute super."HCL"; + "HCard" = dontDistribute super."HCard"; + "HDBC" = dontDistribute super."HDBC"; + "HDBC-mysql" = dontDistribute super."HDBC-mysql"; + "HDBC-odbc" = dontDistribute super."HDBC-odbc"; + "HDBC-postgresql" = dontDistribute super."HDBC-postgresql"; + "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; + "HDBC-session" = dontDistribute super."HDBC-session"; + "HDBC-sqlite3" = dontDistribute super."HDBC-sqlite3"; + "HDRUtils" = dontDistribute super."HDRUtils"; + "HERA" = dontDistribute super."HERA"; + "HFrequencyQueue" = dontDistribute super."HFrequencyQueue"; + "HFuse" = dontDistribute super."HFuse"; + "HGL" = dontDistribute super."HGL"; + "HGamer3D" = dontDistribute super."HGamer3D"; + "HGamer3D-API" = dontDistribute super."HGamer3D-API"; + "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio"; + "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding"; + "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding"; + "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding"; + "HGamer3D-Common" = dontDistribute super."HGamer3D-Common"; + "HGamer3D-Data" = dontDistribute super."HGamer3D-Data"; + "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding"; + "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI"; + "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D"; + "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem"; + "HGamer3D-Network" = dontDistribute super."HGamer3D-Network"; + "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding"; + "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding"; + "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding"; + "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding"; + "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent"; + "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire"; + "HGraphStorage" = dontDistribute super."HGraphStorage"; + "HHDL" = dontDistribute super."HHDL"; + "HJScript" = dontDistribute super."HJScript"; + "HJVM" = dontDistribute super."HJVM"; + "HJavaScript" = dontDistribute super."HJavaScript"; + "HLearn-algebra" = dontDistribute super."HLearn-algebra"; + "HLearn-approximation" = dontDistribute super."HLearn-approximation"; + "HLearn-classification" = dontDistribute super."HLearn-classification"; + "HLearn-datastructures" = dontDistribute super."HLearn-datastructures"; + "HLearn-distributions" = dontDistribute super."HLearn-distributions"; + "HListPP" = dontDistribute super."HListPP"; + "HLogger" = dontDistribute super."HLogger"; + "HMM" = dontDistribute super."HMM"; + "HMap" = dontDistribute super."HMap"; + "HNM" = dontDistribute super."HNM"; + "HODE" = dontDistribute super."HODE"; + "HOpenCV" = dontDistribute super."HOpenCV"; + "HPDF" = dontDistribute super."HPDF"; + "HPath" = dontDistribute super."HPath"; + "HPi" = dontDistribute super."HPi"; + "HPlot" = dontDistribute super."HPlot"; + "HPong" = dontDistribute super."HPong"; + "HROOT" = dontDistribute super."HROOT"; + "HROOT-core" = dontDistribute super."HROOT-core"; + "HROOT-graf" = dontDistribute super."HROOT-graf"; + "HROOT-hist" = dontDistribute super."HROOT-hist"; + "HROOT-io" = dontDistribute super."HROOT-io"; + "HROOT-math" = dontDistribute super."HROOT-math"; + "HRay" = dontDistribute super."HRay"; + "HSFFIG" = dontDistribute super."HSFFIG"; + "HSGEP" = dontDistribute super."HSGEP"; + "HSH" = dontDistribute super."HSH"; + "HSHHelpers" = dontDistribute super."HSHHelpers"; + "HSlippyMap" = dontDistribute super."HSlippyMap"; + "HSmarty" = dontDistribute super."HSmarty"; + "HSoundFile" = dontDistribute super."HSoundFile"; + "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; + "HSvm" = dontDistribute super."HSvm"; + "HTTP-Simple" = dontDistribute super."HTTP-Simple"; + "HTab" = dontDistribute super."HTab"; + "HTicTacToe" = dontDistribute super."HTicTacToe"; + "HUnit-Diff" = dontDistribute super."HUnit-Diff"; + "HUnit-Plus" = dontDistribute super."HUnit-Plus"; + "HUnit-approx" = dontDistribute super."HUnit-approx"; + "HXMPP" = dontDistribute super."HXMPP"; + "HXQ" = dontDistribute super."HXQ"; + "HaLeX" = dontDistribute super."HaLeX"; + "HaMinitel" = dontDistribute super."HaMinitel"; + "HaPy" = dontDistribute super."HaPy"; + "HaRe" = dontDistribute super."HaRe"; + "HaTeX-meta" = dontDistribute super."HaTeX-meta"; + "HaTeX-qq" = dontDistribute super."HaTeX-qq"; + "HaVSA" = dontDistribute super."HaVSA"; + "Hach" = dontDistribute super."Hach"; + "HackMail" = dontDistribute super."HackMail"; + "Haggressive" = dontDistribute super."Haggressive"; + "HandlerSocketClient" = dontDistribute super."HandlerSocketClient"; + "Hangman" = dontDistribute super."Hangman"; + "HarmTrace" = dontDistribute super."HarmTrace"; + "HarmTrace-Base" = dontDistribute super."HarmTrace-Base"; + "HasGP" = dontDistribute super."HasGP"; + "Haschoo" = dontDistribute super."Haschoo"; + "Hashell" = dontDistribute super."Hashell"; + "HaskRel" = dontDistribute super."HaskRel"; + "HaskellForMaths" = dontDistribute super."HaskellForMaths"; + "HaskellLM" = dontDistribute super."HaskellLM"; + "HaskellNN" = dontDistribute super."HaskellNN"; + "HaskellNet" = doDistribute super."HaskellNet_0_4_5"; + "HaskellNet-SSL" = dontDistribute super."HaskellNet-SSL"; + "HaskellTorrent" = dontDistribute super."HaskellTorrent"; + "HaskellTutorials" = dontDistribute super."HaskellTutorials"; + "Haskelloids" = dontDistribute super."Haskelloids"; + "Hawk" = dontDistribute super."Hawk"; + "Hayoo" = dontDistribute super."Hayoo"; + "Hclip" = dontDistribute super."Hclip"; + "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; + "Hermes" = dontDistribute super."Hermes"; + "Hieroglyph" = dontDistribute super."Hieroglyph"; + "HiggsSet" = dontDistribute super."HiggsSet"; + "Hipmunk" = dontDistribute super."Hipmunk"; + "HipmunkPlayground" = dontDistribute super."HipmunkPlayground"; + "Hish" = dontDistribute super."Hish"; + "Histogram" = dontDistribute super."Histogram"; + "Hmpf" = dontDistribute super."Hmpf"; + "Hoed" = dontDistribute super."Hoed"; + "HoleyMonoid" = dontDistribute super."HoleyMonoid"; + "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution"; + "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce"; + "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine"; + "Holumbus-Storage" = dontDistribute super."Holumbus-Storage"; + "Homology" = dontDistribute super."Homology"; + "HongoDB" = dontDistribute super."HongoDB"; + "HostAndPort" = dontDistribute super."HostAndPort"; + "Hricket" = dontDistribute super."Hricket"; + "Hs2lib" = dontDistribute super."Hs2lib"; + "HsASA" = dontDistribute super."HsASA"; + "HsHaruPDF" = dontDistribute super."HsHaruPDF"; + "HsHyperEstraier" = dontDistribute super."HsHyperEstraier"; + "HsJudy" = dontDistribute super."HsJudy"; + "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system"; + "HsParrot" = dontDistribute super."HsParrot"; + "HsPerl5" = dontDistribute super."HsPerl5"; + "HsSVN" = dontDistribute super."HsSVN"; + "HsSyck" = dontDistribute super."HsSyck"; + "HsTools" = dontDistribute super."HsTools"; + "Hsed" = dontDistribute super."Hsed"; + "Hsmtlib" = dontDistribute super."Hsmtlib"; + "HueAPI" = dontDistribute super."HueAPI"; + "HulkImport" = dontDistribute super."HulkImport"; + "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; + "IDynamic" = dontDistribute super."IDynamic"; + "IFS" = dontDistribute super."IFS"; + "INblobs" = dontDistribute super."INblobs"; + "IOR" = dontDistribute super."IOR"; + "IORefCAS" = dontDistribute super."IORefCAS"; + "IcoGrid" = dontDistribute super."IcoGrid"; + "Imlib" = dontDistribute super."Imlib"; + "ImperativeHaskell" = dontDistribute super."ImperativeHaskell"; + "IndentParser" = dontDistribute super."IndentParser"; + "IndexedList" = dontDistribute super."IndexedList"; + "InfixApplicative" = dontDistribute super."InfixApplicative"; + "Interpolation" = dontDistribute super."Interpolation"; + "Interpolation-maxs" = dontDistribute super."Interpolation-maxs"; + "IntervalMap" = dontDistribute super."IntervalMap"; + "Irc" = dontDistribute super."Irc"; + "IrrHaskell" = dontDistribute super."IrrHaskell"; + "IsNull" = dontDistribute super."IsNull"; + "JSON-Combinator" = dontDistribute super."JSON-Combinator"; + "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples"; + "JSONb" = dontDistribute super."JSONb"; + "JYU-Utils" = dontDistribute super."JYU-Utils"; + "JackMiniMix" = dontDistribute super."JackMiniMix"; + "Javasf" = dontDistribute super."Javasf"; + "Javav" = dontDistribute super."Javav"; + "JsContracts" = dontDistribute super."JsContracts"; + "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; + "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; + "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct"; + "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; + "JunkDB" = dontDistribute super."JunkDB"; + "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm"; + "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables"; + "JustParse" = dontDistribute super."JustParse"; + "KMP" = dontDistribute super."KMP"; + "KSP" = dontDistribute super."KSP"; + "Kalman" = dontDistribute super."Kalman"; + "KdTree" = dontDistribute super."KdTree"; + "Ketchup" = dontDistribute super."Ketchup"; + "KiCS" = dontDistribute super."KiCS"; + "KiCS-debugger" = dontDistribute super."KiCS-debugger"; + "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; + "Kleislify" = dontDistribute super."Kleislify"; + "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; + "KyotoCabinet" = dontDistribute super."KyotoCabinet"; + "L-seed" = dontDistribute super."L-seed"; + "LDAP" = dontDistribute super."LDAP"; + "LRU" = dontDistribute super."LRU"; + "LTree" = dontDistribute super."LTree"; + "LambdaCalculator" = dontDistribute super."LambdaCalculator"; + "LambdaHack" = dontDistribute super."LambdaHack"; + "LambdaINet" = dontDistribute super."LambdaINet"; + "LambdaNet" = dontDistribute super."LambdaNet"; + "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote"; + "LambdaShell" = dontDistribute super."LambdaShell"; + "Lambdajudge" = dontDistribute super."Lambdajudge"; + "Lambdaya" = dontDistribute super."Lambdaya"; + "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; + "Lastik" = dontDistribute super."Lastik"; + "Lattices" = dontDistribute super."Lattices"; + "LazyVault" = dontDistribute super."LazyVault"; + "Level0" = dontDistribute super."Level0"; + "LibClang" = dontDistribute super."LibClang"; + "LibZip" = dontDistribute super."LibZip"; + "Limit" = dontDistribute super."Limit"; + "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; + "LinkChecker" = dontDistribute super."LinkChecker"; + "ListTree" = dontDistribute super."ListTree"; + "ListWriter" = dontDistribute super."ListWriter"; + "ListZipper" = dontDistribute super."ListZipper"; + "Logic" = dontDistribute super."Logic"; + "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees"; + "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI"; + "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network"; + "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes"; + "LslPlus" = dontDistribute super."LslPlus"; + "Lucu" = dontDistribute super."Lucu"; + "MC-Fold-DP" = dontDistribute super."MC-Fold-DP"; + "MFlow" = dontDistribute super."MFlow"; + "MHask" = dontDistribute super."MHask"; + "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; + "MagicHaskeller" = dontDistribute super."MagicHaskeller"; + "MailchimpSimple" = dontDistribute super."MailchimpSimple"; + "MaybeT" = dontDistribute super."MaybeT"; + "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; + "MaybeT-transformers" = dontDistribute super."MaybeT-transformers"; + "MazesOfMonad" = dontDistribute super."MazesOfMonad"; + "MeanShift" = dontDistribute super."MeanShift"; + "Measure" = dontDistribute super."Measure"; + "MetaHDBC" = dontDistribute super."MetaHDBC"; + "MetaObject" = dontDistribute super."MetaObject"; + "Metrics" = dontDistribute super."Metrics"; + "Mhailist" = dontDistribute super."Mhailist"; + "Michelangelo" = dontDistribute super."Michelangelo"; + "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator"; + "MiniAgda" = dontDistribute super."MiniAgda"; + "MissingK" = dontDistribute super."MissingK"; + "MissingM" = dontDistribute super."MissingM"; + "MissingPy" = dontDistribute super."MissingPy"; + "Modulo" = dontDistribute super."Modulo"; + "Moe" = dontDistribute super."Moe"; + "MoeDict" = dontDistribute super."MoeDict"; + "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl"; + "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign"; + "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; + "MonadCompose" = dontDistribute super."MonadCompose"; + "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; + "MonadStack" = dontDistribute super."MonadStack"; + "Monadius" = dontDistribute super."Monadius"; + "Monaris" = dontDistribute super."Monaris"; + "Monatron" = dontDistribute super."Monatron"; + "Monatron-IO" = dontDistribute super."Monatron-IO"; + "Monocle" = dontDistribute super."Monocle"; + "MorseCode" = dontDistribute super."MorseCode"; + "MuCheck" = dontDistribute super."MuCheck"; + "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit"; + "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec"; + "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck"; + "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck"; + "Munkres" = dontDistribute super."Munkres"; + "Munkres-simple" = dontDistribute super."Munkres-simple"; + "MusicBrainz" = dontDistribute super."MusicBrainz"; + "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid"; + "MyPrimes" = dontDistribute super."MyPrimes"; + "NGrams" = dontDistribute super."NGrams"; + "NTRU" = dontDistribute super."NTRU"; + "NXT" = dontDistribute super."NXT"; + "NXTDSL" = dontDistribute super."NXTDSL"; + "NanoProlog" = dontDistribute super."NanoProlog"; + "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; + "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; + "Neks" = dontDistribute super."Neks"; + "NestedFunctor" = dontDistribute super."NestedFunctor"; + "NestedSampling" = dontDistribute super."NestedSampling"; + "NetSNMP" = dontDistribute super."NetSNMP"; + "NewBinary" = dontDistribute super."NewBinary"; + "Ninjas" = dontDistribute super."Ninjas"; + "NoSlow" = dontDistribute super."NoSlow"; + "NoTrace" = dontDistribute super."NoTrace"; + "Noise" = dontDistribute super."Noise"; + "Nomyx" = dontDistribute super."Nomyx"; + "Nomyx-Core" = dontDistribute super."Nomyx-Core"; + "Nomyx-Language" = dontDistribute super."Nomyx-Language"; + "Nomyx-Rules" = dontDistribute super."Nomyx-Rules"; + "Nomyx-Web" = dontDistribute super."Nomyx-Web"; + "NonEmpty" = dontDistribute super."NonEmpty"; + "NonEmptyList" = dontDistribute super."NonEmptyList"; + "NumLazyByteString" = dontDistribute super."NumLazyByteString"; + "NumberSieves" = dontDistribute super."NumberSieves"; + "Numbers" = dontDistribute super."Numbers"; + "Nussinov78" = dontDistribute super."Nussinov78"; + "Nutri" = dontDistribute super."Nutri"; + "OGL" = dontDistribute super."OGL"; + "OSM" = dontDistribute super."OSM"; + "OTP" = dontDistribute super."OTP"; + "Object" = dontDistribute super."Object"; + "ObjectIO" = dontDistribute super."ObjectIO"; + "ObjectName" = dontDistribute super."ObjectName"; + "Obsidian" = dontDistribute super."Obsidian"; + "OddWord" = dontDistribute super."OddWord"; + "Omega" = dontDistribute super."Omega"; + "OpenAFP" = dontDistribute super."OpenAFP"; + "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils"; + "OpenAL" = dontDistribute super."OpenAL"; + "OpenCL" = dontDistribute super."OpenCL"; + "OpenCLRaw" = dontDistribute super."OpenCLRaw"; + "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = dontDistribute super."OpenGL"; + "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = dontDistribute super."OpenGLRaw"; + "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; + "OpenSCAD" = dontDistribute super."OpenSCAD"; + "OpenVG" = dontDistribute super."OpenVG"; + "OpenVGRaw" = dontDistribute super."OpenVGRaw"; + "Operads" = dontDistribute super."Operads"; + "OptDir" = dontDistribute super."OptDir"; + "OrPatterns" = dontDistribute super."OrPatterns"; + "OrchestrateDB" = dontDistribute super."OrchestrateDB"; + "OrderedBits" = dontDistribute super."OrderedBits"; + "Ordinals" = dontDistribute super."Ordinals"; + "PArrows" = dontDistribute super."PArrows"; + "PBKDF2" = dontDistribute super."PBKDF2"; + "PCLT" = dontDistribute super."PCLT"; + "PCLT-DB" = dontDistribute super."PCLT-DB"; + "PDBtools" = dontDistribute super."PDBtools"; + "PTQ" = dontDistribute super."PTQ"; + "PageIO" = dontDistribute super."PageIO"; + "Paillier" = dontDistribute super."Paillier"; + "PandocAgda" = dontDistribute super."PandocAgda"; + "Paraiso" = dontDistribute super."Paraiso"; + "Parry" = dontDistribute super."Parry"; + "ParsecTools" = dontDistribute super."ParsecTools"; + "ParserFunction" = dontDistribute super."ParserFunction"; + "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; + "PasswordGenerator" = dontDistribute super."PasswordGenerator"; + "PastePipe" = dontDistribute super."PastePipe"; + "Pathfinder" = dontDistribute super."Pathfinder"; + "Peano" = dontDistribute super."Peano"; + "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; + "PerfectHash" = dontDistribute super."PerfectHash"; + "PermuteEffects" = dontDistribute super."PermuteEffects"; + "Phsu" = dontDistribute super."Phsu"; + "Pipe" = dontDistribute super."Pipe"; + "Piso" = dontDistribute super."Piso"; + "PlayHangmanGame" = dontDistribute super."PlayHangmanGame"; + "PlayingCards" = dontDistribute super."PlayingCards"; + "Plot-ho-matic" = dontDistribute super."Plot-ho-matic"; + "PlslTools" = dontDistribute super."PlslTools"; + "Plural" = dontDistribute super."Plural"; + "Pollutocracy" = dontDistribute super."Pollutocracy"; + "PortFusion" = dontDistribute super."PortFusion"; + "PortMidi" = dontDistribute super."PortMidi"; + "PostgreSQL" = dontDistribute super."PostgreSQL"; + "PrimitiveArray" = dontDistribute super."PrimitiveArray"; + "Printf-TH" = dontDistribute super."Printf-TH"; + "PriorityChansConverger" = dontDistribute super."PriorityChansConverger"; + "ProbabilityMonads" = dontDistribute super."ProbabilityMonads"; + "PropLogic" = dontDistribute super."PropLogic"; + "Proper" = dontDistribute super."Proper"; + "ProxN" = dontDistribute super."ProxN"; + "Pugs" = dontDistribute super."Pugs"; + "Pup-Events" = dontDistribute super."Pup-Events"; + "Pup-Events-Client" = dontDistribute super."Pup-Events-Client"; + "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo"; + "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue"; + "Pup-Events-Server" = dontDistribute super."Pup-Events-Server"; + "QIO" = dontDistribute super."QIO"; + "QuadEdge" = dontDistribute super."QuadEdge"; + "QuadTree" = dontDistribute super."QuadTree"; + "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "Quickson" = dontDistribute super."Quickson"; + "R-pandoc" = dontDistribute super."R-pandoc"; + "RANSAC" = dontDistribute super."RANSAC"; + "RBTree" = dontDistribute super."RBTree"; + "RESTng" = dontDistribute super."RESTng"; + "RFC1751" = dontDistribute super."RFC1751"; + "RJson" = dontDistribute super."RJson"; + "RMP" = dontDistribute super."RMP"; + "RNAFold" = dontDistribute super."RNAFold"; + "RNAFoldProgs" = dontDistribute super."RNAFoldProgs"; + "RNAdesign" = dontDistribute super."RNAdesign"; + "RNAdraw" = dontDistribute super."RNAdraw"; + "RNAlien" = dontDistribute super."RNAlien"; + "RNAwolf" = dontDistribute super."RNAwolf"; + "RSA" = doDistribute super."RSA_2_1_0_3"; + "Raincat" = dontDistribute super."Raincat"; + "Random123" = dontDistribute super."Random123"; + "RandomDotOrg" = dontDistribute super."RandomDotOrg"; + "Randometer" = dontDistribute super."Randometer"; + "Range" = dontDistribute super."Range"; + "Ranged-sets" = dontDistribute super."Ranged-sets"; + "Ranka" = dontDistribute super."Ranka"; + "Rasenschach" = dontDistribute super."Rasenschach"; + "Redmine" = dontDistribute super."Redmine"; + "Ref" = dontDistribute super."Ref"; + "Referees" = dontDistribute super."Referees"; + "RepLib" = dontDistribute super."RepLib"; + "ReplicateEffects" = dontDistribute super."ReplicateEffects"; + "ReviewBoard" = dontDistribute super."ReviewBoard"; + "RichConditional" = dontDistribute super."RichConditional"; + "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; + "RxHaskell" = dontDistribute super."RxHaskell"; + "SBench" = dontDistribute super."SBench"; + "SConfig" = dontDistribute super."SConfig"; + "SDL" = dontDistribute super."SDL"; + "SDL-gfx" = dontDistribute super."SDL-gfx"; + "SDL-image" = dontDistribute super."SDL-image"; + "SDL-mixer" = dontDistribute super."SDL-mixer"; + "SDL-mpeg" = dontDistribute super."SDL-mpeg"; + "SDL-ttf" = dontDistribute super."SDL-ttf"; + "SDL2-ttf" = dontDistribute super."SDL2-ttf"; + "SFML" = dontDistribute super."SFML"; + "SFML-control" = dontDistribute super."SFML-control"; + "SFont" = dontDistribute super."SFont"; + "SG" = dontDistribute super."SG"; + "SGdemo" = dontDistribute super."SGdemo"; + "SHA2" = dontDistribute super."SHA2"; + "SMTPClient" = dontDistribute super."SMTPClient"; + "SNet" = dontDistribute super."SNet"; + "SQLDeps" = dontDistribute super."SQLDeps"; + "STL" = dontDistribute super."STL"; + "SVG2Q" = dontDistribute super."SVG2Q"; + "SVGPath" = dontDistribute super."SVGPath"; + "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB"; + "SableCC2Hs" = dontDistribute super."SableCC2Hs"; + "Safe" = dontDistribute super."Safe"; + "Salsa" = dontDistribute super."Salsa"; + "Saturnin" = dontDistribute super."Saturnin"; + "SciFlow" = dontDistribute super."SciFlow"; + "ScratchFs" = dontDistribute super."ScratchFs"; + "Scurry" = dontDistribute super."Scurry"; + "SegmentTree" = dontDistribute super."SegmentTree"; + "Semantique" = dontDistribute super."Semantique"; + "Semigroup" = dontDistribute super."Semigroup"; + "SeqAlign" = dontDistribute super."SeqAlign"; + "SessionLogger" = dontDistribute super."SessionLogger"; + "ShellCheck" = dontDistribute super."ShellCheck"; + "Shellac" = dontDistribute super."Shellac"; + "Shellac-compatline" = dontDistribute super."Shellac-compatline"; + "Shellac-editline" = dontDistribute super."Shellac-editline"; + "Shellac-haskeline" = dontDistribute super."Shellac-haskeline"; + "Shellac-readline" = dontDistribute super."Shellac-readline"; + "ShowF" = dontDistribute super."ShowF"; + "Shrub" = dontDistribute super."Shrub"; + "Shu-thing" = dontDistribute super."Shu-thing"; + "SimpleAES" = dontDistribute super."SimpleAES"; + "SimpleEA" = dontDistribute super."SimpleEA"; + "SimpleGL" = dontDistribute super."SimpleGL"; + "SimpleH" = dontDistribute super."SimpleH"; + "SimpleLog" = dontDistribute super."SimpleLog"; + "SizeCompare" = dontDistribute super."SizeCompare"; + "Slides" = dontDistribute super."Slides"; + "Smooth" = dontDistribute super."Smooth"; + "SmtLib" = dontDistribute super."SmtLib"; + "Snusmumrik" = dontDistribute super."Snusmumrik"; + "SoOSiM" = dontDistribute super."SoOSiM"; + "SoccerFun" = dontDistribute super."SoccerFun"; + "SoccerFunGL" = dontDistribute super."SoccerFunGL"; + "Sonnex" = dontDistribute super."Sonnex"; + "SourceGraph" = dontDistribute super."SourceGraph"; + "Southpaw" = dontDistribute super."Southpaw"; + "SpaceInvaders" = dontDistribute super."SpaceInvaders"; + "SpacePrivateers" = dontDistribute super."SpacePrivateers"; + "SpinCounter" = dontDistribute super."SpinCounter"; + "Spock" = doDistribute super."Spock_0_8_1_0"; + "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "SpreadsheetML" = dontDistribute super."SpreadsheetML"; + "Sprig" = dontDistribute super."Sprig"; + "Stasis" = dontDistribute super."Stasis"; + "StateVar-transformer" = dontDistribute super."StateVar-transformer"; + "StatisticalMethods" = dontDistribute super."StatisticalMethods"; + "Stomp" = dontDistribute super."Stomp"; + "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib"; + "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell"; + "Strafunski-StrategyLib" = dontDistribute super."Strafunski-StrategyLib"; + "StrappedTemplates" = dontDistribute super."StrappedTemplates"; + "StrategyLib" = dontDistribute super."StrategyLib"; + "StrictBench" = dontDistribute super."StrictBench"; + "SuffixStructures" = dontDistribute super."SuffixStructures"; + "SybWidget" = dontDistribute super."SybWidget"; + "SyntaxMacros" = dontDistribute super."SyntaxMacros"; + "Sysmon" = dontDistribute super."Sysmon"; + "TBC" = dontDistribute super."TBC"; + "TBit" = dontDistribute super."TBit"; + "THEff" = dontDistribute super."THEff"; + "TTTAS" = dontDistribute super."TTTAS"; + "TV" = dontDistribute super."TV"; + "TYB" = dontDistribute super."TYB"; + "TableAlgebra" = dontDistribute super."TableAlgebra"; + "Tables" = dontDistribute super."Tables"; + "Tablify" = dontDistribute super."Tablify"; + "Tainted" = dontDistribute super."Tainted"; + "Takusen" = dontDistribute super."Takusen"; + "Tape" = dontDistribute super."Tape"; + "Taxonomy" = dontDistribute super."Taxonomy"; + "TaxonomyTools" = dontDistribute super."TaxonomyTools"; + "TeaHS" = dontDistribute super."TeaHS"; + "Tensor" = dontDistribute super."Tensor"; + "TernaryTrees" = dontDistribute super."TernaryTrees"; + "TestExplode" = dontDistribute super."TestExplode"; + "Theora" = dontDistribute super."Theora"; + "Thingie" = dontDistribute super."Thingie"; + "ThreadObjects" = dontDistribute super."ThreadObjects"; + "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; + "TicTacToe" = dontDistribute super."TicTacToe"; + "TigerHash" = dontDistribute super."TigerHash"; + "TimePiece" = dontDistribute super."TimePiece"; + "TinyLaunchbury" = dontDistribute super."TinyLaunchbury"; + "TinyURL" = dontDistribute super."TinyURL"; + "Titim" = dontDistribute super."Titim"; + "Top" = dontDistribute super."Top"; + "Tournament" = dontDistribute super."Tournament"; + "TraceUtils" = dontDistribute super."TraceUtils"; + "TransformersStepByStep" = dontDistribute super."TransformersStepByStep"; + "Transhare" = dontDistribute super."Transhare"; + "TreeCounter" = dontDistribute super."TreeCounter"; + "TreeStructures" = dontDistribute super."TreeStructures"; + "TreeT" = dontDistribute super."TreeT"; + "Treiber" = dontDistribute super."Treiber"; + "TrendGraph" = dontDistribute super."TrendGraph"; + "TrieMap" = dontDistribute super."TrieMap"; + "Twofish" = dontDistribute super."Twofish"; + "TypeClass" = dontDistribute super."TypeClass"; + "TypeCompose" = dontDistribute super."TypeCompose"; + "TypeIlluminator" = dontDistribute super."TypeIlluminator"; + "TypeNat" = dontDistribute super."TypeNat"; + "TypingTester" = dontDistribute super."TypingTester"; + "UISF" = dontDistribute super."UISF"; + "UMM" = dontDistribute super."UMM"; + "URLT" = dontDistribute super."URLT"; + "URLb" = dontDistribute super."URLb"; + "UTFTConverter" = dontDistribute super."UTFTConverter"; + "Unique" = dontDistribute super."Unique"; + "Unixutils-shadow" = dontDistribute super."Unixutils-shadow"; + "Updater" = dontDistribute super."Updater"; + "UrlDisp" = dontDistribute super."UrlDisp"; + "Useful" = dontDistribute super."Useful"; + "UtilityTM" = dontDistribute super."UtilityTM"; + "VKHS" = dontDistribute super."VKHS"; + "Validation" = dontDistribute super."Validation"; + "Vec" = dontDistribute super."Vec"; + "Vec-Boolean" = dontDistribute super."Vec-Boolean"; + "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw"; + "Vec-Transform" = dontDistribute super."Vec-Transform"; + "VecN" = dontDistribute super."VecN"; + "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings"; + "ViennaRNAParser" = dontDistribute super."ViennaRNAParser"; + "WAVE" = dontDistribute super."WAVE"; + "WL500gPControl" = dontDistribute super."WL500gPControl"; + "WL500gPLib" = dontDistribute super."WL500gPLib"; + "WMSigner" = dontDistribute super."WMSigner"; + "WURFL" = dontDistribute super."WURFL"; + "WXDiffCtrl" = dontDistribute super."WXDiffCtrl"; + "WashNGo" = dontDistribute super."WashNGo"; + "WaveFront" = dontDistribute super."WaveFront"; + "Weather" = dontDistribute super."Weather"; + "WebBits" = dontDistribute super."WebBits"; + "WebBits-Html" = dontDistribute super."WebBits-Html"; + "WebBits-multiplate" = dontDistribute super."WebBits-multiplate"; + "WebCont" = dontDistribute super."WebCont"; + "WeberLogic" = dontDistribute super."WeberLogic"; + "Webrexp" = dontDistribute super."Webrexp"; + "Wheb" = dontDistribute super."Wheb"; + "WikimediaParser" = dontDistribute super."WikimediaParser"; + "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server"; + "Win32-errors" = dontDistribute super."Win32-errors"; + "Win32-extras" = dontDistribute super."Win32-extras"; + "Win32-junction-point" = dontDistribute super."Win32-junction-point"; + "Win32-security" = dontDistribute super."Win32-security"; + "Win32-services" = dontDistribute super."Win32-services"; + "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; + "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; + "WordNet" = dontDistribute super."WordNet"; + "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; + "Wordlint" = dontDistribute super."Wordlint"; + "WxGeneric" = dontDistribute super."WxGeneric"; + "X11-extras" = dontDistribute super."X11-extras"; + "X11-rm" = dontDistribute super."X11-rm"; + "X11-xdamage" = dontDistribute super."X11-xdamage"; + "X11-xfixes" = dontDistribute super."X11-xfixes"; + "X11-xft" = dontDistribute super."X11-xft"; + "X11-xshape" = dontDistribute super."X11-xshape"; + "XAttr" = dontDistribute super."XAttr"; + "XInput" = dontDistribute super."XInput"; + "XMMS" = dontDistribute super."XMMS"; + "XMPP" = dontDistribute super."XMPP"; + "XSaiga" = dontDistribute super."XSaiga"; + "Xauth" = dontDistribute super."Xauth"; + "Xec" = dontDistribute super."Xec"; + "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter"; + "Xorshift128Plus" = dontDistribute super."Xorshift128Plus"; + "YACPong" = dontDistribute super."YACPong"; + "YFrob" = dontDistribute super."YFrob"; + "Yablog" = dontDistribute super."Yablog"; + "YamlReference" = dontDistribute super."YamlReference"; + "Yampa-core" = dontDistribute super."Yampa-core"; + "Yocto" = dontDistribute super."Yocto"; + "Yogurt" = dontDistribute super."Yogurt"; + "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone"; + "ZEBEDDE" = dontDistribute super."ZEBEDDE"; + "ZFS" = dontDistribute super."ZFS"; + "ZMachine" = dontDistribute super."ZMachine"; + "ZipFold" = dontDistribute super."ZipFold"; + "ZipperAG" = dontDistribute super."ZipperAG"; + "Zora" = dontDistribute super."Zora"; + "Zwaluw" = dontDistribute super."Zwaluw"; + "a50" = dontDistribute super."a50"; + "abacate" = dontDistribute super."abacate"; + "abc-puzzle" = dontDistribute super."abc-puzzle"; + "abcBridge" = dontDistribute super."abcBridge"; + "abcnotation" = dontDistribute super."abcnotation"; + "abeson" = dontDistribute super."abeson"; + "abstract-deque-tests" = dontDistribute super."abstract-deque-tests"; + "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate"; + "abt" = dontDistribute super."abt"; + "ac-machine" = dontDistribute super."ac-machine"; + "ac-machine-conduit" = dontDistribute super."ac-machine-conduit"; + "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic"; + "accelerate-cublas" = dontDistribute super."accelerate-cublas"; + "accelerate-cuda" = dontDistribute super."accelerate-cuda"; + "accelerate-cufft" = dontDistribute super."accelerate-cufft"; + "accelerate-examples" = dontDistribute super."accelerate-examples"; + "accelerate-fft" = dontDistribute super."accelerate-fft"; + "accelerate-fftw" = dontDistribute super."accelerate-fftw"; + "accelerate-fourier" = dontDistribute super."accelerate-fourier"; + "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark"; + "accelerate-io" = dontDistribute super."accelerate-io"; + "accelerate-random" = dontDistribute super."accelerate-random"; + "accelerate-utility" = dontDistribute super."accelerate-utility"; + "accentuateus" = dontDistribute super."accentuateus"; + "access-time" = dontDistribute super."access-time"; + "acid-state" = doDistribute super."acid-state_0_12_4"; + "acid-state-dist" = dontDistribute super."acid-state-dist"; + "acid-state-tls" = dontDistribute super."acid-state-tls"; + "acl2" = dontDistribute super."acl2"; + "acme-all-monad" = dontDistribute super."acme-all-monad"; + "acme-box" = dontDistribute super."acme-box"; + "acme-cadre" = dontDistribute super."acme-cadre"; + "acme-cofunctor" = dontDistribute super."acme-cofunctor"; + "acme-colosson" = dontDistribute super."acme-colosson"; + "acme-comonad" = dontDistribute super."acme-comonad"; + "acme-cutegirl" = dontDistribute super."acme-cutegirl"; + "acme-dont" = dontDistribute super."acme-dont"; + "acme-flipping-tables" = dontDistribute super."acme-flipping-tables"; + "acme-grawlix" = dontDistribute super."acme-grawlix"; + "acme-hq9plus" = dontDistribute super."acme-hq9plus"; + "acme-http" = dontDistribute super."acme-http"; + "acme-inator" = dontDistribute super."acme-inator"; + "acme-io" = dontDistribute super."acme-io"; + "acme-lolcat" = dontDistribute super."acme-lolcat"; + "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval"; + "acme-memorandom" = dontDistribute super."acme-memorandom"; + "acme-microwave" = dontDistribute super."acme-microwave"; + "acme-miscorder" = dontDistribute super."acme-miscorder"; + "acme-missiles" = dontDistribute super."acme-missiles"; + "acme-now" = dontDistribute super."acme-now"; + "acme-numbersystem" = dontDistribute super."acme-numbersystem"; + "acme-omitted" = dontDistribute super."acme-omitted"; + "acme-one" = dontDistribute super."acme-one"; + "acme-operators" = dontDistribute super."acme-operators"; + "acme-php" = dontDistribute super."acme-php"; + "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers"; + "acme-realworld" = dontDistribute super."acme-realworld"; + "acme-safe" = dontDistribute super."acme-safe"; + "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel"; + "acme-strfry" = dontDistribute super."acme-strfry"; + "acme-stringly-typed" = dontDistribute super."acme-stringly-typed"; + "acme-strtok" = dontDistribute super."acme-strtok"; + "acme-timemachine" = dontDistribute super."acme-timemachine"; + "acme-year" = dontDistribute super."acme-year"; + "acme-zero" = dontDistribute super."acme-zero"; + "activehs" = dontDistribute super."activehs"; + "activehs-base" = dontDistribute super."activehs-base"; + "activitystreams-aeson" = dontDistribute super."activitystreams-aeson"; + "actor" = dontDistribute super."actor"; + "ad" = doDistribute super."ad_4_2_4"; + "adaptive-containers" = dontDistribute super."adaptive-containers"; + "adaptive-tuple" = dontDistribute super."adaptive-tuple"; + "adb" = dontDistribute super."adb"; + "adblock2privoxy" = dontDistribute super."adblock2privoxy"; + "addLicenseInfo" = dontDistribute super."addLicenseInfo"; + "adhoc-network" = dontDistribute super."adhoc-network"; + "adict" = dontDistribute super."adict"; + "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; + "adp-multi" = dontDistribute super."adp-multi"; + "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; + "aeson" = doDistribute super."aeson_0_8_0_2"; + "aeson-applicative" = dontDistribute super."aeson-applicative"; + "aeson-bson" = dontDistribute super."aeson-bson"; + "aeson-casing" = dontDistribute super."aeson-casing"; + "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; + "aeson-lens" = dontDistribute super."aeson-lens"; + "aeson-native" = dontDistribute super."aeson-native"; + "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; + "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7"; + "aeson-serialize" = dontDistribute super."aeson-serialize"; + "aeson-smart" = dontDistribute super."aeson-smart"; + "aeson-streams" = dontDistribute super."aeson-streams"; + "aeson-t" = dontDistribute super."aeson-t"; + "aeson-toolkit" = dontDistribute super."aeson-toolkit"; + "aeson-value-parser" = dontDistribute super."aeson-value-parser"; + "aeson-yak" = dontDistribute super."aeson-yak"; + "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc"; + "afis" = dontDistribute super."afis"; + "afv" = dontDistribute super."afv"; + "agda-server" = dontDistribute super."agda-server"; + "agda-snippets" = dontDistribute super."agda-snippets"; + "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll"; + "agum" = dontDistribute super."agum"; + "aig" = dontDistribute super."aig"; + "air" = dontDistribute super."air"; + "air-extra" = dontDistribute super."air-extra"; + "air-spec" = dontDistribute super."air-spec"; + "air-th" = dontDistribute super."air-th"; + "airbrake" = dontDistribute super."airbrake"; + "airship" = dontDistribute super."airship"; + "aivika" = dontDistribute super."aivika"; + "aivika-experiment" = dontDistribute super."aivika-experiment"; + "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; + "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; + "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams"; + "aivika-transformers" = dontDistribute super."aivika-transformers"; + "ajhc" = dontDistribute super."ajhc"; + "al" = dontDistribute super."al"; + "alea" = dontDistribute super."alea"; + "alex-meta" = dontDistribute super."alex-meta"; + "alfred" = dontDistribute super."alfred"; + "alga" = dontDistribute super."alga"; + "algebra" = dontDistribute super."algebra"; + "algebra-dag" = dontDistribute super."algebra-dag"; + "algebra-sql" = dontDistribute super."algebra-sql"; + "algebraic" = dontDistribute super."algebraic"; + "algebraic-classes" = dontDistribute super."algebraic-classes"; + "align" = dontDistribute super."align"; + "align-text" = dontDistribute super."align-text"; + "aligned-foreignptr" = dontDistribute super."aligned-foreignptr"; + "allocated-processor" = dontDistribute super."allocated-processor"; + "alloy" = dontDistribute super."alloy"; + "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd"; + "almost-fix" = dontDistribute super."almost-fix"; + "alms" = dontDistribute super."alms"; + "alpha" = dontDistribute super."alpha"; + "alpino-tools" = dontDistribute super."alpino-tools"; + "alsa" = dontDistribute super."alsa"; + "alsa-core" = dontDistribute super."alsa-core"; + "alsa-gui" = dontDistribute super."alsa-gui"; + "alsa-midi" = dontDistribute super."alsa-midi"; + "alsa-mixer" = dontDistribute super."alsa-mixer"; + "alsa-pcm" = dontDistribute super."alsa-pcm"; + "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests"; + "alsa-seq" = dontDistribute super."alsa-seq"; + "alsa-seq-tests" = dontDistribute super."alsa-seq-tests"; + "altcomposition" = dontDistribute super."altcomposition"; + "alternative-io" = dontDistribute super."alternative-io"; + "altfloat" = dontDistribute super."altfloat"; + "alure" = dontDistribute super."alure"; + "amazon-emailer" = dontDistribute super."amazon-emailer"; + "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap"; + "amazon-products" = dontDistribute super."amazon-products"; + "amazonka" = doDistribute super."amazonka_0_3_6"; + "amazonka-apigateway" = dontDistribute super."amazonka-apigateway"; + "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_0_3_6"; + "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_0_3_6"; + "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_0_3_6"; + "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_0_3_6"; + "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_0_3_6"; + "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_0_3_6"; + "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_0_3_6"; + "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_0_3_6"; + "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_0_3_6"; + "amazonka-codecommit" = dontDistribute super."amazonka-codecommit"; + "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6"; + "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline"; + "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6"; + "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6"; + "amazonka-config" = doDistribute super."amazonka-config_0_3_6"; + "amazonka-core" = doDistribute super."amazonka-core_0_3_6"; + "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_0_3_6"; + "amazonka-devicefarm" = dontDistribute super."amazonka-devicefarm"; + "amazonka-directconnect" = doDistribute super."amazonka-directconnect_0_3_6"; + "amazonka-ds" = dontDistribute super."amazonka-ds"; + "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_0_3_6"; + "amazonka-dynamodb-streams" = dontDistribute super."amazonka-dynamodb-streams"; + "amazonka-ec2" = doDistribute super."amazonka-ec2_0_3_6_1"; + "amazonka-ecs" = doDistribute super."amazonka-ecs_0_3_6"; + "amazonka-efs" = dontDistribute super."amazonka-efs"; + "amazonka-elasticache" = doDistribute super."amazonka-elasticache_0_3_6"; + "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_0_3_6"; + "amazonka-elasticsearch" = dontDistribute super."amazonka-elasticsearch"; + "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_0_3_6"; + "amazonka-elb" = doDistribute super."amazonka-elb_0_3_6"; + "amazonka-emr" = doDistribute super."amazonka-emr_0_3_6"; + "amazonka-glacier" = doDistribute super."amazonka-glacier_0_3_6"; + "amazonka-iam" = doDistribute super."amazonka-iam_0_3_6"; + "amazonka-importexport" = doDistribute super."amazonka-importexport_0_3_6"; + "amazonka-inspector" = dontDistribute super."amazonka-inspector"; + "amazonka-iot" = dontDistribute super."amazonka-iot"; + "amazonka-iot-dataplane" = dontDistribute super."amazonka-iot-dataplane"; + "amazonka-kinesis" = doDistribute super."amazonka-kinesis_0_3_6"; + "amazonka-kinesis-firehose" = dontDistribute super."amazonka-kinesis-firehose"; + "amazonka-kms" = doDistribute super."amazonka-kms_0_3_6"; + "amazonka-lambda" = doDistribute super."amazonka-lambda_0_3_6"; + "amazonka-marketplace-analytics" = dontDistribute super."amazonka-marketplace-analytics"; + "amazonka-ml" = doDistribute super."amazonka-ml_0_3_6"; + "amazonka-opsworks" = doDistribute super."amazonka-opsworks_0_3_6"; + "amazonka-rds" = doDistribute super."amazonka-rds_0_3_6"; + "amazonka-redshift" = doDistribute super."amazonka-redshift_0_3_6"; + "amazonka-route53" = doDistribute super."amazonka-route53_0_3_6_1"; + "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_0_3_6"; + "amazonka-s3" = doDistribute super."amazonka-s3_0_3_6"; + "amazonka-sdb" = doDistribute super."amazonka-sdb_0_3_6"; + "amazonka-ses" = doDistribute super."amazonka-ses_0_3_6"; + "amazonka-sns" = doDistribute super."amazonka-sns_0_3_6"; + "amazonka-sqs" = doDistribute super."amazonka-sqs_0_3_6"; + "amazonka-ssm" = doDistribute super."amazonka-ssm_0_3_6"; + "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_0_3_6"; + "amazonka-sts" = doDistribute super."amazonka-sts_0_3_6"; + "amazonka-support" = doDistribute super."amazonka-support_0_3_6"; + "amazonka-swf" = doDistribute super."amazonka-swf_0_3_6"; + "amazonka-test" = dontDistribute super."amazonka-test"; + "amazonka-waf" = dontDistribute super."amazonka-waf"; + "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6"; + "ampersand" = dontDistribute super."ampersand"; + "amqp-conduit" = dontDistribute super."amqp-conduit"; + "amrun" = dontDistribute super."amrun"; + "analyze-client" = dontDistribute super."analyze-client"; + "anansi" = dontDistribute super."anansi"; + "anansi-hscolour" = dontDistribute super."anansi-hscolour"; + "anansi-pandoc" = dontDistribute super."anansi-pandoc"; + "anatomy" = dontDistribute super."anatomy"; + "android" = dontDistribute super."android"; + "android-lint-summary" = dontDistribute super."android-lint-summary"; + "animalcase" = dontDistribute super."animalcase"; + "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; + "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests"; + "ansi-pretty" = dontDistribute super."ansi-pretty"; + "ansigraph" = dontDistribute super."ansigraph"; + "antagonist" = dontDistribute super."antagonist"; + "antfarm" = dontDistribute super."antfarm"; + "anticiv" = dontDistribute super."anticiv"; + "antigate" = dontDistribute super."antigate"; + "antimirov" = dontDistribute super."antimirov"; + "antiquoter" = dontDistribute super."antiquoter"; + "antisplice" = dontDistribute super."antisplice"; + "antlrc" = dontDistribute super."antlrc"; + "anydbm" = dontDistribute super."anydbm"; + "aosd" = dontDistribute super."aosd"; + "ap-reflect" = dontDistribute super."ap-reflect"; + "apache-md5" = dontDistribute super."apache-md5"; + "apelsin" = dontDistribute super."apelsin"; + "api-builder" = dontDistribute super."api-builder"; + "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode"; + "api-tools" = dontDistribute super."api-tools"; + "apiary-helics" = dontDistribute super."apiary-helics"; + "apiary-purescript" = dontDistribute super."apiary-purescript"; + "apis" = dontDistribute super."apis"; + "apotiki" = dontDistribute super."apotiki"; + "app-lens" = dontDistribute super."app-lens"; + "app-settings" = dontDistribute super."app-settings"; + "appc" = dontDistribute super."appc"; + "applicative-extras" = dontDistribute super."applicative-extras"; + "applicative-fail" = dontDistribute super."applicative-fail"; + "applicative-numbers" = dontDistribute super."applicative-numbers"; + "applicative-parsec" = dontDistribute super."applicative-parsec"; + "apply-refact" = dontDistribute super."apply-refact"; + "apportionment" = dontDistribute super."apportionment"; + "approx-rand-test" = dontDistribute super."approx-rand-test"; + "approximate-equality" = dontDistribute super."approximate-equality"; + "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; + "arb-fft" = dontDistribute super."arb-fft"; + "arbb-vm" = dontDistribute super."arbb-vm"; + "archive" = dontDistribute super."archive"; + "archiver" = dontDistribute super."archiver"; + "archlinux" = dontDistribute super."archlinux"; + "archlinux-web" = dontDistribute super."archlinux-web"; + "archnews" = dontDistribute super."archnews"; + "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; + "argon" = dontDistribute super."argon"; + "argparser" = dontDistribute super."argparser"; + "arguedit" = dontDistribute super."arguedit"; + "ariadne" = dontDistribute super."ariadne"; + "arion" = dontDistribute super."arion"; + "arith-encode" = dontDistribute super."arith-encode"; + "arithmatic" = dontDistribute super."arithmatic"; + "arithmetic" = dontDistribute super."arithmetic"; + "arithmoi" = dontDistribute super."arithmoi"; + "armada" = dontDistribute super."armada"; + "arpa" = dontDistribute super."arpa"; + "array-forth" = dontDistribute super."array-forth"; + "array-memoize" = dontDistribute super."array-memoize"; + "array-primops" = dontDistribute super."array-primops"; + "array-utils" = dontDistribute super."array-utils"; + "arrow-improve" = dontDistribute super."arrow-improve"; + "arrowapply-utils" = dontDistribute super."arrowapply-utils"; + "arrowp" = dontDistribute super."arrowp"; + "artery" = dontDistribute super."artery"; + "arx" = dontDistribute super."arx"; + "arxiv" = dontDistribute super."arxiv"; + "ascetic" = dontDistribute super."ascetic"; + "ascii" = dontDistribute super."ascii"; + "ascii-progress" = dontDistribute super."ascii-progress"; + "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; + "ascii85-conduit" = dontDistribute super."ascii85-conduit"; + "asic" = dontDistribute super."asic"; + "asil" = dontDistribute super."asil"; + "asn1-data" = dontDistribute super."asn1-data"; + "asn1dump" = dontDistribute super."asn1dump"; + "assembler" = dontDistribute super."assembler"; + "assert" = dontDistribute super."assert"; + "assert-failure" = dontDistribute super."assert-failure"; + "assertions" = dontDistribute super."assertions"; + "assimp" = dontDistribute super."assimp"; + "astar" = dontDistribute super."astar"; + "astrds" = dontDistribute super."astrds"; + "astview" = dontDistribute super."astview"; + "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; + "async-extras" = dontDistribute super."async-extras"; + "async-manager" = dontDistribute super."async-manager"; + "async-pool" = dontDistribute super."async-pool"; + "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions"; + "aterm" = dontDistribute super."aterm"; + "aterm-utils" = dontDistribute super."aterm-utils"; + "atl" = dontDistribute super."atl"; + "atlassian-connect-core" = dontDistribute super."atlassian-connect-core"; + "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor"; + "atmos" = dontDistribute super."atmos"; + "atmos-dimensional" = dontDistribute super."atmos-dimensional"; + "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf"; + "atom" = dontDistribute super."atom"; + "atom-basic" = dontDistribute super."atom-basic"; + "atom-conduit" = dontDistribute super."atom-conduit"; + "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; + "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; + "atomic-write" = dontDistribute super."atomic-write"; + "atomo" = dontDistribute super."atomo"; + "atp-haskell" = dontDistribute super."atp-haskell"; + "attempt" = dontDistribute super."attempt"; + "atto-lisp" = dontDistribute super."atto-lisp"; + "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; + "attoparsec-arff" = dontDistribute super."attoparsec-arff"; + "attoparsec-binary" = dontDistribute super."attoparsec-binary"; + "attoparsec-conduit" = dontDistribute super."attoparsec-conduit"; + "attoparsec-csv" = dontDistribute super."attoparsec-csv"; + "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee"; + "attoparsec-parsec" = dontDistribute super."attoparsec-parsec"; + "attoparsec-text" = dontDistribute super."attoparsec-text"; + "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator"; + "attosplit" = dontDistribute super."attosplit"; + "atuin" = dontDistribute super."atuin"; + "audacity" = dontDistribute super."audacity"; + "audiovisual" = dontDistribute super."audiovisual"; + "augeas" = dontDistribute super."augeas"; + "augur" = dontDistribute super."augur"; + "aur" = dontDistribute super."aur"; + "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; + "authenticate-ldap" = dontDistribute super."authenticate-ldap"; + "authinfo-hs" = dontDistribute super."authinfo-hs"; + "authoring" = dontDistribute super."authoring"; + "autonix-deps" = dontDistribute super."autonix-deps"; + "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; + "autoproc" = dontDistribute super."autoproc"; + "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; + "average" = dontDistribute super."average"; + "avers" = dontDistribute super."avers"; + "avl-static" = dontDistribute super."avl-static"; + "avr-shake" = dontDistribute super."avr-shake"; + "awesomium" = dontDistribute super."awesomium"; + "awesomium-glut" = dontDistribute super."awesomium-glut"; + "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws" = doDistribute super."aws_0_12_1"; + "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; + "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; + "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; + "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams"; + "aws-ec2" = dontDistribute super."aws-ec2"; + "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder"; + "aws-general" = dontDistribute super."aws-general"; + "aws-kinesis" = dontDistribute super."aws-kinesis"; + "aws-kinesis-client" = dontDistribute super."aws-kinesis-client"; + "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard"; + "aws-lambda" = dontDistribute super."aws-lambda"; + "aws-performance-tests" = dontDistribute super."aws-performance-tests"; + "aws-route53" = dontDistribute super."aws-route53"; + "aws-sdk" = dontDistribute super."aws-sdk"; + "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter"; + "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered"; + "aws-sign4" = dontDistribute super."aws-sign4"; + "aws-sns" = dontDistribute super."aws-sns"; + "azure-acs" = dontDistribute super."azure-acs"; + "azure-service-api" = dontDistribute super."azure-service-api"; + "azure-servicebus" = dontDistribute super."azure-servicebus"; + "azurify" = dontDistribute super."azurify"; + "b-tree" = dontDistribute super."b-tree"; + "babylon" = dontDistribute super."babylon"; + "backdropper" = dontDistribute super."backdropper"; + "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; + "backward-state" = dontDistribute super."backward-state"; + "bacteria" = dontDistribute super."bacteria"; + "bag" = dontDistribute super."bag"; + "bamboo" = dontDistribute super."bamboo"; + "bamboo-launcher" = dontDistribute super."bamboo-launcher"; + "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight"; + "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo"; + "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint"; + "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5"; + "bamse" = dontDistribute super."bamse"; + "bamstats" = dontDistribute super."bamstats"; + "bank-holiday-usa" = dontDistribute super."bank-holiday-usa"; + "banwords" = dontDistribute super."banwords"; + "barchart" = dontDistribute super."barchart"; + "barcodes-code128" = dontDistribute super."barcodes-code128"; + "barecheck" = dontDistribute super."barecheck"; + "barley" = dontDistribute super."barley"; + "barrie" = dontDistribute super."barrie"; + "barrier" = dontDistribute super."barrier"; + "barrier-monad" = dontDistribute super."barrier-monad"; + "base-generics" = dontDistribute super."base-generics"; + "base-io-access" = dontDistribute super."base-io-access"; + "base-noprelude" = dontDistribute super."base-noprelude"; + "base32-bytestring" = dontDistribute super."base32-bytestring"; + "base58-bytestring" = dontDistribute super."base58-bytestring"; + "base58address" = dontDistribute super."base58address"; + "base64-conduit" = dontDistribute super."base64-conduit"; + "base91" = dontDistribute super."base91"; + "basex-client" = dontDistribute super."basex-client"; + "bash" = dontDistribute super."bash"; + "basic-lens" = dontDistribute super."basic-lens"; + "basic-sop" = dontDistribute super."basic-sop"; + "baskell" = dontDistribute super."baskell"; + "battlenet" = dontDistribute super."battlenet"; + "battlenet-yesod" = dontDistribute super."battlenet-yesod"; + "battleships" = dontDistribute super."battleships"; + "bayes-stack" = dontDistribute super."bayes-stack"; + "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; + "bcrypt" = doDistribute super."bcrypt_0_0_6"; + "bdd" = dontDistribute super."bdd"; + "bdelta" = dontDistribute super."bdelta"; + "bdo" = dontDistribute super."bdo"; + "beamable" = dontDistribute super."beamable"; + "beautifHOL" = dontDistribute super."beautifHOL"; + "bed-and-breakfast" = dontDistribute super."bed-and-breakfast"; + "bein" = dontDistribute super."bein"; + "benchmark-function" = dontDistribute super."benchmark-function"; + "benchpress" = dontDistribute super."benchpress"; + "bencoding" = dontDistribute super."bencoding"; + "berkeleydb" = dontDistribute super."berkeleydb"; + "berp" = dontDistribute super."berp"; + "bert" = dontDistribute super."bert"; + "besout" = dontDistribute super."besout"; + "bet" = dontDistribute super."bet"; + "betacode" = dontDistribute super."betacode"; + "between" = dontDistribute super."between"; + "bf-cata" = dontDistribute super."bf-cata"; + "bff" = dontDistribute super."bff"; + "bff-mono" = dontDistribute super."bff-mono"; + "bgmax" = dontDistribute super."bgmax"; + "bgzf" = dontDistribute super."bgzf"; + "bibtex" = dontDistribute super."bibtex"; + "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; + "bidispec" = dontDistribute super."bidispec"; + "bidispec-extras" = dontDistribute super."bidispec-extras"; + "billboard-parser" = dontDistribute super."billboard-parser"; + "billeksah-forms" = dontDistribute super."billeksah-forms"; + "billeksah-main" = dontDistribute super."billeksah-main"; + "billeksah-main-static" = dontDistribute super."billeksah-main-static"; + "billeksah-pane" = dontDistribute super."billeksah-pane"; + "billeksah-services" = dontDistribute super."billeksah-services"; + "bimap" = dontDistribute super."bimap"; + "bimap-server" = dontDistribute super."bimap-server"; + "bimaps" = dontDistribute super."bimaps"; + "binary-bits" = dontDistribute super."binary-bits"; + "binary-communicator" = dontDistribute super."binary-communicator"; + "binary-derive" = dontDistribute super."binary-derive"; + "binary-enum" = dontDistribute super."binary-enum"; + "binary-file" = dontDistribute super."binary-file"; + "binary-generic" = dontDistribute super."binary-generic"; + "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; + "binary-literal-qq" = dontDistribute super."binary-literal-qq"; + "binary-parser" = dontDistribute super."binary-parser"; + "binary-protocol" = dontDistribute super."binary-protocol"; + "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-shared" = dontDistribute super."binary-shared"; + "binary-state" = dontDistribute super."binary-state"; + "binary-store" = dontDistribute super."binary-store"; + "binary-streams" = dontDistribute super."binary-streams"; + "binary-strict" = dontDistribute super."binary-strict"; + "binary-typed" = dontDistribute super."binary-typed"; + "binarydefer" = dontDistribute super."binarydefer"; + "bind-marshal" = dontDistribute super."bind-marshal"; + "binding-core" = dontDistribute super."binding-core"; + "binding-gtk" = dontDistribute super."binding-gtk"; + "binding-wx" = dontDistribute super."binding-wx"; + "bindings" = dontDistribute super."bindings"; + "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = dontDistribute super."bindings-GLFW"; + "bindings-K8055" = dontDistribute super."bindings-K8055"; + "bindings-apr" = dontDistribute super."bindings-apr"; + "bindings-apr-util" = dontDistribute super."bindings-apr-util"; + "bindings-audiofile" = dontDistribute super."bindings-audiofile"; + "bindings-bfd" = dontDistribute super."bindings-bfd"; + "bindings-cctools" = dontDistribute super."bindings-cctools"; + "bindings-codec2" = dontDistribute super."bindings-codec2"; + "bindings-common" = dontDistribute super."bindings-common"; + "bindings-dc1394" = dontDistribute super."bindings-dc1394"; + "bindings-directfb" = dontDistribute super."bindings-directfb"; + "bindings-eskit" = dontDistribute super."bindings-eskit"; + "bindings-fann" = dontDistribute super."bindings-fann"; + "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth"; + "bindings-friso" = dontDistribute super."bindings-friso"; + "bindings-glib" = dontDistribute super."bindings-glib"; + "bindings-gobject" = dontDistribute super."bindings-gobject"; + "bindings-gpgme" = dontDistribute super."bindings-gpgme"; + "bindings-gsl" = dontDistribute super."bindings-gsl"; + "bindings-gts" = dontDistribute super."bindings-gts"; + "bindings-hamlib" = dontDistribute super."bindings-hamlib"; + "bindings-hdf5" = dontDistribute super."bindings-hdf5"; + "bindings-levmar" = dontDistribute super."bindings-levmar"; + "bindings-libcddb" = dontDistribute super."bindings-libcddb"; + "bindings-libffi" = dontDistribute super."bindings-libffi"; + "bindings-libftdi" = dontDistribute super."bindings-libftdi"; + "bindings-librrd" = dontDistribute super."bindings-librrd"; + "bindings-libstemmer" = dontDistribute super."bindings-libstemmer"; + "bindings-libusb" = dontDistribute super."bindings-libusb"; + "bindings-libv4l2" = dontDistribute super."bindings-libv4l2"; + "bindings-libzip" = dontDistribute super."bindings-libzip"; + "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2"; + "bindings-lxc" = dontDistribute super."bindings-lxc"; + "bindings-mmap" = dontDistribute super."bindings-mmap"; + "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal"; + "bindings-nettle" = dontDistribute super."bindings-nettle"; + "bindings-parport" = dontDistribute super."bindings-parport"; + "bindings-portaudio" = dontDistribute super."bindings-portaudio"; + "bindings-posix" = dontDistribute super."bindings-posix"; + "bindings-potrace" = dontDistribute super."bindings-potrace"; + "bindings-ppdev" = dontDistribute super."bindings-ppdev"; + "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd"; + "bindings-sane" = dontDistribute super."bindings-sane"; + "bindings-sc3" = dontDistribute super."bindings-sc3"; + "bindings-sipc" = dontDistribute super."bindings-sipc"; + "bindings-sophia" = dontDistribute super."bindings-sophia"; + "bindings-sqlite3" = dontDistribute super."bindings-sqlite3"; + "bindings-svm" = dontDistribute super."bindings-svm"; + "bindings-uname" = dontDistribute super."bindings-uname"; + "bindings-yices" = dontDistribute super."bindings-yices"; + "bindynamic" = dontDistribute super."bindynamic"; + "binembed" = dontDistribute super."binembed"; + "binembed-example" = dontDistribute super."binembed-example"; + "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; + "biophd" = dontDistribute super."biophd"; + "biosff" = dontDistribute super."biosff"; + "biostockholm" = dontDistribute super."biostockholm"; + "bird" = dontDistribute super."bird"; + "bit-array" = dontDistribute super."bit-array"; + "bit-vector" = dontDistribute super."bit-vector"; + "bitarray" = dontDistribute super."bitarray"; + "bitcoin-rpc" = dontDistribute super."bitcoin-rpc"; + "bitly-cli" = dontDistribute super."bitly-cli"; + "bitmap" = dontDistribute super."bitmap"; + "bitmap-opengl" = dontDistribute super."bitmap-opengl"; + "bitmaps" = dontDistribute super."bitmaps"; + "bits-atomic" = dontDistribute super."bits-atomic"; + "bits-conduit" = dontDistribute super."bits-conduit"; + "bits-extras" = dontDistribute super."bits-extras"; + "bitset" = dontDistribute super."bitset"; + "bitspeak" = dontDistribute super."bitspeak"; + "bitstream" = dontDistribute super."bitstream"; + "bitstring" = dontDistribute super."bitstring"; + "bittorrent" = dontDistribute super."bittorrent"; + "bitvec" = dontDistribute super."bitvec"; + "bitx-bitcoin" = dontDistribute super."bitx-bitcoin"; + "bk-tree" = dontDistribute super."bk-tree"; + "bkr" = dontDistribute super."bkr"; + "bktrees" = dontDistribute super."bktrees"; + "bla" = dontDistribute super."bla"; + "black-jewel" = dontDistribute super."black-jewel"; + "blacktip" = dontDistribute super."blacktip"; + "blake2" = dontDistribute super."blake2"; + "blakesum" = dontDistribute super."blakesum"; + "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = dontDistribute super."blank-canvas"; + "blas" = dontDistribute super."blas"; + "blas-hs" = dontDistribute super."blas-hs"; + "blaze" = dontDistribute super."blaze"; + "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; + "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; + "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; + "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; + "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; + "blaze-json" = dontDistribute super."blaze-json"; + "blaze-shields" = dontDistribute super."blaze-shields"; + "blaze-textual-native" = dontDistribute super."blaze-textual-native"; + "blazeMarker" = dontDistribute super."blazeMarker"; + "blink1" = dontDistribute super."blink1"; + "blip" = dontDistribute super."blip"; + "bliplib" = dontDistribute super."bliplib"; + "blocking-transactions" = dontDistribute super."blocking-transactions"; + "blogination" = dontDistribute super."blogination"; + "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; + "bloxorz" = dontDistribute super."bloxorz"; + "blubber" = dontDistribute super."blubber"; + "blubber-server" = dontDistribute super."blubber-server"; + "bluetile" = dontDistribute super."bluetile"; + "bluetileutils" = dontDistribute super."bluetileutils"; + "blunt" = dontDistribute super."blunt"; + "board-games" = dontDistribute super."board-games"; + "bogre-banana" = dontDistribute super."bogre-banana"; + "boolean-list" = dontDistribute super."boolean-list"; + "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; + "boolexpr" = dontDistribute super."boolexpr"; + "bools" = dontDistribute super."bools"; + "boolsimplifier" = dontDistribute super."boolsimplifier"; + "boomange" = dontDistribute super."boomange"; + "boomerang" = dontDistribute super."boomerang"; + "boomslang" = dontDistribute super."boomslang"; + "borel" = dontDistribute super."borel"; + "bot" = dontDistribute super."bot"; + "both" = dontDistribute super."both"; + "botpp" = dontDistribute super."botpp"; + "bound-gen" = dontDistribute super."bound-gen"; + "bounded-tchan" = dontDistribute super."bounded-tchan"; + "boundingboxes" = dontDistribute super."boundingboxes"; + "bpann" = dontDistribute super."bpann"; + "brainfuck-monad" = dontDistribute super."brainfuck-monad"; + "brainfuck-tut" = dontDistribute super."brainfuck-tut"; + "break" = dontDistribute super."break"; + "breakout" = dontDistribute super."breakout"; + "breve" = dontDistribute super."breve"; + "brians-brain" = dontDistribute super."brians-brain"; + "brick" = dontDistribute super."brick"; + "brillig" = dontDistribute super."brillig"; + "broccoli" = dontDistribute super."broccoli"; + "broker-haskell" = dontDistribute super."broker-haskell"; + "bsd-sysctl" = dontDistribute super."bsd-sysctl"; + "bson-generic" = dontDistribute super."bson-generic"; + "bson-generics" = dontDistribute super."bson-generics"; + "bson-lens" = dontDistribute super."bson-lens"; + "bson-mapping" = dontDistribute super."bson-mapping"; + "bspack" = dontDistribute super."bspack"; + "bsparse" = dontDistribute super."bsparse"; + "btree-concurrent" = dontDistribute super."btree-concurrent"; + "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson"; + "buffon" = dontDistribute super."buffon"; + "bugzilla" = dontDistribute super."bugzilla"; + "buildable" = dontDistribute super."buildable"; + "buildbox" = dontDistribute super."buildbox"; + "buildbox-tools" = dontDistribute super."buildbox-tools"; + "buildwrapper" = dontDistribute super."buildwrapper"; + "bullet" = dontDistribute super."bullet"; + "burst-detection" = dontDistribute super."burst-detection"; + "bus-pirate" = dontDistribute super."bus-pirate"; + "buster" = dontDistribute super."buster"; + "buster-gtk" = dontDistribute super."buster-gtk"; + "buster-network" = dontDistribute super."buster-network"; + "bustle" = dontDistribute super."bustle"; + "bv" = dontDistribute super."bv"; + "byline" = dontDistribute super."byline"; + "bytable" = dontDistribute super."bytable"; + "byteset" = dontDistribute super."byteset"; + "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; + "bytestring-class" = dontDistribute super."bytestring-class"; + "bytestring-csv" = dontDistribute super."bytestring-csv"; + "bytestring-delta" = dontDistribute super."bytestring-delta"; + "bytestring-from" = dontDistribute super."bytestring-from"; + "bytestring-nums" = dontDistribute super."bytestring-nums"; + "bytestring-plain" = dontDistribute super."bytestring-plain"; + "bytestring-rematch" = dontDistribute super."bytestring-rematch"; + "bytestring-short" = dontDistribute super."bytestring-short"; + "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; + "bytestringparser" = dontDistribute super."bytestringparser"; + "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; + "bytestringreadp" = dontDistribute super."bytestringreadp"; + "c-dsl" = dontDistribute super."c-dsl"; + "c-io" = dontDistribute super."c-io"; + "c-storable-deriving" = dontDistribute super."c-storable-deriving"; + "c0check" = dontDistribute super."c0check"; + "c0parser" = dontDistribute super."c0parser"; + "c10k" = dontDistribute super."c10k"; + "c2hs" = doDistribute super."c2hs_0_25_2"; + "c2hsc" = dontDistribute super."c2hsc"; + "cab" = dontDistribute super."cab"; + "cabal-audit" = dontDistribute super."cabal-audit"; + "cabal-bounds" = dontDistribute super."cabal-bounds"; + "cabal-cargs" = dontDistribute super."cabal-cargs"; + "cabal-constraints" = dontDistribute super."cabal-constraints"; + "cabal-db" = dontDistribute super."cabal-db"; + "cabal-debian" = doDistribute super."cabal-debian_4_30_2"; + "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses"; + "cabal-dev" = dontDistribute super."cabal-dev"; + "cabal-dir" = dontDistribute super."cabal-dir"; + "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags"; + "cabal-ghci" = dontDistribute super."cabal-ghci"; + "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; + "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; + "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; + "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; + "cabal-lenses" = dontDistribute super."cabal-lenses"; + "cabal-macosx" = dontDistribute super."cabal-macosx"; + "cabal-meta" = dontDistribute super."cabal-meta"; + "cabal-mon" = dontDistribute super."cabal-mon"; + "cabal-nirvana" = dontDistribute super."cabal-nirvana"; + "cabal-progdeps" = dontDistribute super."cabal-progdeps"; + "cabal-query" = dontDistribute super."cabal-query"; + "cabal-scripts" = dontDistribute super."cabal-scripts"; + "cabal-setup" = dontDistribute super."cabal-setup"; + "cabal-sign" = dontDistribute super."cabal-sign"; + "cabal-sort" = dontDistribute super."cabal-sort"; + "cabal-test" = dontDistribute super."cabal-test"; + "cabal-test-bin" = dontDistribute super."cabal-test-bin"; + "cabal-test-compat" = dontDistribute super."cabal-test-compat"; + "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck"; + "cabal-uninstall" = dontDistribute super."cabal-uninstall"; + "cabal-upload" = dontDistribute super."cabal-upload"; + "cabal2arch" = dontDistribute super."cabal2arch"; + "cabal2doap" = dontDistribute super."cabal2doap"; + "cabal2ebuild" = dontDistribute super."cabal2ebuild"; + "cabal2ghci" = dontDistribute super."cabal2ghci"; + "cabal2nix" = dontDistribute super."cabal2nix"; + "cabal2spec" = dontDistribute super."cabal2spec"; + "cabalQuery" = dontDistribute super."cabalQuery"; + "cabalg" = dontDistribute super."cabalg"; + "cabalgraph" = dontDistribute super."cabalgraph"; + "cabalmdvrpm" = dontDistribute super."cabalmdvrpm"; + "cabalrpmdeps" = dontDistribute super."cabalrpmdeps"; + "cabalvchk" = dontDistribute super."cabalvchk"; + "cabin" = dontDistribute super."cabin"; + "cabocha" = dontDistribute super."cabocha"; + "cached-io" = dontDistribute super."cached-io"; + "cached-traversable" = dontDistribute super."cached-traversable"; + "cacophony" = dontDistribute super."cacophony"; + "caf" = dontDistribute super."caf"; + "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; + "caffegraph" = dontDistribute super."caffegraph"; + "cairo-appbase" = dontDistribute super."cairo-appbase"; + "cake" = dontDistribute super."cake"; + "cake3" = dontDistribute super."cake3"; + "cakyrespa" = dontDistribute super."cakyrespa"; + "cal3d" = dontDistribute super."cal3d"; + "cal3d-examples" = dontDistribute super."cal3d-examples"; + "cal3d-opengl" = dontDistribute super."cal3d-opengl"; + "calc" = dontDistribute super."calc"; + "calculator" = dontDistribute super."calculator"; + "caldims" = dontDistribute super."caldims"; + "caledon" = dontDistribute super."caledon"; + "call" = dontDistribute super."call"; + "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything"; + "camh" = dontDistribute super."camh"; + "campfire" = dontDistribute super."campfire"; + "canonical-filepath" = dontDistribute super."canonical-filepath"; + "canteven-config" = dontDistribute super."canteven-config"; + "canteven-log" = dontDistribute super."canteven-log"; + "cantor" = dontDistribute super."cantor"; + "cao" = dontDistribute super."cao"; + "cap" = dontDistribute super."cap"; + "capped-list" = dontDistribute super."capped-list"; + "capri" = dontDistribute super."capri"; + "car-pool" = dontDistribute super."car-pool"; + "caramia" = dontDistribute super."caramia"; + "carboncopy" = dontDistribute super."carboncopy"; + "carettah" = dontDistribute super."carettah"; + "carray" = dontDistribute super."carray"; + "casadi-bindings" = dontDistribute super."casadi-bindings"; + "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; + "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; + "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal"; + "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface"; + "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface"; + "cascading" = dontDistribute super."cascading"; + "case-conversion" = dontDistribute super."case-conversion"; + "cased" = dontDistribute super."cased"; + "cash" = dontDistribute super."cash"; + "casing" = dontDistribute super."casing"; + "cassandra-cql" = dontDistribute super."cassandra-cql"; + "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava-conduit" = dontDistribute super."cassava-conduit"; + "cassava-streams" = dontDistribute super."cassava-streams"; + "cassette" = dontDistribute super."cassette"; + "cassy" = dontDistribute super."cassy"; + "castle" = dontDistribute super."castle"; + "casui" = dontDistribute super."casui"; + "catamorphism" = dontDistribute super."catamorphism"; + "catch-fd" = dontDistribute super."catch-fd"; + "categorical-algebra" = dontDistribute super."categorical-algebra"; + "categories" = dontDistribute super."categories"; + "category-extras" = dontDistribute super."category-extras"; + "cayley-dickson" = dontDistribute super."cayley-dickson"; + "cblrepo" = dontDistribute super."cblrepo"; + "cci" = dontDistribute super."cci"; + "ccnx" = dontDistribute super."ccnx"; + "cctools-workqueue" = dontDistribute super."cctools-workqueue"; + "cedict" = dontDistribute super."cedict"; + "cef" = dontDistribute super."cef"; + "ceilometer-common" = dontDistribute super."ceilometer-common"; + "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-derive" = dontDistribute super."cereal-derive"; + "cereal-enumerator" = dontDistribute super."cereal-enumerator"; + "cereal-ieee754" = dontDistribute super."cereal-ieee754"; + "cereal-plus" = dontDistribute super."cereal-plus"; + "cereal-text" = dontDistribute super."cereal-text"; + "certificate" = dontDistribute super."certificate"; + "cf" = dontDistribute super."cf"; + "cfipu" = dontDistribute super."cfipu"; + "cflp" = dontDistribute super."cflp"; + "cfopu" = dontDistribute super."cfopu"; + "cg" = dontDistribute super."cg"; + "cgen" = dontDistribute super."cgen"; + "cgi-undecidable" = dontDistribute super."cgi-undecidable"; + "cgi-utils" = dontDistribute super."cgi-utils"; + "cgrep" = dontDistribute super."cgrep"; + "chain-codes" = dontDistribute super."chain-codes"; + "chalk" = dontDistribute super."chalk"; + "chalkboard" = dontDistribute super."chalkboard"; + "chalkboard-viewer" = dontDistribute super."chalkboard-viewer"; + "chalmers-lava2000" = dontDistribute super."chalmers-lava2000"; + "chan-split" = dontDistribute super."chan-split"; + "change-monger" = dontDistribute super."change-monger"; + "charade" = dontDistribute super."charade"; + "charsetdetect" = dontDistribute super."charsetdetect"; + "charsetdetect-ae" = dontDistribute super."charsetdetect-ae"; + "chart-histogram" = dontDistribute super."chart-histogram"; + "chaselev-deque" = dontDistribute super."chaselev-deque"; + "chatter" = dontDistribute super."chatter"; + "chatty" = dontDistribute super."chatty"; + "chatty-text" = dontDistribute super."chatty-text"; + "chatty-utils" = dontDistribute super."chatty-utils"; + "cheapskate" = dontDistribute super."cheapskate"; + "check-pvp" = dontDistribute super."check-pvp"; + "checked" = dontDistribute super."checked"; + "chell-hunit" = dontDistribute super."chell-hunit"; + "chesshs" = dontDistribute super."chesshs"; + "chevalier-common" = dontDistribute super."chevalier-common"; + "chp" = dontDistribute super."chp"; + "chp-mtl" = dontDistribute super."chp-mtl"; + "chp-plus" = dontDistribute super."chp-plus"; + "chp-spec" = dontDistribute super."chp-spec"; + "chp-transformers" = dontDistribute super."chp-transformers"; + "chronograph" = dontDistribute super."chronograph"; + "chu2" = dontDistribute super."chu2"; + "chuchu" = dontDistribute super."chuchu"; + "chunks" = dontDistribute super."chunks"; + "chunky" = dontDistribute super."chunky"; + "church-list" = dontDistribute super."church-list"; + "cil" = dontDistribute super."cil"; + "cinvoke" = dontDistribute super."cinvoke"; + "cio" = dontDistribute super."cio"; + "cipher-rc5" = dontDistribute super."cipher-rc5"; + "ciphersaber2" = dontDistribute super."ciphersaber2"; + "circ" = dontDistribute super."circ"; + "cirru-parser" = dontDistribute super."cirru-parser"; + "citation-resolve" = dontDistribute super."citation-resolve"; + "citeproc-hs" = dontDistribute super."citeproc-hs"; + "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter"; + "cityhash" = dontDistribute super."cityhash"; + "cjk" = dontDistribute super."cjk"; + "clac" = dontDistribute super."clac"; + "clafer" = dontDistribute super."clafer"; + "claferIG" = dontDistribute super."claferIG"; + "claferwiki" = dontDistribute super."claferwiki"; + "clang-pure" = dontDistribute super."clang-pure"; + "clanki" = dontDistribute super."clanki"; + "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_5_15"; + "clash-lib" = doDistribute super."clash-lib_0_5_13"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_3"; + "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_10"; + "clash-verilog" = doDistribute super."clash-verilog_0_5_10"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12"; + "classify" = dontDistribute super."classify"; + "classy-parallel" = dontDistribute super."classy-parallel"; + "clckwrks" = dontDistribute super."clckwrks"; + "clckwrks-cli" = dontDistribute super."clckwrks-cli"; + "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; + "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; + "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; + "clckwrks-plugin-media" = dontDistribute super."clckwrks-plugin-media"; + "clckwrks-plugin-page" = dontDistribute super."clckwrks-plugin-page"; + "clckwrks-theme-bootstrap" = dontDistribute super."clckwrks-theme-bootstrap"; + "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks"; + "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap"; + "cld2" = dontDistribute super."cld2"; + "clean-home" = dontDistribute super."clean-home"; + "clean-unions" = dontDistribute super."clean-unions"; + "cless" = dontDistribute super."cless"; + "clevercss" = dontDistribute super."clevercss"; + "cli" = dontDistribute super."cli"; + "click-clack" = dontDistribute super."click-clack"; + "clifford" = dontDistribute super."clifford"; + "clippard" = dontDistribute super."clippard"; + "clipper" = dontDistribute super."clipper"; + "clippings" = dontDistribute super."clippings"; + "clist" = dontDistribute super."clist"; + "clocked" = dontDistribute super."clocked"; + "clogparse" = dontDistribute super."clogparse"; + "clone-all" = dontDistribute super."clone-all"; + "closure" = dontDistribute super."closure"; + "cloud-haskell" = dontDistribute super."cloud-haskell"; + "cloudfront-signer" = dontDistribute super."cloudfront-signer"; + "cloudyfs" = dontDistribute super."cloudyfs"; + "cltw" = dontDistribute super."cltw"; + "clua" = dontDistribute super."clua"; + "cluss" = dontDistribute super."cluss"; + "clustertools" = dontDistribute super."clustertools"; + "clutterhs" = dontDistribute super."clutterhs"; + "cmaes" = dontDistribute super."cmaes"; + "cmath" = dontDistribute super."cmath"; + "cmathml3" = dontDistribute super."cmathml3"; + "cmd-item" = dontDistribute super."cmd-item"; + "cmdargs-browser" = dontDistribute super."cmdargs-browser"; + "cmdlib" = dontDistribute super."cmdlib"; + "cmdtheline" = dontDistribute super."cmdtheline"; + "cml" = dontDistribute super."cml"; + "cmonad" = dontDistribute super."cmonad"; + "cmu" = dontDistribute super."cmu"; + "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler"; + "cndict" = dontDistribute super."cndict"; + "codec" = dontDistribute super."codec"; + "codec-libevent" = dontDistribute super."codec-libevent"; + "codec-mbox" = dontDistribute super."codec-mbox"; + "codecov-haskell" = dontDistribute super."codecov-haskell"; + "codemonitor" = dontDistribute super."codemonitor"; + "codepad" = dontDistribute super."codepad"; + "codex" = doDistribute super."codex_0_3_0_10"; + "codo-notation" = dontDistribute super."codo-notation"; + "cofunctor" = dontDistribute super."cofunctor"; + "cognimeta-utils" = dontDistribute super."cognimeta-utils"; + "coinbase-exchange" = dontDistribute super."coinbase-exchange"; + "colada" = dontDistribute super."colada"; + "colchis" = dontDistribute super."colchis"; + "collada-output" = dontDistribute super."collada-output"; + "collada-types" = dontDistribute super."collada-types"; + "collapse-util" = dontDistribute super."collapse-util"; + "collection-json" = dontDistribute super."collection-json"; + "collections" = dontDistribute super."collections"; + "collections-api" = dontDistribute super."collections-api"; + "collections-base-instances" = dontDistribute super."collections-base-instances"; + "colock" = dontDistribute super."colock"; + "colorize-haskell" = dontDistribute super."colorize-haskell"; + "colors" = dontDistribute super."colors"; + "coltrane" = dontDistribute super."coltrane"; + "com" = dontDistribute super."com"; + "combinat" = dontDistribute super."combinat"; + "combinat-diagrams" = dontDistribute super."combinat-diagrams"; + "combinator-interactive" = dontDistribute super."combinator-interactive"; + "combinatorial-problems" = dontDistribute super."combinatorial-problems"; + "combinatorics" = dontDistribute super."combinatorics"; + "combobuffer" = dontDistribute super."combobuffer"; + "comfort-graph" = dontDistribute super."comfort-graph"; + "command" = dontDistribute super."command"; + "command-qq" = dontDistribute super."command-qq"; + "commodities" = dontDistribute super."commodities"; + "commsec" = dontDistribute super."commsec"; + "commsec-keyexchange" = dontDistribute super."commsec-keyexchange"; + "commutative" = dontDistribute super."commutative"; + "comonad-extras" = dontDistribute super."comonad-extras"; + "comonad-random" = dontDistribute super."comonad-random"; + "compact-map" = dontDistribute super."compact-map"; + "compact-socket" = dontDistribute super."compact-socket"; + "compact-string" = dontDistribute super."compact-string"; + "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; + "compare-type" = dontDistribute super."compare-type"; + "compdata-automata" = dontDistribute super."compdata-automata"; + "compdata-dags" = dontDistribute super."compdata-dags"; + "compdata-param" = dontDistribute super."compdata-param"; + "compensated" = dontDistribute super."compensated"; + "competition" = dontDistribute super."competition"; + "compilation" = dontDistribute super."compilation"; + "complex-generic" = dontDistribute super."complex-generic"; + "complex-integrate" = dontDistribute super."complex-integrate"; + "complexity" = dontDistribute super."complexity"; + "compose-ltr" = dontDistribute super."compose-ltr"; + "compose-trans" = dontDistribute super."compose-trans"; + "composition-extra" = doDistribute super."composition-extra_1_1_0"; + "composition-tree" = dontDistribute super."composition-tree"; + "compression" = dontDistribute super."compression"; + "compstrat" = dontDistribute super."compstrat"; + "comptrans" = dontDistribute super."comptrans"; + "computational-algebra" = dontDistribute super."computational-algebra"; + "computations" = dontDistribute super."computations"; + "conceit" = dontDistribute super."conceit"; + "concorde" = dontDistribute super."concorde"; + "concraft" = dontDistribute super."concraft"; + "concraft-hr" = dontDistribute super."concraft-hr"; + "concraft-pl" = dontDistribute super."concraft-pl"; + "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser"; + "concrete-typerep" = dontDistribute super."concrete-typerep"; + "concurrent-barrier" = dontDistribute super."concurrent-barrier"; + "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache"; + "concurrent-machines" = dontDistribute super."concurrent-machines"; + "concurrent-output" = dontDistribute super."concurrent-output"; + "concurrent-sa" = dontDistribute super."concurrent-sa"; + "concurrent-split" = dontDistribute super."concurrent-split"; + "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-utilities" = dontDistribute super."concurrent-utilities"; + "concurrentoutput" = dontDistribute super."concurrentoutput"; + "condor" = dontDistribute super."condor"; + "condorcet" = dontDistribute super."condorcet"; + "conductive-base" = dontDistribute super."conductive-base"; + "conductive-clock" = dontDistribute super."conductive-clock"; + "conductive-hsc3" = dontDistribute super."conductive-hsc3"; + "conductive-song" = dontDistribute super."conductive-song"; + "conduit-audio" = dontDistribute super."conduit-audio"; + "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; + "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; + "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-network-stream" = dontDistribute super."conduit-network-stream"; + "conduit-parse" = dontDistribute super."conduit-parse"; + "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; + "conf" = dontDistribute super."conf"; + "config-select" = dontDistribute super."config-select"; + "config-value" = dontDistribute super."config-value"; + "configifier" = dontDistribute super."configifier"; + "configuration" = dontDistribute super."configuration"; + "configuration-tools" = dontDistribute super."configuration-tools"; + "confsolve" = dontDistribute super."confsolve"; + "congruence-relation" = dontDistribute super."congruence-relation"; + "conjugateGradient" = dontDistribute super."conjugateGradient"; + "conjure" = dontDistribute super."conjure"; + "conlogger" = dontDistribute super."conlogger"; + "connection-pool" = dontDistribute super."connection-pool"; + "consistent" = dontDistribute super."consistent"; + "console-program" = dontDistribute super."console-program"; + "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; + "constrained-categories" = dontDistribute super."constrained-categories"; + "constrained-normal" = dontDistribute super."constrained-normal"; + "constraints" = doDistribute super."constraints_0_4_1_3"; + "constructible" = dontDistribute super."constructible"; + "constructive-algebra" = dontDistribute super."constructive-algebra"; + "consul-haskell" = doDistribute super."consul-haskell_0_2_1"; + "consumers" = dontDistribute super."consumers"; + "container" = dontDistribute super."container"; + "container-classes" = dontDistribute super."container-classes"; + "containers-benchmark" = dontDistribute super."containers-benchmark"; + "containers-deepseq" = dontDistribute super."containers-deepseq"; + "context-free-grammar" = dontDistribute super."context-free-grammar"; + "context-stack" = dontDistribute super."context-stack"; + "continue" = dontDistribute super."continue"; + "continued-fractions" = dontDistribute super."continued-fractions"; + "continuum" = dontDistribute super."continuum"; + "continuum-client" = dontDistribute super."continuum-client"; + "contravariant-extras" = dontDistribute super."contravariant-extras"; + "control-event" = dontDistribute super."control-event"; + "control-monad-attempt" = dontDistribute super."control-monad-attempt"; + "control-monad-exception" = dontDistribute super."control-monad-exception"; + "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd"; + "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf"; + "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl"; + "control-monad-failure" = dontDistribute super."control-monad-failure"; + "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl"; + "control-monad-omega" = dontDistribute super."control-monad-omega"; + "control-monad-queue" = dontDistribute super."control-monad-queue"; + "control-timeout" = dontDistribute super."control-timeout"; + "contstuff" = dontDistribute super."contstuff"; + "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf"; + "contstuff-transformers" = dontDistribute super."contstuff-transformers"; + "converge" = dontDistribute super."converge"; + "conversion" = dontDistribute super."conversion"; + "conversion-bytestring" = dontDistribute super."conversion-bytestring"; + "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive"; + "conversion-text" = dontDistribute super."conversion-text"; + "convert" = dontDistribute super."convert"; + "convertible-ascii" = dontDistribute super."convertible-ascii"; + "convertible-text" = dontDistribute super."convertible-text"; + "cookbook" = dontDistribute super."cookbook"; + "coordinate" = dontDistribute super."coordinate"; + "copilot" = dontDistribute super."copilot"; + "copilot-c99" = dontDistribute super."copilot-c99"; + "copilot-cbmc" = dontDistribute super."copilot-cbmc"; + "copilot-core" = dontDistribute super."copilot-core"; + "copilot-language" = dontDistribute super."copilot-language"; + "copilot-libraries" = dontDistribute super."copilot-libraries"; + "copilot-sbv" = dontDistribute super."copilot-sbv"; + "copilot-theorem" = dontDistribute super."copilot-theorem"; + "copr" = dontDistribute super."copr"; + "core" = dontDistribute super."core"; + "core-haskell" = dontDistribute super."core-haskell"; + "corebot-bliki" = dontDistribute super."corebot-bliki"; + "coroutine-enumerator" = dontDistribute super."coroutine-enumerator"; + "coroutine-iteratee" = dontDistribute super."coroutine-iteratee"; + "coroutine-object" = dontDistribute super."coroutine-object"; + "couch-hs" = dontDistribute super."couch-hs"; + "couch-simple" = dontDistribute super."couch-simple"; + "couchdb-conduit" = dontDistribute super."couchdb-conduit"; + "couchdb-enumerator" = dontDistribute super."couchdb-enumerator"; + "count" = dontDistribute super."count"; + "countable" = dontDistribute super."countable"; + "counter" = dontDistribute super."counter"; + "court" = dontDistribute super."court"; + "coverage" = dontDistribute super."coverage"; + "cpio-conduit" = dontDistribute super."cpio-conduit"; + "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; + "cpsa" = dontDistribute super."cpsa"; + "cpuid" = dontDistribute super."cpuid"; + "cpuperf" = dontDistribute super."cpuperf"; + "cpython" = dontDistribute super."cpython"; + "cqrs" = dontDistribute super."cqrs"; + "cqrs-core" = dontDistribute super."cqrs-core"; + "cqrs-example" = dontDistribute super."cqrs-example"; + "cqrs-memory" = dontDistribute super."cqrs-memory"; + "cqrs-postgresql" = dontDistribute super."cqrs-postgresql"; + "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3"; + "cqrs-test" = dontDistribute super."cqrs-test"; + "cqrs-testkit" = dontDistribute super."cqrs-testkit"; + "cqrs-types" = dontDistribute super."cqrs-types"; + "cr" = dontDistribute super."cr"; + "crack" = dontDistribute super."crack"; + "craftwerk" = dontDistribute super."craftwerk"; + "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; + "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; + "crc16" = dontDistribute super."crc16"; + "crc16-table" = dontDistribute super."crc16-table"; + "creatur" = dontDistribute super."creatur"; + "crf-chain1" = dontDistribute super."crf-chain1"; + "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained"; + "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; + "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; + "critbit" = dontDistribute super."critbit"; + "criterion-plus" = dontDistribute super."criterion-plus"; + "criterion-to-html" = dontDistribute super."criterion-to-html"; + "crockford" = dontDistribute super."crockford"; + "crocodile" = dontDistribute super."crocodile"; + "cron" = doDistribute super."cron_0_3_0"; + "cron-compat" = dontDistribute super."cron-compat"; + "cruncher-types" = dontDistribute super."cruncher-types"; + "crunghc" = dontDistribute super."crunghc"; + "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; + "crypto-classical" = dontDistribute super."crypto-classical"; + "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; + "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; + "crypto-random-effect" = dontDistribute super."crypto-random-effect"; + "crypto-totp" = dontDistribute super."crypto-totp"; + "cryptonite" = doDistribute super."cryptonite_0_6"; + "cryptsy-api" = dontDistribute super."cryptsy-api"; + "crystalfontz" = dontDistribute super."crystalfontz"; + "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin"; + "csound-catalog" = dontDistribute super."csound-catalog"; + "csound-expression" = dontDistribute super."csound-expression"; + "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic"; + "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes"; + "csound-expression-typed" = dontDistribute super."csound-expression-typed"; + "csound-sampler" = dontDistribute super."csound-sampler"; + "csp" = dontDistribute super."csp"; + "cspmchecker" = dontDistribute super."cspmchecker"; + "css" = dontDistribute super."css"; + "css-syntax" = dontDistribute super."css-syntax"; + "csv-enumerator" = dontDistribute super."csv-enumerator"; + "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-to-qif" = dontDistribute super."csv-to-qif"; + "ctemplate" = dontDistribute super."ctemplate"; + "ctkl" = dontDistribute super."ctkl"; + "ctpl" = dontDistribute super."ctpl"; + "ctrie" = dontDistribute super."ctrie"; + "cube" = dontDistribute super."cube"; + "cubical" = dontDistribute super."cubical"; + "cubicbezier" = dontDistribute super."cubicbezier"; + "cubicspline" = doDistribute super."cubicspline_0_1_1"; + "cublas" = dontDistribute super."cublas"; + "cuboid" = dontDistribute super."cuboid"; + "cuda" = dontDistribute super."cuda"; + "cudd" = dontDistribute super."cudd"; + "cufft" = dontDistribute super."cufft"; + "curl-aeson" = dontDistribute super."curl-aeson"; + "curlhs" = dontDistribute super."curlhs"; + "currency" = dontDistribute super."currency"; + "current-locale" = dontDistribute super."current-locale"; + "curry-base" = dontDistribute super."curry-base"; + "curry-frontend" = dontDistribute super."curry-frontend"; + "cursedcsv" = dontDistribute super."cursedcsv"; + "curve25519" = dontDistribute super."curve25519"; + "curves" = dontDistribute super."curves"; + "custom-prelude" = dontDistribute super."custom-prelude"; + "cv-combinators" = dontDistribute super."cv-combinators"; + "cyclotomic" = dontDistribute super."cyclotomic"; + "cypher" = dontDistribute super."cypher"; + "d-bus" = dontDistribute super."d-bus"; + "d3js" = dontDistribute super."d3js"; + "daemonize-doublefork" = dontDistribute super."daemonize-doublefork"; + "daemons" = dontDistribute super."daemons"; + "dag" = dontDistribute super."dag"; + "damnpacket" = dontDistribute super."damnpacket"; + "dao" = dontDistribute super."dao"; + "dapi" = dontDistribute super."dapi"; + "darcs" = dontDistribute super."darcs"; + "darcs-benchmark" = dontDistribute super."darcs-benchmark"; + "darcs-beta" = dontDistribute super."darcs-beta"; + "darcs-buildpackage" = dontDistribute super."darcs-buildpackage"; + "darcs-cabalized" = dontDistribute super."darcs-cabalized"; + "darcs-fastconvert" = dontDistribute super."darcs-fastconvert"; + "darcs-graph" = dontDistribute super."darcs-graph"; + "darcs-monitor" = dontDistribute super."darcs-monitor"; + "darcs-scripts" = dontDistribute super."darcs-scripts"; + "darcs2dot" = dontDistribute super."darcs2dot"; + "darcsden" = dontDistribute super."darcsden"; + "darcswatch" = dontDistribute super."darcswatch"; + "darkplaces-demo" = dontDistribute super."darkplaces-demo"; + "darkplaces-rcon" = dontDistribute super."darkplaces-rcon"; + "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; + "darkplaces-text" = dontDistribute super."darkplaces-text"; + "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib"; + "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd"; + "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf"; + "data-accessor-template" = dontDistribute super."data-accessor-template"; + "data-accessor-transformers" = dontDistribute super."data-accessor-transformers"; + "data-aviary" = dontDistribute super."data-aviary"; + "data-bword" = dontDistribute super."data-bword"; + "data-carousel" = dontDistribute super."data-carousel"; + "data-category" = dontDistribute super."data-category"; + "data-cell" = dontDistribute super."data-cell"; + "data-checked" = dontDistribute super."data-checked"; + "data-clist" = dontDistribute super."data-clist"; + "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; + "data-construction" = dontDistribute super."data-construction"; + "data-cycle" = dontDistribute super."data-cycle"; + "data-default-generics" = dontDistribute super."data-default-generics"; + "data-dispersal" = dontDistribute super."data-dispersal"; + "data-dword" = dontDistribute super."data-dword"; + "data-easy" = dontDistribute super."data-easy"; + "data-endian" = dontDistribute super."data-endian"; + "data-extra" = dontDistribute super."data-extra"; + "data-filepath" = dontDistribute super."data-filepath"; + "data-fin" = dontDistribute super."data-fin"; + "data-fin-simple" = dontDistribute super."data-fin-simple"; + "data-fix" = dontDistribute super."data-fix"; + "data-fix-cse" = dontDistribute super."data-fix-cse"; + "data-flags" = dontDistribute super."data-flags"; + "data-flagset" = dontDistribute super."data-flagset"; + "data-fresh" = dontDistribute super."data-fresh"; + "data-interval" = dontDistribute super."data-interval"; + "data-ivar" = dontDistribute super."data-ivar"; + "data-kiln" = dontDistribute super."data-kiln"; + "data-layer" = dontDistribute super."data-layer"; + "data-layout" = dontDistribute super."data-layout"; + "data-lens" = dontDistribute super."data-lens"; + "data-lens-fd" = dontDistribute super."data-lens-fd"; + "data-lens-ixset" = dontDistribute super."data-lens-ixset"; + "data-lens-template" = dontDistribute super."data-lens-template"; + "data-list-sequences" = dontDistribute super."data-list-sequences"; + "data-map-multikey" = dontDistribute super."data-map-multikey"; + "data-named" = dontDistribute super."data-named"; + "data-nat" = dontDistribute super."data-nat"; + "data-object" = dontDistribute super."data-object"; + "data-object-json" = dontDistribute super."data-object-json"; + "data-object-yaml" = dontDistribute super."data-object-yaml"; + "data-or" = dontDistribute super."data-or"; + "data-partition" = dontDistribute super."data-partition"; + "data-pprint" = dontDistribute super."data-pprint"; + "data-quotientref" = dontDistribute super."data-quotientref"; + "data-r-tree" = dontDistribute super."data-r-tree"; + "data-ref" = dontDistribute super."data-ref"; + "data-reify-cse" = dontDistribute super."data-reify-cse"; + "data-repr" = dontDistribute super."data-repr"; + "data-rev" = dontDistribute super."data-rev"; + "data-rope" = dontDistribute super."data-rope"; + "data-rtuple" = dontDistribute super."data-rtuple"; + "data-size" = dontDistribute super."data-size"; + "data-spacepart" = dontDistribute super."data-spacepart"; + "data-store" = dontDistribute super."data-store"; + "data-stringmap" = dontDistribute super."data-stringmap"; + "data-structure-inferrer" = dontDistribute super."data-structure-inferrer"; + "data-tensor" = dontDistribute super."data-tensor"; + "data-textual" = dontDistribute super."data-textual"; + "data-timeout" = dontDistribute super."data-timeout"; + "data-transform" = dontDistribute super."data-transform"; + "data-treify" = dontDistribute super."data-treify"; + "data-type" = dontDistribute super."data-type"; + "data-util" = dontDistribute super."data-util"; + "data-variant" = dontDistribute super."data-variant"; + "database-migrate" = dontDistribute super."database-migrate"; + "database-study" = dontDistribute super."database-study"; + "dataenc" = dontDistribute super."dataenc"; + "dataflow" = dontDistribute super."dataflow"; + "datalog" = dontDistribute super."datalog"; + "datapacker" = dontDistribute super."datapacker"; + "dataurl" = dontDistribute super."dataurl"; + "date-cache" = dontDistribute super."date-cache"; + "dates" = dontDistribute super."dates"; + "datetime" = dontDistribute super."datetime"; + "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; + "dawg" = dontDistribute super."dawg"; + "dbcleaner" = dontDistribute super."dbcleaner"; + "dbf" = dontDistribute super."dbf"; + "dbjava" = dontDistribute super."dbjava"; + "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus-client" = dontDistribute super."dbus-client"; + "dbus-core" = dontDistribute super."dbus-core"; + "dbus-qq" = dontDistribute super."dbus-qq"; + "dbus-th" = dontDistribute super."dbus-th"; + "dclabel" = dontDistribute super."dclabel"; + "dclabel-eci11" = dontDistribute super."dclabel-eci11"; + "ddc-base" = dontDistribute super."ddc-base"; + "ddc-build" = dontDistribute super."ddc-build"; + "ddc-code" = dontDistribute super."ddc-code"; + "ddc-core" = dontDistribute super."ddc-core"; + "ddc-core-eval" = dontDistribute super."ddc-core-eval"; + "ddc-core-flow" = dontDistribute super."ddc-core-flow"; + "ddc-core-llvm" = dontDistribute super."ddc-core-llvm"; + "ddc-core-salt" = dontDistribute super."ddc-core-salt"; + "ddc-core-simpl" = dontDistribute super."ddc-core-simpl"; + "ddc-core-tetra" = dontDistribute super."ddc-core-tetra"; + "ddc-driver" = dontDistribute super."ddc-driver"; + "ddc-interface" = dontDistribute super."ddc-interface"; + "ddc-source-tetra" = dontDistribute super."ddc-source-tetra"; + "ddc-tools" = dontDistribute super."ddc-tools"; + "ddc-war" = dontDistribute super."ddc-war"; + "ddci-core" = dontDistribute super."ddci-core"; + "dead-code-detection" = dontDistribute super."dead-code-detection"; + "dead-simple-json" = dontDistribute super."dead-simple-json"; + "debian" = doDistribute super."debian_3_87_2"; + "debian-binary" = dontDistribute super."debian-binary"; + "debian-build" = dontDistribute super."debian-build"; + "debug-diff" = dontDistribute super."debug-diff"; + "decepticons" = dontDistribute super."decepticons"; + "declarative" = dontDistribute super."declarative"; + "decode-utf8" = dontDistribute super."decode-utf8"; + "decoder-conduit" = dontDistribute super."decoder-conduit"; + "dedukti" = dontDistribute super."dedukti"; + "deepcontrol" = dontDistribute super."deepcontrol"; + "deeplearning-hs" = dontDistribute super."deeplearning-hs"; + "deepseq-bounded" = dontDistribute super."deepseq-bounded"; + "deepseq-magic" = dontDistribute super."deepseq-magic"; + "deepseq-th" = dontDistribute super."deepseq-th"; + "deepzoom" = dontDistribute super."deepzoom"; + "defargs" = dontDistribute super."defargs"; + "definitive-base" = dontDistribute super."definitive-base"; + "definitive-filesystem" = dontDistribute super."definitive-filesystem"; + "definitive-graphics" = dontDistribute super."definitive-graphics"; + "definitive-parser" = dontDistribute super."definitive-parser"; + "definitive-reactive" = dontDistribute super."definitive-reactive"; + "definitive-sound" = dontDistribute super."definitive-sound"; + "deiko-config" = dontDistribute super."deiko-config"; + "dejafu" = dontDistribute super."dejafu"; + "deka" = dontDistribute super."deka"; + "deka-tests" = dontDistribute super."deka-tests"; + "delaunay" = dontDistribute super."delaunay"; + "delicious" = dontDistribute super."delicious"; + "delimited-text" = dontDistribute super."delimited-text"; + "delimiter-separated" = dontDistribute super."delimiter-separated"; + "delta" = dontDistribute super."delta"; + "delta-h" = dontDistribute super."delta-h"; + "demarcate" = dontDistribute super."demarcate"; + "denominate" = dontDistribute super."denominate"; + "depends" = dontDistribute super."depends"; + "dephd" = dontDistribute super."dephd"; + "dequeue" = dontDistribute super."dequeue"; + "derangement" = dontDistribute super."derangement"; + "derivation-trees" = dontDistribute super."derivation-trees"; + "derive-IG" = dontDistribute super."derive-IG"; + "derive-enumerable" = dontDistribute super."derive-enumerable"; + "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-topdown" = dontDistribute super."derive-topdown"; + "derive-trie" = dontDistribute super."derive-trie"; + "deriving-compat" = dontDistribute super."deriving-compat"; + "derp" = dontDistribute super."derp"; + "derp-lib" = dontDistribute super."derp-lib"; + "descrilo" = dontDistribute super."descrilo"; + "despair" = dontDistribute super."despair"; + "deterministic-game-engine" = dontDistribute super."deterministic-game-engine"; + "detrospector" = dontDistribute super."detrospector"; + "deunicode" = dontDistribute super."deunicode"; + "devil" = dontDistribute super."devil"; + "dewdrop" = dontDistribute super."dewdrop"; + "dfrac" = dontDistribute super."dfrac"; + "dfsbuild" = dontDistribute super."dfsbuild"; + "dgim" = dontDistribute super."dgim"; + "dgs" = dontDistribute super."dgs"; + "dia-base" = dontDistribute super."dia-base"; + "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; + "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7"; + "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3"; + "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; + "diagrams-pdf" = dontDistribute super."diagrams-pdf"; + "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-tikz" = dontDistribute super."diagrams-tikz"; + "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; + "dicom" = dontDistribute super."dicom"; + "dictparser" = dontDistribute super."dictparser"; + "diet" = dontDistribute super."diet"; + "diff-gestalt" = dontDistribute super."diff-gestalt"; + "diff-parse" = dontDistribute super."diff-parse"; + "diffarray" = dontDistribute super."diffarray"; + "diffcabal" = dontDistribute super."diffcabal"; + "diffdump" = dontDistribute super."diffdump"; + "digamma" = dontDistribute super."digamma"; + "digest-pure" = dontDistribute super."digest-pure"; + "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; + "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; + "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; + "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; + "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; + "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty"; + "digestive-functors-snap" = dontDistribute super."digestive-functors-snap"; + "digit" = dontDistribute super."digit"; + "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; + "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; + "dimensional-tf" = dontDistribute super."dimensional-tf"; + "dingo-core" = dontDistribute super."dingo-core"; + "dingo-example" = dontDistribute super."dingo-example"; + "dingo-widgets" = dontDistribute super."dingo-widgets"; + "diophantine" = dontDistribute super."diophantine"; + "diplomacy" = dontDistribute super."diplomacy"; + "diplomacy-server" = dontDistribute super."diplomacy-server"; + "direct-binary-files" = dontDistribute super."direct-binary-files"; + "direct-daemonize" = dontDistribute super."direct-daemonize"; + "direct-fastcgi" = dontDistribute super."direct-fastcgi"; + "direct-http" = dontDistribute super."direct-http"; + "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; + "direct-plugins" = dontDistribute super."direct-plugins"; + "directed-cubical" = dontDistribute super."directed-cubical"; + "directory-layout" = dontDistribute super."directory-layout"; + "dirfiles" = dontDistribute super."dirfiles"; + "dirstream" = dontDistribute super."dirstream"; + "disassembler" = dontDistribute super."disassembler"; + "discordian-calendar" = dontDistribute super."discordian-calendar"; + "discount" = dontDistribute super."discount"; + "discrete-space-map" = dontDistribute super."discrete-space-map"; + "discrimination" = dontDistribute super."discrimination"; + "disjoint-set" = dontDistribute super."disjoint-set"; + "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; + "dist-upload" = dontDistribute super."dist-upload"; + "distributed-process" = dontDistribute super."distributed-process"; + "distributed-process-async" = dontDistribute super."distributed-process-async"; + "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = dontDistribute super."distributed-process-client-server"; + "distributed-process-execution" = dontDistribute super."distributed-process-execution"; + "distributed-process-extras" = dontDistribute super."distributed-process-extras"; + "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; + "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; + "distributed-process-platform" = dontDistribute super."distributed-process-platform"; + "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet"; + "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor"; + "distributed-process-task" = dontDistribute super."distributed-process-task"; + "distributed-process-tests" = dontDistribute super."distributed-process-tests"; + "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = dontDistribute super."distributed-static"; + "distribution" = dontDistribute super."distribution"; + "distribution-plot" = dontDistribute super."distribution-plot"; + "diversity" = dontDistribute super."diversity"; + "dixi" = dontDistribute super."dixi"; + "djinn" = dontDistribute super."djinn"; + "djinn-th" = dontDistribute super."djinn-th"; + "dnscache" = dontDistribute super."dnscache"; + "dnsrbl" = dontDistribute super."dnsrbl"; + "dnssd" = dontDistribute super."dnssd"; + "doc-review" = dontDistribute super."doc-review"; + "doccheck" = dontDistribute super."doccheck"; + "docidx" = dontDistribute super."docidx"; + "docker" = dontDistribute super."docker"; + "dockercook" = dontDistribute super."dockercook"; + "docopt" = dontDistribute super."docopt"; + "doctest-discover" = dontDistribute super."doctest-discover"; + "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; + "doctest-prop" = dontDistribute super."doctest-prop"; + "dom-lt" = dontDistribute super."dom-lt"; + "dom-selector" = dontDistribute super."dom-selector"; + "domain-auth" = dontDistribute super."domain-auth"; + "dominion" = dontDistribute super."dominion"; + "domplate" = dontDistribute super."domplate"; + "dot2graphml" = dontDistribute super."dot2graphml"; + "dotenv" = dontDistribute super."dotenv"; + "dotfs" = dontDistribute super."dotfs"; + "dotgen" = dontDistribute super."dotgen"; + "double-metaphone" = dontDistribute super."double-metaphone"; + "dove" = dontDistribute super."dove"; + "dow" = dontDistribute super."dow"; + "download" = dontDistribute super."download"; + "download-curl" = dontDistribute super."download-curl"; + "download-media-content" = dontDistribute super."download-media-content"; + "dozenal" = dontDistribute super."dozenal"; + "dozens" = dontDistribute super."dozens"; + "dph-base" = dontDistribute super."dph-base"; + "dph-examples" = dontDistribute super."dph-examples"; + "dph-lifted-base" = dontDistribute super."dph-lifted-base"; + "dph-lifted-copy" = dontDistribute super."dph-lifted-copy"; + "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg"; + "dph-par" = dontDistribute super."dph-par"; + "dph-prim-interface" = dontDistribute super."dph-prim-interface"; + "dph-prim-par" = dontDistribute super."dph-prim-par"; + "dph-prim-seq" = dontDistribute super."dph-prim-seq"; + "dph-seq" = dontDistribute super."dph-seq"; + "dpkg" = dontDistribute super."dpkg"; + "drClickOn" = dontDistribute super."drClickOn"; + "draw-poker" = dontDistribute super."draw-poker"; + "drawille" = dontDistribute super."drawille"; + "drifter" = dontDistribute super."drifter"; + "drifter-postgresql" = dontDistribute super."drifter-postgresql"; + "dropbox-sdk" = dontDistribute super."dropbox-sdk"; + "dropsolve" = dontDistribute super."dropsolve"; + "ds-kanren" = dontDistribute super."ds-kanren"; + "dsh-sql" = dontDistribute super."dsh-sql"; + "dsmc" = dontDistribute super."dsmc"; + "dsmc-tools" = dontDistribute super."dsmc-tools"; + "dson" = dontDistribute super."dson"; + "dson-parsec" = dontDistribute super."dson-parsec"; + "dsp" = dontDistribute super."dsp"; + "dstring" = dontDistribute super."dstring"; + "dtab" = dontDistribute super."dtab"; + "dtd" = dontDistribute super."dtd"; + "dtd-text" = dontDistribute super."dtd-text"; + "dtd-types" = dontDistribute super."dtd-types"; + "dtrace" = dontDistribute super."dtrace"; + "dtw" = dontDistribute super."dtw"; + "dump" = dontDistribute super."dump"; + "duplo" = dontDistribute super."duplo"; + "dvda" = dontDistribute super."dvda"; + "dvdread" = dontDistribute super."dvdread"; + "dvi-processing" = dontDistribute super."dvi-processing"; + "dvorak" = dontDistribute super."dvorak"; + "dwarf" = dontDistribute super."dwarf"; + "dwarf-el" = dontDistribute super."dwarf-el"; + "dwarfadt" = dontDistribute super."dwarfadt"; + "dx9base" = dontDistribute super."dx9base"; + "dx9d3d" = dontDistribute super."dx9d3d"; + "dx9d3dx" = dontDistribute super."dx9d3dx"; + "dynamic-cabal" = dontDistribute super."dynamic-cabal"; + "dynamic-graph" = dontDistribute super."dynamic-graph"; + "dynamic-linker-template" = dontDistribute super."dynamic-linker-template"; + "dynamic-loader" = dontDistribute super."dynamic-loader"; + "dynamic-mvector" = dontDistribute super."dynamic-mvector"; + "dynamic-object" = dontDistribute super."dynamic-object"; + "dynamic-plot" = dontDistribute super."dynamic-plot"; + "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = dontDistribute super."dynamic-state"; + "dynobud" = dontDistribute super."dynobud"; + "dyre" = dontDistribute super."dyre"; + "dywapitchtrack" = dontDistribute super."dywapitchtrack"; + "dzen-utils" = dontDistribute super."dzen-utils"; + "eager-sockets" = dontDistribute super."eager-sockets"; + "easy-api" = dontDistribute super."easy-api"; + "easy-bitcoin" = dontDistribute super."easy-bitcoin"; + "easyjson" = dontDistribute super."easyjson"; + "easyplot" = dontDistribute super."easyplot"; + "easyrender" = dontDistribute super."easyrender"; + "ebeats" = dontDistribute super."ebeats"; + "ebnf-bff" = dontDistribute super."ebnf-bff"; + "ec2-signature" = dontDistribute super."ec2-signature"; + "ecdsa" = dontDistribute super."ecdsa"; + "ecma262" = dontDistribute super."ecma262"; + "ecu" = dontDistribute super."ecu"; + "ed25519" = dontDistribute super."ed25519"; + "ed25519-donna" = dontDistribute super."ed25519-donna"; + "eddie" = dontDistribute super."eddie"; + "edenmodules" = dontDistribute super."edenmodules"; + "edenskel" = dontDistribute super."edenskel"; + "edentv" = dontDistribute super."edentv"; + "edge" = dontDistribute super."edge"; + "edit-distance-vector" = dontDistribute super."edit-distance-vector"; + "edit-lenses" = dontDistribute super."edit-lenses"; + "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; + "editable" = dontDistribute super."editable"; + "editline" = dontDistribute super."editline"; + "effect-monad" = dontDistribute super."effect-monad"; + "effective-aspects" = dontDistribute super."effective-aspects"; + "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; + "effects" = dontDistribute super."effects"; + "effects-parser" = dontDistribute super."effects-parser"; + "effin" = dontDistribute super."effin"; + "egison" = dontDistribute super."egison"; + "egison-quote" = dontDistribute super."egison-quote"; + "egison-tutorial" = dontDistribute super."egison-tutorial"; + "ehaskell" = dontDistribute super."ehaskell"; + "ehs" = dontDistribute super."ehs"; + "eibd-client-simple" = dontDistribute super."eibd-client-simple"; + "eigen" = dontDistribute super."eigen"; + "either-unwrap" = dontDistribute super."either-unwrap"; + "eithers" = dontDistribute super."eithers"; + "ekg" = dontDistribute super."ekg"; + "ekg-bosun" = dontDistribute super."ekg-bosun"; + "ekg-carbon" = dontDistribute super."ekg-carbon"; + "ekg-json" = dontDistribute super."ekg-json"; + "ekg-log" = dontDistribute super."ekg-log"; + "ekg-push" = dontDistribute super."ekg-push"; + "ekg-rrd" = dontDistribute super."ekg-rrd"; + "ekg-statsd" = dontDistribute super."ekg-statsd"; + "electrum-mnemonic" = dontDistribute super."electrum-mnemonic"; + "elerea" = dontDistribute super."elerea"; + "elerea-examples" = dontDistribute super."elerea-examples"; + "elerea-sdl" = dontDistribute super."elerea-sdl"; + "elevator" = dontDistribute super."elevator"; + "elf" = dontDistribute super."elf"; + "elm-bridge" = dontDistribute super."elm-bridge"; + "elm-build-lib" = dontDistribute super."elm-build-lib"; + "elm-compiler" = dontDistribute super."elm-compiler"; + "elm-get" = dontDistribute super."elm-get"; + "elm-init" = dontDistribute super."elm-init"; + "elm-make" = dontDistribute super."elm-make"; + "elm-package" = dontDistribute super."elm-package"; + "elm-reactor" = dontDistribute super."elm-reactor"; + "elm-repl" = dontDistribute super."elm-repl"; + "elm-server" = dontDistribute super."elm-server"; + "elm-yesod" = dontDistribute super."elm-yesod"; + "elo" = dontDistribute super."elo"; + "elocrypt" = dontDistribute super."elocrypt"; + "emacs-keys" = dontDistribute super."emacs-keys"; + "email" = dontDistribute super."email"; + "email-header" = dontDistribute super."email-header"; + "email-postmark" = dontDistribute super."email-postmark"; + "email-validator" = dontDistribute super."email-validator"; + "embeddock" = dontDistribute super."embeddock"; + "embeddock-example" = dontDistribute super."embeddock-example"; + "embroidery" = dontDistribute super."embroidery"; + "emgm" = dontDistribute super."emgm"; + "empty" = dontDistribute super."empty"; + "encoding" = dontDistribute super."encoding"; + "endo" = dontDistribute super."endo"; + "engine-io-snap" = dontDistribute super."engine-io-snap"; + "engine-io-wai" = dontDistribute super."engine-io-wai"; + "engine-io-yesod" = dontDistribute super."engine-io-yesod"; + "engineering-units" = dontDistribute super."engineering-units"; + "enumerable" = dontDistribute super."enumerable"; + "enumerate" = dontDistribute super."enumerate"; + "enumeration" = dontDistribute super."enumeration"; + "enumerator-fd" = dontDistribute super."enumerator-fd"; + "enumerator-tf" = dontDistribute super."enumerator-tf"; + "enumfun" = dontDistribute super."enumfun"; + "enummapmap" = dontDistribute super."enummapmap"; + "enummapset" = dontDistribute super."enummapset"; + "enummapset-th" = dontDistribute super."enummapset-th"; + "enumset" = dontDistribute super."enumset"; + "env-parser" = dontDistribute super."env-parser"; + "envparse" = dontDistribute super."envparse"; + "envy" = dontDistribute super."envy"; + "epanet-haskell" = dontDistribute super."epanet-haskell"; + "epass" = dontDistribute super."epass"; + "epic" = dontDistribute super."epic"; + "epoll" = dontDistribute super."epoll"; + "eprocess" = dontDistribute super."eprocess"; + "epub" = dontDistribute super."epub"; + "epub-metadata" = dontDistribute super."epub-metadata"; + "epub-tools" = dontDistribute super."epub-tools"; + "epubname" = dontDistribute super."epubname"; + "equal-files" = dontDistribute super."equal-files"; + "equational-reasoning" = dontDistribute super."equational-reasoning"; + "erd" = dontDistribute super."erd"; + "erf-native" = dontDistribute super."erf-native"; + "erlang" = dontDistribute super."erlang"; + "eros" = dontDistribute super."eros"; + "eros-client" = dontDistribute super."eros-client"; + "eros-http" = dontDistribute super."eros-http"; + "errno" = dontDistribute super."errno"; + "error-analyze" = dontDistribute super."error-analyze"; + "error-continuations" = dontDistribute super."error-continuations"; + "error-list" = dontDistribute super."error-list"; + "error-loc" = dontDistribute super."error-loc"; + "error-location" = dontDistribute super."error-location"; + "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; + "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; + "ersatz" = dontDistribute super."ersatz"; + "ersatz-toysat" = dontDistribute super."ersatz-toysat"; + "ert" = dontDistribute super."ert"; + "esotericbot" = dontDistribute super."esotericbot"; + "ess" = dontDistribute super."ess"; + "estimator" = dontDistribute super."estimator"; + "estimators" = dontDistribute super."estimators"; + "estreps" = dontDistribute super."estreps"; + "etcd" = dontDistribute super."etcd"; + "eternal" = dontDistribute super."eternal"; + "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell"; + "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db"; + "ethereum-rlp" = dontDistribute super."ethereum-rlp"; + "ety" = dontDistribute super."ety"; + "euler" = dontDistribute super."euler"; + "euphoria" = dontDistribute super."euphoria"; + "eurofxref" = dontDistribute super."eurofxref"; + "event-driven" = dontDistribute super."event-driven"; + "event-handlers" = dontDistribute super."event-handlers"; + "event-list" = dontDistribute super."event-list"; + "event-monad" = dontDistribute super."event-monad"; + "eventloop" = dontDistribute super."eventloop"; + "eventstore" = dontDistribute super."eventstore"; + "every-bit-counts" = dontDistribute super."every-bit-counts"; + "ewe" = dontDistribute super."ewe"; + "ex-pool" = dontDistribute super."ex-pool"; + "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "exact-pi" = dontDistribute super."exact-pi"; + "exact-real" = dontDistribute super."exact-real"; + "exception-hierarchy" = dontDistribute super."exception-hierarchy"; + "exception-mailer" = dontDistribute super."exception-mailer"; + "exception-monads-fd" = dontDistribute super."exception-monads-fd"; + "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exherbo-cabal" = dontDistribute super."exherbo-cabal"; + "exif" = dontDistribute super."exif"; + "exinst" = dontDistribute super."exinst"; + "exinst-aeson" = dontDistribute super."exinst-aeson"; + "exinst-bytes" = dontDistribute super."exinst-bytes"; + "exinst-deepseq" = dontDistribute super."exinst-deepseq"; + "exinst-hashable" = dontDistribute super."exinst-hashable"; + "exists" = dontDistribute super."exists"; + "exit-codes" = dontDistribute super."exit-codes"; + "exp-pairs" = dontDistribute super."exp-pairs"; + "expand" = dontDistribute super."expand"; + "expat-enumerator" = dontDistribute super."expat-enumerator"; + "expiring-mvar" = dontDistribute super."expiring-mvar"; + "explain" = dontDistribute super."explain"; + "explicit-determinant" = dontDistribute super."explicit-determinant"; + "explicit-exception" = dontDistribute super."explicit-exception"; + "explicit-iomodes" = dontDistribute super."explicit-iomodes"; + "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring"; + "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text"; + "explicit-sharing" = dontDistribute super."explicit-sharing"; + "explore" = dontDistribute super."explore"; + "exposed-containers" = dontDistribute super."exposed-containers"; + "expression-parser" = dontDistribute super."expression-parser"; + "extcore" = dontDistribute super."extcore"; + "extemp" = dontDistribute super."extemp"; + "extended-categories" = dontDistribute super."extended-categories"; + "extended-reals" = dontDistribute super."extended-reals"; + "extensible" = dontDistribute super."extensible"; + "extensible-data" = dontDistribute super."extensible-data"; + "extensible-effects" = dontDistribute super."extensible-effects"; + "external-sort" = dontDistribute super."external-sort"; + "extract-dependencies" = dontDistribute super."extract-dependencies"; + "extractelf" = dontDistribute super."extractelf"; + "ez-couch" = dontDistribute super."ez-couch"; + "faceted" = dontDistribute super."faceted"; + "factory" = dontDistribute super."factory"; + "factual-api" = dontDistribute super."factual-api"; + "fad" = dontDistribute super."fad"; + "failable-list" = dontDistribute super."failable-list"; + "failure" = dontDistribute super."failure"; + "fair-predicates" = dontDistribute super."fair-predicates"; + "faker" = dontDistribute super."faker"; + "falling-turnip" = dontDistribute super."falling-turnip"; + "fallingblocks" = dontDistribute super."fallingblocks"; + "family-tree" = dontDistribute super."family-tree"; + "farmhash" = dontDistribute super."farmhash"; + "fast-digits" = dontDistribute super."fast-digits"; + "fast-math" = dontDistribute super."fast-math"; + "fast-tags" = dontDistribute super."fast-tags"; + "fast-tagsoup" = dontDistribute super."fast-tagsoup"; + "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only"; + "fasta" = dontDistribute super."fasta"; + "fastbayes" = dontDistribute super."fastbayes"; + "fastcgi" = dontDistribute super."fastcgi"; + "fastedit" = dontDistribute super."fastedit"; + "fastirc" = dontDistribute super."fastirc"; + "fault-tree" = dontDistribute super."fault-tree"; + "fay-geoposition" = dontDistribute super."fay-geoposition"; + "fay-hsx" = dontDistribute super."fay-hsx"; + "fay-ref" = dontDistribute super."fay-ref"; + "fca" = dontDistribute super."fca"; + "fcd" = dontDistribute super."fcd"; + "fckeditor" = dontDistribute super."fckeditor"; + "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; + "fdo-trash" = dontDistribute super."fdo-trash"; + "fec" = dontDistribute super."fec"; + "fedora-packages" = dontDistribute super."fedora-packages"; + "feed-cli" = dontDistribute super."feed-cli"; + "feed-collect" = dontDistribute super."feed-collect"; + "feed-crawl" = dontDistribute super."feed-crawl"; + "feed-translator" = dontDistribute super."feed-translator"; + "feed2lj" = dontDistribute super."feed2lj"; + "feed2twitter" = dontDistribute super."feed2twitter"; + "feldspar-compiler" = dontDistribute super."feldspar-compiler"; + "feldspar-language" = dontDistribute super."feldspar-language"; + "feldspar-signal" = dontDistribute super."feldspar-signal"; + "fen2s" = dontDistribute super."fen2s"; + "fences" = dontDistribute super."fences"; + "fenfire" = dontDistribute super."fenfire"; + "fez-conf" = dontDistribute super."fez-conf"; + "ffeed" = dontDistribute super."ffeed"; + "fficxx" = dontDistribute super."fficxx"; + "fficxx-runtime" = dontDistribute super."fficxx-runtime"; + "ffmpeg-light" = dontDistribute super."ffmpeg-light"; + "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; + "fft" = dontDistribute super."fft"; + "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; + "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; + "fgl-visualize" = dontDistribute super."fgl-visualize"; + "fibon" = dontDistribute super."fibon"; + "fibonacci" = dontDistribute super."fibonacci"; + "fields" = dontDistribute super."fields"; + "fields-json" = dontDistribute super."fields-json"; + "fieldwise" = dontDistribute super."fieldwise"; + "fig" = dontDistribute super."fig"; + "file-collection" = dontDistribute super."file-collection"; + "file-command-qq" = dontDistribute super."file-command-qq"; + "file-modules" = dontDistribute super."file-modules"; + "filecache" = dontDistribute super."filecache"; + "filediff" = dontDistribute super."filediff"; + "filepath-io-access" = dontDistribute super."filepath-io-access"; + "filepather" = dontDistribute super."filepather"; + "filestore" = dontDistribute super."filestore"; + "filesystem-conduit" = dontDistribute super."filesystem-conduit"; + "filesystem-enumerator" = dontDistribute super."filesystem-enumerator"; + "filesystem-trees" = dontDistribute super."filesystem-trees"; + "filtrable" = dontDistribute super."filtrable"; + "final" = dontDistribute super."final"; + "find-conduit" = dontDistribute super."find-conduit"; + "fingertree-tf" = dontDistribute super."fingertree-tf"; + "finite-field" = dontDistribute super."finite-field"; + "finite-typelits" = dontDistribute super."finite-typelits"; + "first-and-last" = dontDistribute super."first-and-last"; + "first-class-patterns" = dontDistribute super."first-class-patterns"; + "firstify" = dontDistribute super."firstify"; + "fishfood" = dontDistribute super."fishfood"; + "fit" = dontDistribute super."fit"; + "fitsio" = dontDistribute super."fitsio"; + "fix-imports" = dontDistribute super."fix-imports"; + "fix-parser-simple" = dontDistribute super."fix-parser-simple"; + "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit"; + "fixed-length" = dontDistribute super."fixed-length"; + "fixed-point" = dontDistribute super."fixed-point"; + "fixed-point-vector" = dontDistribute super."fixed-point-vector"; + "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space"; + "fixed-precision" = dontDistribute super."fixed-precision"; + "fixed-storable-array" = dontDistribute super."fixed-storable-array"; + "fixed-vector-binary" = dontDistribute super."fixed-vector-binary"; + "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; + "fixedprec" = dontDistribute super."fixedprec"; + "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; + "fixhs" = dontDistribute super."fixhs"; + "fixplate" = dontDistribute super."fixplate"; + "fixpoint" = dontDistribute super."fixpoint"; + "fixtime" = dontDistribute super."fixtime"; + "fizz-buzz" = dontDistribute super."fizz-buzz"; + "flaccuraterip" = dontDistribute super."flaccuraterip"; + "flamethrower" = dontDistribute super."flamethrower"; + "flamingra" = dontDistribute super."flamingra"; + "flat-maybe" = dontDistribute super."flat-maybe"; + "flat-mcmc" = dontDistribute super."flat-mcmc"; + "flat-tex" = dontDistribute super."flat-tex"; + "flexible-time" = dontDistribute super."flexible-time"; + "flexible-unlit" = dontDistribute super."flexible-unlit"; + "flexiwrap" = dontDistribute super."flexiwrap"; + "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck"; + "flickr" = dontDistribute super."flickr"; + "flippers" = dontDistribute super."flippers"; + "flite" = dontDistribute super."flite"; + "flo" = dontDistribute super."flo"; + "float-binstring" = dontDistribute super."float-binstring"; + "floating-bits" = dontDistribute super."floating-bits"; + "floatshow" = dontDistribute super."floatshow"; + "flow2dot" = dontDistribute super."flow2dot"; + "flowdock-api" = dontDistribute super."flowdock-api"; + "flowdock-rest" = dontDistribute super."flowdock-rest"; + "flower" = dontDistribute super."flower"; + "flowlocks-framework" = dontDistribute super."flowlocks-framework"; + "flowsim" = dontDistribute super."flowsim"; + "fltkhs" = dontDistribute super."fltkhs"; + "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; + "fluent-logger" = dontDistribute super."fluent-logger"; + "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; + "fluidsynth" = dontDistribute super."fluidsynth"; + "fmark" = dontDistribute super."fmark"; + "fn" = dontDistribute super."fn"; + "fn-extra" = dontDistribute super."fn-extra"; + "fold-debounce" = dontDistribute super."fold-debounce"; + "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl-incremental" = dontDistribute super."foldl-incremental"; + "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; + "folds" = dontDistribute super."folds"; + "folds-common" = dontDistribute super."folds-common"; + "follower" = dontDistribute super."follower"; + "foma" = dontDistribute super."foma"; + "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6"; + "foo" = dontDistribute super."foo"; + "for-free" = dontDistribute super."for-free"; + "forbidden-fruit" = dontDistribute super."forbidden-fruit"; + "fordo" = dontDistribute super."fordo"; + "forecast-io" = dontDistribute super."forecast-io"; + "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric"; + "foreign-var" = dontDistribute super."foreign-var"; + "forger" = dontDistribute super."forger"; + "forkable-monad" = dontDistribute super."forkable-monad"; + "formal" = dontDistribute super."formal"; + "format" = dontDistribute super."format"; + "format-status" = dontDistribute super."format-status"; + "formattable" = dontDistribute super."formattable"; + "forml" = dontDistribute super."forml"; + "formlets" = dontDistribute super."formlets"; + "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; + "forth-hll" = dontDistribute super."forth-hll"; + "foscam-directory" = dontDistribute super."foscam-directory"; + "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; + "fountain" = dontDistribute super."fountain"; + "fpco-api" = dontDistribute super."fpco-api"; + "fpipe" = dontDistribute super."fpipe"; + "fpnla" = dontDistribute super."fpnla"; + "fpnla-examples" = dontDistribute super."fpnla-examples"; + "fptest" = dontDistribute super."fptest"; + "fquery" = dontDistribute super."fquery"; + "fractal" = dontDistribute super."fractal"; + "fractals" = dontDistribute super."fractals"; + "fraction" = dontDistribute super."fraction"; + "frag" = dontDistribute super."frag"; + "frame" = dontDistribute super."frame"; + "frame-markdown" = dontDistribute super."frame-markdown"; + "franchise" = dontDistribute super."franchise"; + "free-concurrent" = dontDistribute super."free-concurrent"; + "free-functors" = dontDistribute super."free-functors"; + "free-game" = dontDistribute super."free-game"; + "free-http" = dontDistribute super."free-http"; + "free-operational" = dontDistribute super."free-operational"; + "free-theorems" = dontDistribute super."free-theorems"; + "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples"; + "free-theorems-seq" = dontDistribute super."free-theorems-seq"; + "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui"; + "free-theorems-webui" = dontDistribute super."free-theorems-webui"; + "freekick2" = dontDistribute super."freekick2"; + "freenect" = doDistribute super."freenect_1_2"; + "freer" = dontDistribute super."freer"; + "freesect" = dontDistribute super."freesect"; + "freesound" = dontDistribute super."freesound"; + "freetype-simple" = dontDistribute super."freetype-simple"; + "freetype2" = dontDistribute super."freetype2"; + "fresh" = dontDistribute super."fresh"; + "friday" = dontDistribute super."friday"; + "friday-devil" = dontDistribute super."friday-devil"; + "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; + "friendly-time" = dontDistribute super."friendly-time"; + "frp-arduino" = dontDistribute super."frp-arduino"; + "frpnow" = dontDistribute super."frpnow"; + "frpnow-gloss" = dontDistribute super."frpnow-gloss"; + "frpnow-gtk" = dontDistribute super."frpnow-gtk"; + "frquotes" = dontDistribute super."frquotes"; + "fs-events" = dontDistribute super."fs-events"; + "fsharp" = dontDistribute super."fsharp"; + "fsmActions" = dontDistribute super."fsmActions"; + "fst" = dontDistribute super."fst"; + "fsutils" = dontDistribute super."fsutils"; + "fswatcher" = dontDistribute super."fswatcher"; + "ftdi" = dontDistribute super."ftdi"; + "ftp-conduit" = dontDistribute super."ftp-conduit"; + "ftphs" = dontDistribute super."ftphs"; + "ftree" = dontDistribute super."ftree"; + "ftshell" = dontDistribute super."ftshell"; + "fugue" = dontDistribute super."fugue"; + "full-sessions" = dontDistribute super."full-sessions"; + "full-text-search" = dontDistribute super."full-text-search"; + "fullstop" = dontDistribute super."fullstop"; + "funbot" = dontDistribute super."funbot"; + "funbot-client" = dontDistribute super."funbot-client"; + "funbot-ext-events" = dontDistribute super."funbot-ext-events"; + "funbot-git-hook" = dontDistribute super."funbot-git-hook"; + "funcmp" = dontDistribute super."funcmp"; + "function-combine" = dontDistribute super."function-combine"; + "function-instances-algebra" = dontDistribute super."function-instances-algebra"; + "functional-arrow" = dontDistribute super."functional-arrow"; + "functional-kmp" = dontDistribute super."functional-kmp"; + "functor-apply" = dontDistribute super."functor-apply"; + "functor-combo" = dontDistribute super."functor-combo"; + "functor-infix" = dontDistribute super."functor-infix"; + "functor-monadic" = dontDistribute super."functor-monadic"; + "functor-utils" = dontDistribute super."functor-utils"; + "functorm" = dontDistribute super."functorm"; + "functors" = dontDistribute super."functors"; + "funion" = dontDistribute super."funion"; + "funpat" = dontDistribute super."funpat"; + "funsat" = dontDistribute super."funsat"; + "fusion" = dontDistribute super."fusion"; + "futun" = dontDistribute super."futun"; + "future" = dontDistribute super."future"; + "future-resource" = dontDistribute super."future-resource"; + "fuzzy" = dontDistribute super."fuzzy"; + "fuzzy-timings" = dontDistribute super."fuzzy-timings"; + "fuzzytime" = dontDistribute super."fuzzytime"; + "fwgl" = dontDistribute super."fwgl"; + "fwgl-glfw" = dontDistribute super."fwgl-glfw"; + "fwgl-javascript" = dontDistribute super."fwgl-javascript"; + "g-npm" = dontDistribute super."g-npm"; + "gact" = dontDistribute super."gact"; + "game-of-life" = dontDistribute super."game-of-life"; + "game-probability" = dontDistribute super."game-probability"; + "game-tree" = dontDistribute super."game-tree"; + "gameclock" = dontDistribute super."gameclock"; + "gamma" = dontDistribute super."gamma"; + "gang-of-threads" = dontDistribute super."gang-of-threads"; + "garepinoh" = dontDistribute super."garepinoh"; + "garsia-wachs" = dontDistribute super."garsia-wachs"; + "gbu" = dontDistribute super."gbu"; + "gc" = dontDistribute super."gc"; + "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai"; + "gconf" = dontDistribute super."gconf"; + "gdiff" = dontDistribute super."gdiff"; + "gdiff-ig" = dontDistribute super."gdiff-ig"; + "gdiff-th" = dontDistribute super."gdiff-th"; + "gearbox" = dontDistribute super."gearbox"; + "geek" = dontDistribute super."geek"; + "geek-server" = dontDistribute super."geek-server"; + "gelatin" = dontDistribute super."gelatin"; + "gemstone" = dontDistribute super."gemstone"; + "gencheck" = dontDistribute super."gencheck"; + "gender" = dontDistribute super."gender"; + "genders" = dontDistribute super."genders"; + "general-prelude" = dontDistribute super."general-prelude"; + "generator" = dontDistribute super."generator"; + "generators" = dontDistribute super."generators"; + "generic-accessors" = dontDistribute super."generic-accessors"; + "generic-binary" = dontDistribute super."generic-binary"; + "generic-church" = dontDistribute super."generic-church"; + "generic-deepseq" = dontDistribute super."generic-deepseq"; + "generic-deriving" = doDistribute super."generic-deriving_1_8_0"; + "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold"; + "generic-maybe" = dontDistribute super."generic-maybe"; + "generic-pretty" = dontDistribute super."generic-pretty"; + "generic-server" = dontDistribute super."generic-server"; + "generic-storable" = dontDistribute super."generic-storable"; + "generic-tree" = dontDistribute super."generic-tree"; + "generic-trie" = dontDistribute super."generic-trie"; + "generic-xml" = dontDistribute super."generic-xml"; + "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; + "genericserialize" = dontDistribute super."genericserialize"; + "genetics" = dontDistribute super."genetics"; + "geni-gui" = dontDistribute super."geni-gui"; + "geni-util" = dontDistribute super."geni-util"; + "geniconvert" = dontDistribute super."geniconvert"; + "genifunctors" = dontDistribute super."genifunctors"; + "geniplate" = dontDistribute super."geniplate"; + "geniserver" = dontDistribute super."geniserver"; + "genprog" = dontDistribute super."genprog"; + "gentlemark" = dontDistribute super."gentlemark"; + "geo-resolver" = dontDistribute super."geo-resolver"; + "geo-uk" = dontDistribute super."geo-uk"; + "geocalc" = dontDistribute super."geocalc"; + "geocode-google" = dontDistribute super."geocode-google"; + "geodetic" = dontDistribute super."geodetic"; + "geodetics" = dontDistribute super."geodetics"; + "geohash" = dontDistribute super."geohash"; + "geoip2" = dontDistribute super."geoip2"; + "geojson" = dontDistribute super."geojson"; + "geom2d" = dontDistribute super."geom2d"; + "getemx" = dontDistribute super."getemx"; + "getflag" = dontDistribute super."getflag"; + "getopt-generics" = doDistribute super."getopt-generics_0_10_0_1"; + "getopt-simple" = dontDistribute super."getopt-simple"; + "gf" = dontDistribute super."gf"; + "ggtsTC" = dontDistribute super."ggtsTC"; + "ghc-core" = dontDistribute super."ghc-core"; + "ghc-core-html" = dontDistribute super."ghc-core-html"; + "ghc-datasize" = dontDistribute super."ghc-datasize"; + "ghc-dup" = dontDistribute super."ghc-dup"; + "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; + "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; + "ghc-exactprint" = dontDistribute super."ghc-exactprint"; + "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; + "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; + "ghc-heap-view" = dontDistribute super."ghc-heap-view"; + "ghc-imported-from" = dontDistribute super."ghc-imported-from"; + "ghc-make" = dontDistribute super."ghc-make"; + "ghc-man-completion" = dontDistribute super."ghc-man-completion"; + "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-parmake" = dontDistribute super."ghc-parmake"; + "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; + "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; + "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph"; + "ghc-server" = dontDistribute super."ghc-server"; + "ghc-session" = dontDistribute super."ghc-session"; + "ghc-simple" = dontDistribute super."ghc-simple"; + "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; + "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; + "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-vis" = dontDistribute super."ghc-vis"; + "ghci-diagrams" = dontDistribute super."ghci-diagrams"; + "ghci-haskeline" = dontDistribute super."ghci-haskeline"; + "ghci-lib" = dontDistribute super."ghci-lib"; + "ghci-ng" = dontDistribute super."ghci-ng"; + "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; + "ghcjs-dom" = dontDistribute super."ghcjs-dom"; + "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; + "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; + "ghclive" = dontDistribute super."ghclive"; + "ghczdecode" = dontDistribute super."ghczdecode"; + "ght" = dontDistribute super."ght"; + "gi-atk" = dontDistribute super."gi-atk"; + "gi-cairo" = dontDistribute super."gi-cairo"; + "gi-gdk" = dontDistribute super."gi-gdk"; + "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf"; + "gi-gio" = dontDistribute super."gi-gio"; + "gi-glib" = dontDistribute super."gi-glib"; + "gi-gobject" = dontDistribute super."gi-gobject"; + "gi-gtk" = dontDistribute super."gi-gtk"; + "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; + "gi-notify" = dontDistribute super."gi-notify"; + "gi-pango" = dontDistribute super."gi-pango"; + "gi-soup" = dontDistribute super."gi-soup"; + "gi-vte" = dontDistribute super."gi-vte"; + "gi-webkit" = dontDistribute super."gi-webkit"; + "gimlh" = dontDistribute super."gimlh"; + "ginger" = dontDistribute super."ginger"; + "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; + "gist" = dontDistribute super."gist"; + "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20150727"; + "git-checklist" = dontDistribute super."git-checklist"; + "git-date" = dontDistribute super."git-date"; + "git-embed" = dontDistribute super."git-embed"; + "git-fmt" = dontDistribute super."git-fmt"; + "git-freq" = dontDistribute super."git-freq"; + "git-gpush" = dontDistribute super."git-gpush"; + "git-jump" = dontDistribute super."git-jump"; + "git-monitor" = dontDistribute super."git-monitor"; + "git-object" = dontDistribute super."git-object"; + "git-repair" = dontDistribute super."git-repair"; + "git-sanity" = dontDistribute super."git-sanity"; + "git-vogue" = dontDistribute super."git-vogue"; + "gitcache" = dontDistribute super."gitcache"; + "gitdo" = dontDistribute super."gitdo"; + "github" = dontDistribute super."github"; + "github-backup" = dontDistribute super."github-backup"; + "github-post-receive" = dontDistribute super."github-post-receive"; + "github-types" = dontDistribute super."github-types"; + "github-utils" = dontDistribute super."github-utils"; + "github-webhook-handler" = dontDistribute super."github-webhook-handler"; + "github-webhook-handler-snap" = dontDistribute super."github-webhook-handler-snap"; + "gitignore" = dontDistribute super."gitignore"; + "gitit" = dontDistribute super."gitit"; + "gitlib-cmdline" = dontDistribute super."gitlib-cmdline"; + "gitlib-cross" = dontDistribute super."gitlib-cross"; + "gitlib-s3" = dontDistribute super."gitlib-s3"; + "gitlib-sample" = dontDistribute super."gitlib-sample"; + "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gl-capture" = dontDistribute super."gl-capture"; + "glade" = dontDistribute super."glade"; + "gladexml-accessor" = dontDistribute super."gladexml-accessor"; + "glambda" = dontDistribute super."glambda"; + "glapp" = dontDistribute super."glapp"; + "glasso" = dontDistribute super."glasso"; + "glicko" = dontDistribute super."glicko"; + "glider-nlp" = dontDistribute super."glider-nlp"; + "glintcollider" = dontDistribute super."glintcollider"; + "gll" = dontDistribute super."gll"; + "global" = dontDistribute super."global"; + "global-config" = dontDistribute super."global-config"; + "global-lock" = dontDistribute super."global-lock"; + "global-variables" = dontDistribute super."global-variables"; + "glome-hs" = dontDistribute super."glome-hs"; + "gloss" = dontDistribute super."gloss"; + "gloss-accelerate" = dontDistribute super."gloss-accelerate"; + "gloss-algorithms" = dontDistribute super."gloss-algorithms"; + "gloss-banana" = dontDistribute super."gloss-banana"; + "gloss-devil" = dontDistribute super."gloss-devil"; + "gloss-examples" = dontDistribute super."gloss-examples"; + "gloss-game" = dontDistribute super."gloss-game"; + "gloss-juicy" = dontDistribute super."gloss-juicy"; + "gloss-raster" = dontDistribute super."gloss-raster"; + "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate"; + "gloss-rendering" = dontDistribute super."gloss-rendering"; + "gloss-sodium" = dontDistribute super."gloss-sodium"; + "glpk-hs" = dontDistribute super."glpk-hs"; + "glue" = dontDistribute super."glue"; + "glue-common" = dontDistribute super."glue-common"; + "glue-core" = dontDistribute super."glue-core"; + "glue-ekg" = dontDistribute super."glue-ekg"; + "glue-example" = dontDistribute super."glue-example"; + "gluturtle" = dontDistribute super."gluturtle"; + "gmap" = dontDistribute super."gmap"; + "gmndl" = dontDistribute super."gmndl"; + "gnome-desktop" = dontDistribute super."gnome-desktop"; + "gnome-keyring" = dontDistribute super."gnome-keyring"; + "gnomevfs" = dontDistribute super."gnomevfs"; + "gnuplot" = dontDistribute super."gnuplot"; + "goa" = dontDistribute super."goa"; + "goatee" = dontDistribute super."goatee"; + "goatee-gtk" = dontDistribute super."goatee-gtk"; + "gofer-prelude" = dontDistribute super."gofer-prelude"; + "gogol" = dontDistribute super."gogol"; + "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer"; + "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller"; + "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer"; + "gogol-admin-directory" = dontDistribute super."gogol-admin-directory"; + "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration"; + "gogol-admin-reports" = dontDistribute super."gogol-admin-reports"; + "gogol-adsense" = dontDistribute super."gogol-adsense"; + "gogol-adsense-host" = dontDistribute super."gogol-adsense-host"; + "gogol-affiliates" = dontDistribute super."gogol-affiliates"; + "gogol-analytics" = dontDistribute super."gogol-analytics"; + "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise"; + "gogol-android-publisher" = dontDistribute super."gogol-android-publisher"; + "gogol-appengine" = dontDistribute super."gogol-appengine"; + "gogol-apps-activity" = dontDistribute super."gogol-apps-activity"; + "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar"; + "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing"; + "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller"; + "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks"; + "gogol-appstate" = dontDistribute super."gogol-appstate"; + "gogol-autoscaler" = dontDistribute super."gogol-autoscaler"; + "gogol-bigquery" = dontDistribute super."gogol-bigquery"; + "gogol-billing" = dontDistribute super."gogol-billing"; + "gogol-blogger" = dontDistribute super."gogol-blogger"; + "gogol-books" = dontDistribute super."gogol-books"; + "gogol-civicinfo" = dontDistribute super."gogol-civicinfo"; + "gogol-classroom" = dontDistribute super."gogol-classroom"; + "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace"; + "gogol-compute" = dontDistribute super."gogol-compute"; + "gogol-container" = dontDistribute super."gogol-container"; + "gogol-core" = dontDistribute super."gogol-core"; + "gogol-customsearch" = dontDistribute super."gogol-customsearch"; + "gogol-dataflow" = dontDistribute super."gogol-dataflow"; + "gogol-datastore" = dontDistribute super."gogol-datastore"; + "gogol-debugger" = dontDistribute super."gogol-debugger"; + "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager"; + "gogol-dfareporting" = dontDistribute super."gogol-dfareporting"; + "gogol-discovery" = dontDistribute super."gogol-discovery"; + "gogol-dns" = dontDistribute super."gogol-dns"; + "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids"; + "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search"; + "gogol-drive" = dontDistribute super."gogol-drive"; + "gogol-fitness" = dontDistribute super."gogol-fitness"; + "gogol-fonts" = dontDistribute super."gogol-fonts"; + "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch"; + "gogol-fusiontables" = dontDistribute super."gogol-fusiontables"; + "gogol-games" = dontDistribute super."gogol-games"; + "gogol-games-configuration" = dontDistribute super."gogol-games-configuration"; + "gogol-games-management" = dontDistribute super."gogol-games-management"; + "gogol-genomics" = dontDistribute super."gogol-genomics"; + "gogol-gmail" = dontDistribute super."gogol-gmail"; + "gogol-groups-migration" = dontDistribute super."gogol-groups-migration"; + "gogol-groups-settings" = dontDistribute super."gogol-groups-settings"; + "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit"; + "gogol-latencytest" = dontDistribute super."gogol-latencytest"; + "gogol-logging" = dontDistribute super."gogol-logging"; + "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate"; + "gogol-maps-engine" = dontDistribute super."gogol-maps-engine"; + "gogol-mirror" = dontDistribute super."gogol-mirror"; + "gogol-monitoring" = dontDistribute super."gogol-monitoring"; + "gogol-oauth2" = dontDistribute super."gogol-oauth2"; + "gogol-pagespeed" = dontDistribute super."gogol-pagespeed"; + "gogol-partners" = dontDistribute super."gogol-partners"; + "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner"; + "gogol-plus" = dontDistribute super."gogol-plus"; + "gogol-plus-domains" = dontDistribute super."gogol-plus-domains"; + "gogol-prediction" = dontDistribute super."gogol-prediction"; + "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon"; + "gogol-pubsub" = dontDistribute super."gogol-pubsub"; + "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress"; + "gogol-replicapool" = dontDistribute super."gogol-replicapool"; + "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater"; + "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager"; + "gogol-resourceviews" = dontDistribute super."gogol-resourceviews"; + "gogol-shopping-content" = dontDistribute super."gogol-shopping-content"; + "gogol-siteverification" = dontDistribute super."gogol-siteverification"; + "gogol-spectrum" = dontDistribute super."gogol-spectrum"; + "gogol-sqladmin" = dontDistribute super."gogol-sqladmin"; + "gogol-storage" = dontDistribute super."gogol-storage"; + "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer"; + "gogol-tagmanager" = dontDistribute super."gogol-tagmanager"; + "gogol-taskqueue" = dontDistribute super."gogol-taskqueue"; + "gogol-translate" = dontDistribute super."gogol-translate"; + "gogol-urlshortener" = dontDistribute super."gogol-urlshortener"; + "gogol-useraccounts" = dontDistribute super."gogol-useraccounts"; + "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools"; + "gogol-youtube" = dontDistribute super."gogol-youtube"; + "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics"; + "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting"; + "gooey" = dontDistribute super."gooey"; + "google-cloud" = dontDistribute super."google-cloud"; + "google-dictionary" = dontDistribute super."google-dictionary"; + "google-drive" = dontDistribute super."google-drive"; + "google-html5-slide" = dontDistribute super."google-html5-slide"; + "google-mail-filters" = dontDistribute super."google-mail-filters"; + "google-oauth2" = dontDistribute super."google-oauth2"; + "google-search" = dontDistribute super."google-search"; + "google-translate" = dontDistribute super."google-translate"; + "googleplus" = dontDistribute super."googleplus"; + "googlepolyline" = dontDistribute super."googlepolyline"; + "gopherbot" = dontDistribute super."gopherbot"; + "gpah" = dontDistribute super."gpah"; + "gpcsets" = dontDistribute super."gpcsets"; + "gpolyline" = dontDistribute super."gpolyline"; + "gps" = dontDistribute super."gps"; + "gps2htmlReport" = dontDistribute super."gps2htmlReport"; + "gpx-conduit" = dontDistribute super."gpx-conduit"; + "graceful" = dontDistribute super."graceful"; + "grammar-combinators" = dontDistribute super."grammar-combinators"; + "grapefruit-examples" = dontDistribute super."grapefruit-examples"; + "grapefruit-frp" = dontDistribute super."grapefruit-frp"; + "grapefruit-records" = dontDistribute super."grapefruit-records"; + "grapefruit-ui" = dontDistribute super."grapefruit-ui"; + "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-generators" = dontDistribute super."graph-generators"; + "graph-matchings" = dontDistribute super."graph-matchings"; + "graph-rewriting" = dontDistribute super."graph-rewriting"; + "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl"; + "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl"; + "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope"; + "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout"; + "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski"; + "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies"; + "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs"; + "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww"; + "graph-serialize" = dontDistribute super."graph-serialize"; + "graph-utils" = dontDistribute super."graph-utils"; + "graph-visit" = dontDistribute super."graph-visit"; + "graphbuilder" = dontDistribute super."graphbuilder"; + "graphene" = dontDistribute super."graphene"; + "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators"; + "graphics-formats-collada" = dontDistribute super."graphics-formats-collada"; + "graphicsFormats" = dontDistribute super."graphicsFormats"; + "graphicstools" = dontDistribute super."graphicstools"; + "graphmod" = dontDistribute super."graphmod"; + "graphql" = dontDistribute super."graphql"; + "graphtype" = dontDistribute super."graphtype"; + "graphviz" = dontDistribute super."graphviz"; + "gray-code" = dontDistribute super."gray-code"; + "gray-extended" = dontDistribute super."gray-extended"; + "greencard" = dontDistribute super."greencard"; + "greencard-lib" = dontDistribute super."greencard-lib"; + "greg-client" = dontDistribute super."greg-client"; + "grid" = dontDistribute super."grid"; + "gridland" = dontDistribute super."gridland"; + "grm" = dontDistribute super."grm"; + "groom" = dontDistribute super."groom"; + "groundhog-inspector" = dontDistribute super."groundhog-inspector"; + "group-with" = dontDistribute super."group-with"; + "grouped-list" = dontDistribute super."grouped-list"; + "groupoid" = dontDistribute super."groupoid"; + "gruff" = dontDistribute super."gruff"; + "gruff-examples" = dontDistribute super."gruff-examples"; + "gsc-weighting" = dontDistribute super."gsc-weighting"; + "gsl-random" = dontDistribute super."gsl-random"; + "gsl-random-fu" = dontDistribute super."gsl-random-fu"; + "gsmenu" = dontDistribute super."gsmenu"; + "gstreamer" = dontDistribute super."gstreamer"; + "gt-tools" = dontDistribute super."gt-tools"; + "gtfs" = dontDistribute super."gtfs"; + "gtk-helpers" = dontDistribute super."gtk-helpers"; + "gtk-jsinput" = dontDistribute super."gtk-jsinput"; + "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore"; + "gtk-mac-integration" = dontDistribute super."gtk-mac-integration"; + "gtk-serialized-event" = dontDistribute super."gtk-serialized-event"; + "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view"; + "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; + "gtk-toy" = dontDistribute super."gtk-toy"; + "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; + "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; + "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; + "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk"; + "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext"; + "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2"; + "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; + "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; + "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; + "gtkglext" = dontDistribute super."gtkglext"; + "gtkimageview" = dontDistribute super."gtkimageview"; + "gtkrsync" = dontDistribute super."gtkrsync"; + "gtksourceview2" = dontDistribute super."gtksourceview2"; + "gtksourceview3" = dontDistribute super."gtksourceview3"; + "guarded-rewriting" = dontDistribute super."guarded-rewriting"; + "guess-combinator" = dontDistribute super."guess-combinator"; + "gulcii" = dontDistribute super."gulcii"; + "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; + "gyah-bin" = dontDistribute super."gyah-bin"; + "h-booru" = dontDistribute super."h-booru"; + "h-gpgme" = dontDistribute super."h-gpgme"; + "h2048" = dontDistribute super."h2048"; + "hArduino" = dontDistribute super."hArduino"; + "hBDD" = dontDistribute super."hBDD"; + "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD"; + "hBDD-CUDD" = dontDistribute super."hBDD-CUDD"; + "hCsound" = dontDistribute super."hCsound"; + "hDFA" = dontDistribute super."hDFA"; + "hF2" = dontDistribute super."hF2"; + "hGelf" = dontDistribute super."hGelf"; + "hLLVM" = dontDistribute super."hLLVM"; + "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = dontDistribute super."hOpenPGP"; + "hPDB-examples" = dontDistribute super."hPDB-examples"; + "hPushover" = dontDistribute super."hPushover"; + "hR" = dontDistribute super."hR"; + "hRESP" = dontDistribute super."hRESP"; + "hS3" = dontDistribute super."hS3"; + "hScraper" = dontDistribute super."hScraper"; + "hSimpleDB" = dontDistribute super."hSimpleDB"; + "hTalos" = dontDistribute super."hTalos"; + "hTensor" = dontDistribute super."hTensor"; + "hVOIDP" = dontDistribute super."hVOIDP"; + "hXmixer" = dontDistribute super."hXmixer"; + "haar" = dontDistribute super."haar"; + "hacanon-light" = dontDistribute super."hacanon-light"; + "hack" = dontDistribute super."hack"; + "hack-contrib" = dontDistribute super."hack-contrib"; + "hack-contrib-press" = dontDistribute super."hack-contrib-press"; + "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack"; + "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi"; + "hack-handler-cgi" = dontDistribute super."hack-handler-cgi"; + "hack-handler-epoll" = dontDistribute super."hack-handler-epoll"; + "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp"; + "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi"; + "hack-handler-happstack" = dontDistribute super."hack-handler-happstack"; + "hack-handler-hyena" = dontDistribute super."hack-handler-hyena"; + "hack-handler-kibro" = dontDistribute super."hack-handler-kibro"; + "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver"; + "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath"; + "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession"; + "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip"; + "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp"; + "hack2" = dontDistribute super."hack2"; + "hack2-contrib" = dontDistribute super."hack2-contrib"; + "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra"; + "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server"; + "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http"; + "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server"; + "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; + "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; + "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-plot" = dontDistribute super."hackage-plot"; + "hackage-proxy" = dontDistribute super."hackage-proxy"; + "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; + "hackage-security" = dontDistribute super."hackage-security"; + "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP"; + "hackage-server" = dontDistribute super."hackage-server"; + "hackage-sparks" = dontDistribute super."hackage-sparks"; + "hackage2hwn" = dontDistribute super."hackage2hwn"; + "hackage2twitter" = dontDistribute super."hackage2twitter"; + "hackager" = dontDistribute super."hackager"; + "hackernews" = dontDistribute super."hackernews"; + "hackertyper" = dontDistribute super."hackertyper"; + "hackmanager" = dontDistribute super."hackmanager"; + "hackport" = dontDistribute super."hackport"; + "hactor" = dontDistribute super."hactor"; + "hactors" = dontDistribute super."hactors"; + "haddock" = dontDistribute super."haddock"; + "haddock-leksah" = dontDistribute super."haddock-leksah"; + "haddocset" = dontDistribute super."haddocset"; + "hadoop-formats" = dontDistribute super."hadoop-formats"; + "hadoop-rpc" = dontDistribute super."hadoop-rpc"; + "hadoop-tools" = dontDistribute super."hadoop-tools"; + "haeredes" = dontDistribute super."haeredes"; + "haggis" = dontDistribute super."haggis"; + "haha" = dontDistribute super."haha"; + "hailgun" = dontDistribute super."hailgun"; + "hailgun-send" = dontDistribute super."hailgun-send"; + "hails" = dontDistribute super."hails"; + "hails-bin" = dontDistribute super."hails-bin"; + "hairy" = dontDistribute super."hairy"; + "hakaru" = dontDistribute super."hakaru"; + "hake" = dontDistribute super."hake"; + "hakismet" = dontDistribute super."hakismet"; + "hako" = dontDistribute super."hako"; + "hakyll-R" = dontDistribute super."hakyll-R"; + "hakyll-agda" = dontDistribute super."hakyll-agda"; + "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; + "hakyll-contrib" = dontDistribute super."hakyll-contrib"; + "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation"; + "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links"; + "hakyll-convert" = dontDistribute super."hakyll-convert"; + "hakyll-elm" = dontDistribute super."hakyll-elm"; + "hakyll-sass" = dontDistribute super."hakyll-sass"; + "halberd" = dontDistribute super."halberd"; + "halfs" = dontDistribute super."halfs"; + "halipeto" = dontDistribute super."halipeto"; + "halive" = dontDistribute super."halive"; + "halma" = dontDistribute super."halma"; + "haltavista" = dontDistribute super."haltavista"; + "hamid" = dontDistribute super."hamid"; + "hampp" = dontDistribute super."hampp"; + "hamtmap" = dontDistribute super."hamtmap"; + "hamusic" = dontDistribute super."hamusic"; + "handa-gdata" = dontDistribute super."handa-gdata"; + "handa-geodata" = dontDistribute super."handa-geodata"; + "handa-opengl" = dontDistribute super."handa-opengl"; + "handle-like" = dontDistribute super."handle-like"; + "handsy" = dontDistribute super."handsy"; + "hangman" = dontDistribute super."hangman"; + "hannahci" = dontDistribute super."hannahci"; + "hans" = dontDistribute super."hans"; + "hans-pcap" = dontDistribute super."hans-pcap"; + "hans-pfq" = dontDistribute super."hans-pfq"; + "hapistrano" = dontDistribute super."hapistrano"; + "happindicator" = dontDistribute super."happindicator"; + "happindicator3" = dontDistribute super."happindicator3"; + "happraise" = dontDistribute super."happraise"; + "happs-hsp" = dontDistribute super."happs-hsp"; + "happs-hsp-template" = dontDistribute super."happs-hsp-template"; + "happs-tutorial" = dontDistribute super."happs-tutorial"; + "happstack" = dontDistribute super."happstack"; + "happstack-auth" = dontDistribute super."happstack-auth"; + "happstack-authenticate" = dontDistribute super."happstack-authenticate"; + "happstack-clientsession" = dontDistribute super."happstack-clientsession"; + "happstack-contrib" = dontDistribute super."happstack-contrib"; + "happstack-data" = dontDistribute super."happstack-data"; + "happstack-dlg" = dontDistribute super."happstack-dlg"; + "happstack-facebook" = dontDistribute super."happstack-facebook"; + "happstack-fastcgi" = dontDistribute super."happstack-fastcgi"; + "happstack-fay" = dontDistribute super."happstack-fay"; + "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax"; + "happstack-foundation" = dontDistribute super."happstack-foundation"; + "happstack-hamlet" = dontDistribute super."happstack-hamlet"; + "happstack-heist" = dontDistribute super."happstack-heist"; + "happstack-helpers" = dontDistribute super."happstack-helpers"; + "happstack-hsp" = dontDistribute super."happstack-hsp"; + "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate"; + "happstack-ixset" = dontDistribute super."happstack-ixset"; + "happstack-jmacro" = dontDistribute super."happstack-jmacro"; + "happstack-lite" = dontDistribute super."happstack-lite"; + "happstack-monad-peel" = dontDistribute super."happstack-monad-peel"; + "happstack-plugins" = dontDistribute super."happstack-plugins"; + "happstack-server-tls" = dontDistribute super."happstack-server-tls"; + "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite"; + "happstack-state" = dontDistribute super."happstack-state"; + "happstack-static-routing" = dontDistribute super."happstack-static-routing"; + "happstack-util" = dontDistribute super."happstack-util"; + "happstack-yui" = dontDistribute super."happstack-yui"; + "happy-meta" = dontDistribute super."happy-meta"; + "happybara" = dontDistribute super."happybara"; + "happybara-webkit" = dontDistribute super."happybara-webkit"; + "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; + "har" = dontDistribute super."har"; + "harchive" = dontDistribute super."harchive"; + "hark" = dontDistribute super."hark"; + "harmony" = dontDistribute super."harmony"; + "haroonga" = dontDistribute super."haroonga"; + "haroonga-httpd" = dontDistribute super."haroonga-httpd"; + "harp" = dontDistribute super."harp"; + "harpy" = dontDistribute super."harpy"; + "has" = dontDistribute super."has"; + "has-th" = dontDistribute super."has-th"; + "hascal" = dontDistribute super."hascal"; + "hascat" = dontDistribute super."hascat"; + "hascat-lib" = dontDistribute super."hascat-lib"; + "hascat-setup" = dontDistribute super."hascat-setup"; + "hascat-system" = dontDistribute super."hascat-system"; + "hash" = dontDistribute super."hash"; + "hashable-generics" = dontDistribute super."hashable-generics"; + "hashable-time" = dontDistribute super."hashable-time"; + "hashabler" = dontDistribute super."hashabler"; + "hashed-storage" = dontDistribute super."hashed-storage"; + "hashids" = dontDistribute super."hashids"; + "hashring" = dontDistribute super."hashring"; + "hashtables-plus" = dontDistribute super."hashtables-plus"; + "hasim" = dontDistribute super."hasim"; + "hask" = dontDistribute super."hask"; + "hask-home" = dontDistribute super."hask-home"; + "haskades" = dontDistribute super."haskades"; + "haskakafka" = dontDistribute super."haskakafka"; + "haskanoid" = dontDistribute super."haskanoid"; + "haskarrow" = dontDistribute super."haskarrow"; + "haskbot-core" = dontDistribute super."haskbot-core"; + "haskdeep" = dontDistribute super."haskdeep"; + "haskdogs" = dontDistribute super."haskdogs"; + "haskeem" = dontDistribute super."haskeem"; + "haskeline" = doDistribute super."haskeline_0_7_2_1"; + "haskeline-class" = dontDistribute super."haskeline-class"; + "haskell-aliyun" = dontDistribute super."haskell-aliyun"; + "haskell-awk" = dontDistribute super."haskell-awk"; + "haskell-bcrypt" = dontDistribute super."haskell-bcrypt"; + "haskell-brainfuck" = dontDistribute super."haskell-brainfuck"; + "haskell-cnc" = dontDistribute super."haskell-cnc"; + "haskell-coffee" = dontDistribute super."haskell-coffee"; + "haskell-compression" = dontDistribute super."haskell-compression"; + "haskell-course-preludes" = dontDistribute super."haskell-course-preludes"; + "haskell-docs" = dontDistribute super."haskell-docs"; + "haskell-exp-parser" = dontDistribute super."haskell-exp-parser"; + "haskell-formatter" = dontDistribute super."haskell-formatter"; + "haskell-ftp" = dontDistribute super."haskell-ftp"; + "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-gi" = dontDistribute super."haskell-gi"; + "haskell-gi-base" = dontDistribute super."haskell-gi-base"; + "haskell-import-graph" = dontDistribute super."haskell-import-graph"; + "haskell-in-space" = dontDistribute super."haskell-in-space"; + "haskell-modbus" = dontDistribute super."haskell-modbus"; + "haskell-mpi" = dontDistribute super."haskell-mpi"; + "haskell-openflow" = dontDistribute super."haskell-openflow"; + "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter"; + "haskell-platform-test" = dontDistribute super."haskell-platform-test"; + "haskell-plot" = dontDistribute super."haskell-plot"; + "haskell-qrencode" = dontDistribute super."haskell-qrencode"; + "haskell-read-editor" = dontDistribute super."haskell-read-editor"; + "haskell-reflect" = dontDistribute super."haskell-reflect"; + "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; + "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; + "haskell-token-utils" = dontDistribute super."haskell-token-utils"; + "haskell-tor" = dontDistribute super."haskell-tor"; + "haskell-type-exts" = dontDistribute super."haskell-type-exts"; + "haskell-typescript" = dontDistribute super."haskell-typescript"; + "haskell-tyrant" = dontDistribute super."haskell-tyrant"; + "haskell-updater" = dontDistribute super."haskell-updater"; + "haskell-xmpp" = dontDistribute super."haskell-xmpp"; + "haskell2010" = dontDistribute super."haskell2010"; + "haskell98" = dontDistribute super."haskell98"; + "haskell98libraries" = dontDistribute super."haskell98libraries"; + "haskelldb" = dontDistribute super."haskelldb"; + "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc"; + "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl"; + "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf"; + "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers"; + "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted"; + "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic"; + "haskelldb-flat" = dontDistribute super."haskelldb-flat"; + "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc"; + "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql"; + "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc"; + "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql"; + "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3"; + "haskelldb-hsql" = dontDistribute super."haskelldb-hsql"; + "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql"; + "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc"; + "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle"; + "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql"; + "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite"; + "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3"; + "haskelldb-th" = dontDistribute super."haskelldb-th"; + "haskelldb-wx" = dontDistribute super."haskelldb-wx"; + "haskellscrabble" = dontDistribute super."haskellscrabble"; + "haskellscript" = dontDistribute super."haskellscript"; + "haskelm" = dontDistribute super."haskelm"; + "haskgame" = dontDistribute super."haskgame"; + "haskheap" = dontDistribute super."haskheap"; + "haskhol-core" = dontDistribute super."haskhol-core"; + "haskintex" = doDistribute super."haskintex_0_5_1_0"; + "haskmon" = dontDistribute super."haskmon"; + "haskoin" = dontDistribute super."haskoin"; + "haskoin-core" = dontDistribute super."haskoin-core"; + "haskoin-crypto" = dontDistribute super."haskoin-crypto"; + "haskoin-node" = dontDistribute super."haskoin-node"; + "haskoin-protocol" = dontDistribute super."haskoin-protocol"; + "haskoin-script" = dontDistribute super."haskoin-script"; + "haskoin-util" = dontDistribute super."haskoin-util"; + "haskoin-wallet" = dontDistribute super."haskoin-wallet"; + "haskoon" = dontDistribute super."haskoon"; + "haskoon-httpspec" = dontDistribute super."haskoon-httpspec"; + "haskoon-salvia" = dontDistribute super."haskoon-salvia"; + "haskore" = dontDistribute super."haskore"; + "haskore-realtime" = dontDistribute super."haskore-realtime"; + "haskore-supercollider" = dontDistribute super."haskore-supercollider"; + "haskore-synthesizer" = dontDistribute super."haskore-synthesizer"; + "haskore-vintage" = dontDistribute super."haskore-vintage"; + "hasktags" = dontDistribute super."hasktags"; + "haslo" = dontDistribute super."haslo"; + "hasloGUI" = dontDistribute super."hasloGUI"; + "hasparql-client" = dontDistribute super."hasparql-client"; + "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; + "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; + "hastache-aeson" = dontDistribute super."hastache-aeson"; + "haste" = dontDistribute super."haste"; + "haste-compiler" = dontDistribute super."haste-compiler"; + "haste-markup" = dontDistribute super."haste-markup"; + "haste-perch" = dontDistribute super."haste-perch"; + "hastily" = dontDistribute super."hastily"; + "hasty-hamiltonian" = dontDistribute super."hasty-hamiltonian"; + "hat" = dontDistribute super."hat"; + "hatex-guide" = dontDistribute super."hatex-guide"; + "hath" = dontDistribute super."hath"; + "hatt" = dontDistribute super."hatt"; + "haverer" = dontDistribute super."haverer"; + "hawitter" = dontDistribute super."hawitter"; + "haxl" = dontDistribute super."haxl"; + "haxl-amazonka" = dontDistribute super."haxl-amazonka"; + "haxl-facebook" = dontDistribute super."haxl-facebook"; + "haxparse" = dontDistribute super."haxparse"; + "haxr-th" = dontDistribute super."haxr-th"; + "haxy" = dontDistribute super."haxy"; + "hayland" = dontDistribute super."hayland"; + "hayoo-cli" = dontDistribute super."hayoo-cli"; + "hback" = dontDistribute super."hback"; + "hbayes" = dontDistribute super."hbayes"; + "hbb" = dontDistribute super."hbb"; + "hbcd" = dontDistribute super."hbcd"; + "hbeat" = dontDistribute super."hbeat"; + "hblas" = dontDistribute super."hblas"; + "hblock" = dontDistribute super."hblock"; + "hbro" = dontDistribute super."hbro"; + "hbro-contrib" = dontDistribute super."hbro-contrib"; + "hburg" = dontDistribute super."hburg"; + "hcc" = dontDistribute super."hcc"; + "hcg-minus" = dontDistribute super."hcg-minus"; + "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo"; + "hcheat" = dontDistribute super."hcheat"; + "hchesslib" = dontDistribute super."hchesslib"; + "hcltest" = dontDistribute super."hcltest"; + "hcron" = dontDistribute super."hcron"; + "hcube" = dontDistribute super."hcube"; + "hcwiid" = dontDistribute super."hcwiid"; + "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix"; + "hdbc-aeson" = dontDistribute super."hdbc-aeson"; + "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore"; + "hdbc-tuple" = dontDistribute super."hdbc-tuple"; + "hdbi" = dontDistribute super."hdbi"; + "hdbi-conduit" = dontDistribute super."hdbi-conduit"; + "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; + "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; + "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdf" = dontDistribute super."hdf"; + "hdigest" = dontDistribute super."hdigest"; + "hdirect" = dontDistribute super."hdirect"; + "hdis86" = dontDistribute super."hdis86"; + "hdiscount" = dontDistribute super."hdiscount"; + "hdm" = dontDistribute super."hdm"; + "hdph" = dontDistribute super."hdph"; + "hdph-closure" = dontDistribute super."hdph-closure"; + "headergen" = dontDistribute super."headergen"; + "heapsort" = dontDistribute super."heapsort"; + "hecc" = dontDistribute super."hecc"; + "hedis-config" = dontDistribute super."hedis-config"; + "hedis-monadic" = dontDistribute super."hedis-monadic"; + "hedis-pile" = dontDistribute super."hedis-pile"; + "hedis-simple" = dontDistribute super."hedis-simple"; + "hedis-tags" = dontDistribute super."hedis-tags"; + "hedn" = dontDistribute super."hedn"; + "hein" = dontDistribute super."hein"; + "heist-aeson" = dontDistribute super."heist-aeson"; + "heist-async" = dontDistribute super."heist-async"; + "helics" = dontDistribute super."helics"; + "helics-wai" = dontDistribute super."helics-wai"; + "helisp" = dontDistribute super."helisp"; + "helium" = dontDistribute super."helium"; + "hell" = dontDistribute super."hell"; + "hellage" = dontDistribute super."hellage"; + "hellnet" = dontDistribute super."hellnet"; + "hello" = dontDistribute super."hello"; + "helm" = dontDistribute super."helm"; + "help-esb" = dontDistribute super."help-esb"; + "hemkay" = dontDistribute super."hemkay"; + "hemkay-core" = dontDistribute super."hemkay-core"; + "hemokit" = dontDistribute super."hemokit"; + "hen" = dontDistribute super."hen"; + "henet" = dontDistribute super."henet"; + "hepevt" = dontDistribute super."hepevt"; + "her-lexer" = dontDistribute super."her-lexer"; + "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; + "herbalizer" = dontDistribute super."herbalizer"; + "hermit" = dontDistribute super."hermit"; + "hermit-syb" = dontDistribute super."hermit-syb"; + "heroku" = dontDistribute super."heroku"; + "heroku-persistent" = dontDistribute super."heroku-persistent"; + "herringbone" = dontDistribute super."herringbone"; + "herringbone-embed" = dontDistribute super."herringbone-embed"; + "herringbone-wai" = dontDistribute super."herringbone-wai"; + "hesql" = dontDistribute super."hesql"; + "hetero-map" = dontDistribute super."hetero-map"; + "hetris" = dontDistribute super."hetris"; + "heukarya" = dontDistribute super."heukarya"; + "hevolisa" = dontDistribute super."hevolisa"; + "hevolisa-dph" = dontDistribute super."hevolisa-dph"; + "hexdump" = dontDistribute super."hexdump"; + "hexif" = dontDistribute super."hexif"; + "hexpat-iteratee" = dontDistribute super."hexpat-iteratee"; + "hexpat-lens" = dontDistribute super."hexpat-lens"; + "hexpat-pickle" = dontDistribute super."hexpat-pickle"; + "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic"; + "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup"; + "hexpr" = dontDistribute super."hexpr"; + "hexquote" = dontDistribute super."hexquote"; + "heyefi" = dontDistribute super."heyefi"; + "hfann" = dontDistribute super."hfann"; + "hfd" = dontDistribute super."hfd"; + "hfiar" = dontDistribute super."hfiar"; + "hfmt" = dontDistribute super."hfmt"; + "hfoil" = dontDistribute super."hfoil"; + "hfov" = dontDistribute super."hfov"; + "hfractal" = dontDistribute super."hfractal"; + "hfusion" = dontDistribute super."hfusion"; + "hg-buildpackage" = dontDistribute super."hg-buildpackage"; + "hgal" = dontDistribute super."hgal"; + "hgalib" = dontDistribute super."hgalib"; + "hgdbmi" = dontDistribute super."hgdbmi"; + "hgearman" = dontDistribute super."hgearman"; + "hgen" = dontDistribute super."hgen"; + "hgeometric" = dontDistribute super."hgeometric"; + "hgeometry" = dontDistribute super."hgeometry"; + "hgettext" = dontDistribute super."hgettext"; + "hgithub" = dontDistribute super."hgithub"; + "hgl-example" = dontDistribute super."hgl-example"; + "hgom" = dontDistribute super."hgom"; + "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; + "hgrib" = dontDistribute super."hgrib"; + "hharp" = dontDistribute super."hharp"; + "hi" = dontDistribute super."hi"; + "hiccup" = dontDistribute super."hiccup"; + "hichi" = dontDistribute super."hichi"; + "hidapi" = dontDistribute super."hidapi"; + "hieraclus" = dontDistribute super."hieraclus"; + "hierarchical-clustering" = dontDistribute super."hierarchical-clustering"; + "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams"; + "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions"; + "hierarchy" = dontDistribute super."hierarchy"; + "hiernotify" = dontDistribute super."hiernotify"; + "highWaterMark" = dontDistribute super."highWaterMark"; + "higher-leveldb" = dontDistribute super."higher-leveldb"; + "higherorder" = dontDistribute super."higherorder"; + "highlight-versions" = dontDistribute super."highlight-versions"; + "highlighter" = dontDistribute super."highlighter"; + "highlighter2" = dontDistribute super."highlighter2"; + "hills" = dontDistribute super."hills"; + "himerge" = dontDistribute super."himerge"; + "himg" = dontDistribute super."himg"; + "himpy" = dontDistribute super."himpy"; + "hindent" = doDistribute super."hindent_4_5_5"; + "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; + "hinduce-classifier" = dontDistribute super."hinduce-classifier"; + "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; + "hinduce-examples" = dontDistribute super."hinduce-examples"; + "hinduce-missingh" = dontDistribute super."hinduce-missingh"; + "hinquire" = dontDistribute super."hinquire"; + "hinstaller" = dontDistribute super."hinstaller"; + "hint-server" = dontDistribute super."hint-server"; + "hinvaders" = dontDistribute super."hinvaders"; + "hinze-streams" = dontDistribute super."hinze-streams"; + "hipbot" = dontDistribute super."hipbot"; + "hipe" = dontDistribute super."hipe"; + "hips" = dontDistribute super."hips"; + "hircules" = dontDistribute super."hircules"; + "hirt" = dontDistribute super."hirt"; + "hissmetrics" = dontDistribute super."hissmetrics"; + "hist-pl" = dontDistribute super."hist-pl"; + "hist-pl-dawg" = dontDistribute super."hist-pl-dawg"; + "hist-pl-fusion" = dontDistribute super."hist-pl-fusion"; + "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon"; + "hist-pl-lmf" = dontDistribute super."hist-pl-lmf"; + "hist-pl-transliter" = dontDistribute super."hist-pl-transliter"; + "hist-pl-types" = dontDistribute super."hist-pl-types"; + "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; + "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; + "historian" = dontDistribute super."historian"; + "hjcase" = dontDistribute super."hjcase"; + "hjpath" = dontDistribute super."hjpath"; + "hjs" = dontDistribute super."hjs"; + "hjson" = dontDistribute super."hjson"; + "hjson-query" = dontDistribute super."hjson-query"; + "hjsonpointer" = dontDistribute super."hjsonpointer"; + "hjsonschema" = dontDistribute super."hjsonschema"; + "hlatex" = dontDistribute super."hlatex"; + "hlbfgsb" = dontDistribute super."hlbfgsb"; + "hlcm" = dontDistribute super."hlcm"; + "hledger" = doDistribute super."hledger_0_26"; + "hledger-chart" = dontDistribute super."hledger-chart"; + "hledger-diff" = dontDistribute super."hledger-diff"; + "hledger-interest" = dontDistribute super."hledger-interest"; + "hledger-irr" = dontDistribute super."hledger-irr"; + "hledger-lib" = doDistribute super."hledger-lib_0_26"; + "hledger-ui" = dontDistribute super."hledger-ui"; + "hledger-vty" = dontDistribute super."hledger-vty"; + "hledger-web" = doDistribute super."hledger-web_0_26"; + "hlibBladeRF" = dontDistribute super."hlibBladeRF"; + "hlibev" = dontDistribute super."hlibev"; + "hlibfam" = dontDistribute super."hlibfam"; + "hlogger" = dontDistribute super."hlogger"; + "hlongurl" = dontDistribute super."hlongurl"; + "hls" = dontDistribute super."hls"; + "hlwm" = dontDistribute super."hlwm"; + "hly" = dontDistribute super."hly"; + "hmark" = dontDistribute super."hmark"; + "hmarkup" = dontDistribute super."hmarkup"; + "hmatrix" = doDistribute super."hmatrix_0_16_1_5"; + "hmatrix-banded" = dontDistribute super."hmatrix-banded"; + "hmatrix-csv" = dontDistribute super."hmatrix-csv"; + "hmatrix-glpk" = dontDistribute super."hmatrix-glpk"; + "hmatrix-gsl" = doDistribute super."hmatrix-gsl_0_16_0_3"; + "hmatrix-gsl-stats" = doDistribute super."hmatrix-gsl-stats_0_4_1_1"; + "hmatrix-mmap" = dontDistribute super."hmatrix-mmap"; + "hmatrix-nipals" = dontDistribute super."hmatrix-nipals"; + "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp"; + "hmatrix-special" = dontDistribute super."hmatrix-special"; + "hmatrix-static" = dontDistribute super."hmatrix-static"; + "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc"; + "hmatrix-syntax" = dontDistribute super."hmatrix-syntax"; + "hmatrix-tests" = dontDistribute super."hmatrix-tests"; + "hmeap" = dontDistribute super."hmeap"; + "hmeap-utils" = dontDistribute super."hmeap-utils"; + "hmemdb" = dontDistribute super."hmemdb"; + "hmenu" = dontDistribute super."hmenu"; + "hmidi" = dontDistribute super."hmidi"; + "hmk" = dontDistribute super."hmk"; + "hmm" = dontDistribute super."hmm"; + "hmm-hmatrix" = dontDistribute super."hmm-hmatrix"; + "hmp3" = dontDistribute super."hmp3"; + "hmpfr" = dontDistribute super."hmpfr"; + "hmt" = dontDistribute super."hmt"; + "hmt-diagrams" = dontDistribute super."hmt-diagrams"; + "hmumps" = dontDistribute super."hmumps"; + "hnetcdf" = dontDistribute super."hnetcdf"; + "hnix" = dontDistribute super."hnix"; + "hnn" = dontDistribute super."hnn"; + "hnop" = dontDistribute super."hnop"; + "ho-rewriting" = dontDistribute super."ho-rewriting"; + "hoauth" = dontDistribute super."hoauth"; + "hob" = dontDistribute super."hob"; + "hobbes" = dontDistribute super."hobbes"; + "hobbits" = dontDistribute super."hobbits"; + "hoe" = dontDistribute super."hoe"; + "hofix-mtl" = dontDistribute super."hofix-mtl"; + "hog" = dontDistribute super."hog"; + "hogg" = dontDistribute super."hogg"; + "hogre" = dontDistribute super."hogre"; + "hogre-examples" = dontDistribute super."hogre-examples"; + "hois" = dontDistribute super."hois"; + "hoist-error" = dontDistribute super."hoist-error"; + "hold-em" = dontDistribute super."hold-em"; + "hole" = dontDistribute super."hole"; + "holey-format" = dontDistribute super."holey-format"; + "homeomorphic" = dontDistribute super."homeomorphic"; + "hommage" = dontDistribute super."hommage"; + "hommage-ds" = dontDistribute super."hommage-ds"; + "homplexity" = dontDistribute super."homplexity"; + "honi" = dontDistribute super."honi"; + "honk" = dontDistribute super."honk"; + "hoobuddy" = dontDistribute super."hoobuddy"; + "hood" = dontDistribute super."hood"; + "hood-off" = dontDistribute super."hood-off"; + "hood2" = dontDistribute super."hood2"; + "hoodie" = dontDistribute super."hoodie"; + "hoodle" = dontDistribute super."hoodle"; + "hoodle-builder" = dontDistribute super."hoodle-builder"; + "hoodle-core" = dontDistribute super."hoodle-core"; + "hoodle-extra" = dontDistribute super."hoodle-extra"; + "hoodle-parser" = dontDistribute super."hoodle-parser"; + "hoodle-publish" = dontDistribute super."hoodle-publish"; + "hoodle-render" = dontDistribute super."hoodle-render"; + "hoodle-types" = dontDistribute super."hoodle-types"; + "hoogle-index" = dontDistribute super."hoogle-index"; + "hooks-dir" = dontDistribute super."hooks-dir"; + "hoovie" = dontDistribute super."hoovie"; + "hopencc" = dontDistribute super."hopencc"; + "hopencl" = dontDistribute super."hopencl"; + "hopenpgp-tools" = dontDistribute super."hopenpgp-tools"; + "hopenssl" = dontDistribute super."hopenssl"; + "hopfield" = dontDistribute super."hopfield"; + "hopfield-networks" = dontDistribute super."hopfield-networks"; + "hopfli" = dontDistribute super."hopfli"; + "hops" = dontDistribute super."hops"; + "hoq" = dontDistribute super."hoq"; + "horizon" = dontDistribute super."horizon"; + "hosc" = dontDistribute super."hosc"; + "hosc-json" = dontDistribute super."hosc-json"; + "hosc-utils" = dontDistribute super."hosc-utils"; + "hosts-server" = dontDistribute super."hosts-server"; + "hothasktags" = dontDistribute super."hothasktags"; + "hotswap" = dontDistribute super."hotswap"; + "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing"; + "hp2any-core" = dontDistribute super."hp2any-core"; + "hp2any-graph" = dontDistribute super."hp2any-graph"; + "hp2any-manager" = dontDistribute super."hp2any-manager"; + "hp2html" = dontDistribute super."hp2html"; + "hp2pretty" = dontDistribute super."hp2pretty"; + "hpack" = dontDistribute super."hpack"; + "hpaco" = dontDistribute super."hpaco"; + "hpaco-lib" = dontDistribute super."hpaco-lib"; + "hpage" = dontDistribute super."hpage"; + "hpapi" = dontDistribute super."hpapi"; + "hpaste" = dontDistribute super."hpaste"; + "hpasteit" = dontDistribute super."hpasteit"; + "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0"; + "hpc-strobe" = dontDistribute super."hpc-strobe"; + "hpc-tracer" = dontDistribute super."hpc-tracer"; + "hplayground" = dontDistribute super."hplayground"; + "hplaylist" = dontDistribute super."hplaylist"; + "hpodder" = dontDistribute super."hpodder"; + "hpp" = dontDistribute super."hpp"; + "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc-fork" = dontDistribute super."hprotoc-fork"; + "hps" = dontDistribute super."hps"; + "hps-cairo" = dontDistribute super."hps-cairo"; + "hps-kmeans" = dontDistribute super."hps-kmeans"; + "hpuz" = dontDistribute super."hpuz"; + "hpygments" = dontDistribute super."hpygments"; + "hpylos" = dontDistribute super."hpylos"; + "hpyrg" = dontDistribute super."hpyrg"; + "hquantlib" = dontDistribute super."hquantlib"; + "hquery" = dontDistribute super."hquery"; + "hranker" = dontDistribute super."hranker"; + "hreader" = dontDistribute super."hreader"; + "hricket" = dontDistribute super."hricket"; + "hruby" = dontDistribute super."hruby"; + "hs-GeoIP" = dontDistribute super."hs-GeoIP"; + "hs-blake2" = dontDistribute super."hs-blake2"; + "hs-captcha" = dontDistribute super."hs-captcha"; + "hs-carbon" = dontDistribute super."hs-carbon"; + "hs-carbon-examples" = dontDistribute super."hs-carbon-examples"; + "hs-cdb" = dontDistribute super."hs-cdb"; + "hs-dotnet" = dontDistribute super."hs-dotnet"; + "hs-duktape" = dontDistribute super."hs-duktape"; + "hs-excelx" = dontDistribute super."hs-excelx"; + "hs-ffmpeg" = dontDistribute super."hs-ffmpeg"; + "hs-fltk" = dontDistribute super."hs-fltk"; + "hs-gchart" = dontDistribute super."hs-gchart"; + "hs-gen-iface" = dontDistribute super."hs-gen-iface"; + "hs-gizapp" = dontDistribute super."hs-gizapp"; + "hs-inspector" = dontDistribute super."hs-inspector"; + "hs-java" = dontDistribute super."hs-java"; + "hs-json-rpc" = dontDistribute super."hs-json-rpc"; + "hs-logo" = dontDistribute super."hs-logo"; + "hs-mesos" = dontDistribute super."hs-mesos"; + "hs-nombre-generator" = dontDistribute super."hs-nombre-generator"; + "hs-pgms" = dontDistribute super."hs-pgms"; + "hs-php-session" = dontDistribute super."hs-php-session"; + "hs-pkg-config" = dontDistribute super."hs-pkg-config"; + "hs-pkpass" = dontDistribute super."hs-pkpass"; + "hs-re" = dontDistribute super."hs-re"; + "hs-scrape" = dontDistribute super."hs-scrape"; + "hs-twitter" = dontDistribute super."hs-twitter"; + "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver"; + "hs-vcard" = dontDistribute super."hs-vcard"; + "hs2048" = dontDistribute super."hs2048"; + "hs2bf" = dontDistribute super."hs2bf"; + "hs2dot" = dontDistribute super."hs2dot"; + "hsConfigure" = dontDistribute super."hsConfigure"; + "hsSqlite3" = dontDistribute super."hsSqlite3"; + "hsXenCtrl" = dontDistribute super."hsXenCtrl"; + "hsay" = dontDistribute super."hsay"; + "hsb2hs" = dontDistribute super."hsb2hs"; + "hsbackup" = dontDistribute super."hsbackup"; + "hsbencher" = dontDistribute super."hsbencher"; + "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed"; + "hsbencher-fusion" = dontDistribute super."hsbencher-fusion"; + "hsc2hs" = dontDistribute super."hsc2hs"; + "hsc3" = dontDistribute super."hsc3"; + "hsc3-auditor" = dontDistribute super."hsc3-auditor"; + "hsc3-cairo" = dontDistribute super."hsc3-cairo"; + "hsc3-data" = dontDistribute super."hsc3-data"; + "hsc3-db" = dontDistribute super."hsc3-db"; + "hsc3-dot" = dontDistribute super."hsc3-dot"; + "hsc3-forth" = dontDistribute super."hsc3-forth"; + "hsc3-graphs" = dontDistribute super."hsc3-graphs"; + "hsc3-lang" = dontDistribute super."hsc3-lang"; + "hsc3-lisp" = dontDistribute super."hsc3-lisp"; + "hsc3-plot" = dontDistribute super."hsc3-plot"; + "hsc3-process" = dontDistribute super."hsc3-process"; + "hsc3-rec" = dontDistribute super."hsc3-rec"; + "hsc3-rw" = dontDistribute super."hsc3-rw"; + "hsc3-server" = dontDistribute super."hsc3-server"; + "hsc3-sf" = dontDistribute super."hsc3-sf"; + "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile"; + "hsc3-unsafe" = dontDistribute super."hsc3-unsafe"; + "hsc3-utils" = dontDistribute super."hsc3-utils"; + "hscamwire" = dontDistribute super."hscamwire"; + "hscassandra" = dontDistribute super."hscassandra"; + "hscd" = dontDistribute super."hscd"; + "hsclock" = dontDistribute super."hsclock"; + "hscope" = dontDistribute super."hscope"; + "hscrtmpl" = dontDistribute super."hscrtmpl"; + "hscuid" = dontDistribute super."hscuid"; + "hscurses" = dontDistribute super."hscurses"; + "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex"; + "hsdev" = dontDistribute super."hsdev"; + "hsdif" = dontDistribute super."hsdif"; + "hsdip" = dontDistribute super."hsdip"; + "hsdns" = dontDistribute super."hsdns"; + "hsdns-cache" = dontDistribute super."hsdns-cache"; + "hsemail-ns" = dontDistribute super."hsemail-ns"; + "hsenv" = dontDistribute super."hsenv"; + "hserv" = dontDistribute super."hserv"; + "hset" = dontDistribute super."hset"; + "hsexif" = dontDistribute super."hsexif"; + "hsfacter" = dontDistribute super."hsfacter"; + "hsfcsh" = dontDistribute super."hsfcsh"; + "hsfilt" = dontDistribute super."hsfilt"; + "hsgnutls" = dontDistribute super."hsgnutls"; + "hsgnutls-yj" = dontDistribute super."hsgnutls-yj"; + "hsgsom" = dontDistribute super."hsgsom"; + "hsgtd" = dontDistribute super."hsgtd"; + "hsharc" = dontDistribute super."hsharc"; + "hsignal" = doDistribute super."hsignal_0_2_7_1"; + "hsilop" = dontDistribute super."hsilop"; + "hsimport" = dontDistribute super."hsimport"; + "hsini" = dontDistribute super."hsini"; + "hskeleton" = dontDistribute super."hskeleton"; + "hslackbuilder" = dontDistribute super."hslackbuilder"; + "hslibsvm" = dontDistribute super."hslibsvm"; + "hslinks" = dontDistribute super."hslinks"; + "hslogger-reader" = dontDistribute super."hslogger-reader"; + "hslogger-template" = dontDistribute super."hslogger-template"; + "hslogger4j" = dontDistribute super."hslogger4j"; + "hslogstash" = dontDistribute super."hslogstash"; + "hsmagick" = dontDistribute super."hsmagick"; + "hsmisc" = dontDistribute super."hsmisc"; + "hsmtpclient" = dontDistribute super."hsmtpclient"; + "hsndfile" = dontDistribute super."hsndfile"; + "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector"; + "hsndfile-vector" = dontDistribute super."hsndfile-vector"; + "hsnock" = dontDistribute super."hsnock"; + "hsnoise" = dontDistribute super."hsnoise"; + "hsns" = dontDistribute super."hsns"; + "hsnsq" = dontDistribute super."hsnsq"; + "hsntp" = dontDistribute super."hsntp"; + "hsoptions" = dontDistribute super."hsoptions"; + "hsp" = dontDistribute super."hsp"; + "hsp-cgi" = dontDistribute super."hsp-cgi"; + "hsparklines" = dontDistribute super."hsparklines"; + "hsparql" = dontDistribute super."hsparql"; + "hspear" = dontDistribute super."hspear"; + "hspec" = doDistribute super."hspec_2_1_10"; + "hspec-checkers" = dontDistribute super."hspec-checkers"; + "hspec-core" = doDistribute super."hspec-core_2_1_10"; + "hspec-discover" = doDistribute super."hspec-discover_2_1_10"; + "hspec-expectations" = doDistribute super."hspec-expectations_0_7_1"; + "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens"; + "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted"; + "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty"; + "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff"; + "hspec-experimental" = dontDistribute super."hspec-experimental"; + "hspec-laws" = dontDistribute super."hspec-laws"; + "hspec-meta" = doDistribute super."hspec-meta_2_1_7"; + "hspec-monad-control" = dontDistribute super."hspec-monad-control"; + "hspec-server" = dontDistribute super."hspec-server"; + "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; + "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; + "hspec-test-framework" = dontDistribute super."hspec-test-framework"; + "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; + "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3"; + "hspec2" = dontDistribute super."hspec2"; + "hspr-sh" = dontDistribute super."hspr-sh"; + "hspread" = dontDistribute super."hspread"; + "hspresent" = dontDistribute super."hspresent"; + "hsprocess" = dontDistribute super."hsprocess"; + "hsql" = dontDistribute super."hsql"; + "hsql-mysql" = dontDistribute super."hsql-mysql"; + "hsql-odbc" = dontDistribute super."hsql-odbc"; + "hsql-postgresql" = dontDistribute super."hsql-postgresql"; + "hsql-sqlite3" = dontDistribute super."hsql-sqlite3"; + "hsqml" = dontDistribute super."hsqml"; + "hsqml-datamodel" = dontDistribute super."hsqml-datamodel"; + "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl"; + "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris"; + "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes"; + "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; + "hsqml-morris" = dontDistribute super."hsqml-morris"; + "hsreadability" = dontDistribute super."hsreadability"; + "hsshellscript" = dontDistribute super."hsshellscript"; + "hssourceinfo" = dontDistribute super."hssourceinfo"; + "hssqlppp" = dontDistribute super."hssqlppp"; + "hstatistics" = doDistribute super."hstatistics_0_2_5_2"; + "hstats" = dontDistribute super."hstats"; + "hstest" = dontDistribute super."hstest"; + "hstidy" = dontDistribute super."hstidy"; + "hstorchat" = dontDistribute super."hstorchat"; + "hstradeking" = dontDistribute super."hstradeking"; + "hstyle" = dontDistribute super."hstyle"; + "hstzaar" = dontDistribute super."hstzaar"; + "hsubconvert" = dontDistribute super."hsubconvert"; + "hsverilog" = dontDistribute super."hsverilog"; + "hswip" = dontDistribute super."hswip"; + "hsx" = dontDistribute super."hsx"; + "hsx-jmacro" = dontDistribute super."hsx-jmacro"; + "hsx-xhtml" = dontDistribute super."hsx-xhtml"; + "hsx2hs" = dontDistribute super."hsx2hs"; + "hsyscall" = dontDistribute super."hsyscall"; + "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = dontDistribute super."htaglib"; + "htags" = dontDistribute super."htags"; + "htar" = dontDistribute super."htar"; + "htiled" = dontDistribute super."htiled"; + "htime" = dontDistribute super."htime"; + "html-email-validate" = dontDistribute super."html-email-validate"; + "html-entities" = dontDistribute super."html-entities"; + "html-kure" = dontDistribute super."html-kure"; + "html-minimalist" = dontDistribute super."html-minimalist"; + "html-rules" = dontDistribute super."html-rules"; + "html-tokenizer" = dontDistribute super."html-tokenizer"; + "html-truncate" = dontDistribute super."html-truncate"; + "html2hamlet" = dontDistribute super."html2hamlet"; + "html5-entity" = dontDistribute super."html5-entity"; + "htodo" = dontDistribute super."htodo"; + "htoml" = dontDistribute super."htoml"; + "htrace" = dontDistribute super."htrace"; + "hts" = dontDistribute super."hts"; + "htsn" = dontDistribute super."htsn"; + "htsn-common" = dontDistribute super."htsn-common"; + "htsn-import" = dontDistribute super."htsn-import"; + "http-accept" = dontDistribute super."http-accept"; + "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client-auth" = dontDistribute super."http-client-auth"; + "http-client-conduit" = dontDistribute super."http-client-conduit"; + "http-client-lens" = dontDistribute super."http-client-lens"; + "http-client-multipart" = dontDistribute super."http-client-multipart"; + "http-client-openssl" = dontDistribute super."http-client-openssl"; + "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; + "http-client-streams" = dontDistribute super."http-client-streams"; + "http-conduit-browser" = dontDistribute super."http-conduit-browser"; + "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; + "http-encodings" = dontDistribute super."http-encodings"; + "http-enumerator" = dontDistribute super."http-enumerator"; + "http-kit" = dontDistribute super."http-kit"; + "http-link-header" = dontDistribute super."http-link-header"; + "http-listen" = dontDistribute super."http-listen"; + "http-monad" = dontDistribute super."http-monad"; + "http-proxy" = dontDistribute super."http-proxy"; + "http-querystring" = dontDistribute super."http-querystring"; + "http-server" = dontDistribute super."http-server"; + "http-shed" = dontDistribute super."http-shed"; + "http-test" = dontDistribute super."http-test"; + "http-wget" = dontDistribute super."http-wget"; + "http2" = doDistribute super."http2_1_0_4"; + "httpd-shed" = dontDistribute super."httpd-shed"; + "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; + "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; + "httpspec" = dontDistribute super."httpspec"; + "htune" = dontDistribute super."htune"; + "htzaar" = dontDistribute super."htzaar"; + "hub" = dontDistribute super."hub"; + "hubigraph" = dontDistribute super."hubigraph"; + "hubris" = dontDistribute super."hubris"; + "huckleberry" = dontDistribute super."huckleberry"; + "huffman" = dontDistribute super."huffman"; + "hugs2yc" = dontDistribute super."hugs2yc"; + "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = dontDistribute super."human-readable-duration"; + "hums" = dontDistribute super."hums"; + "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; + "hunit-gui" = dontDistribute super."hunit-gui"; + "hunit-parsec" = dontDistribute super."hunit-parsec"; + "hunit-rematch" = dontDistribute super."hunit-rematch"; + "hunp" = dontDistribute super."hunp"; + "hunt-searchengine" = dontDistribute super."hunt-searchengine"; + "hunt-server" = dontDistribute super."hunt-server"; + "hunt-server-cli" = dontDistribute super."hunt-server-cli"; + "hurdle" = dontDistribute super."hurdle"; + "husk-scheme" = dontDistribute super."husk-scheme"; + "husk-scheme-libs" = dontDistribute super."husk-scheme-libs"; + "husky" = dontDistribute super."husky"; + "hutton" = dontDistribute super."hutton"; + "huttons-razor" = dontDistribute super."huttons-razor"; + "huzzy" = dontDistribute super."huzzy"; + "hvect" = doDistribute super."hvect_0_2_0_0"; + "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; + "hworker" = dontDistribute super."hworker"; + "hworker-ses" = dontDistribute super."hworker-ses"; + "hws" = dontDistribute super."hws"; + "hwsl2" = dontDistribute super."hwsl2"; + "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector"; + "hwsl2-reducers" = dontDistribute super."hwsl2-reducers"; + "hx" = dontDistribute super."hx"; + "hxmppc" = dontDistribute super."hxmppc"; + "hxournal" = dontDistribute super."hxournal"; + "hxt-binary" = dontDistribute super."hxt-binary"; + "hxt-cache" = dontDistribute super."hxt-cache"; + "hxt-extras" = dontDistribute super."hxt-extras"; + "hxt-filter" = dontDistribute super."hxt-filter"; + "hxt-xpath" = dontDistribute super."hxt-xpath"; + "hxt-xslt" = dontDistribute super."hxt-xslt"; + "hxthelper" = dontDistribute super."hxthelper"; + "hxweb" = dontDistribute super."hxweb"; + "hyahtzee" = dontDistribute super."hyahtzee"; + "hyakko" = dontDistribute super."hyakko"; + "hybrid" = dontDistribute super."hybrid"; + "hybrid-vectors" = dontDistribute super."hybrid-vectors"; + "hydra-hs" = dontDistribute super."hydra-hs"; + "hydra-print" = dontDistribute super."hydra-print"; + "hydrogen" = dontDistribute super."hydrogen"; + "hydrogen-cli" = dontDistribute super."hydrogen-cli"; + "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args"; + "hydrogen-data" = dontDistribute super."hydrogen-data"; + "hydrogen-multimap" = dontDistribute super."hydrogen-multimap"; + "hydrogen-parsing" = dontDistribute super."hydrogen-parsing"; + "hydrogen-prelude" = dontDistribute super."hydrogen-prelude"; + "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec"; + "hydrogen-syntax" = dontDistribute super."hydrogen-syntax"; + "hydrogen-util" = dontDistribute super."hydrogen-util"; + "hydrogen-version" = dontDistribute super."hydrogen-version"; + "hyena" = dontDistribute super."hyena"; + "hylolib" = dontDistribute super."hylolib"; + "hylotab" = dontDistribute super."hylotab"; + "hyloutils" = dontDistribute super."hyloutils"; + "hyperdrive" = dontDistribute super."hyperdrive"; + "hyperfunctions" = dontDistribute super."hyperfunctions"; + "hyperloglog" = doDistribute super."hyperloglog_0_3_4"; + "hyperpublic" = dontDistribute super."hyperpublic"; + "hyphenate" = dontDistribute super."hyphenate"; + "hypher" = dontDistribute super."hypher"; + "hzk" = dontDistribute super."hzk"; + "hzulip" = dontDistribute super."hzulip"; + "i18n" = dontDistribute super."i18n"; + "iCalendar" = dontDistribute super."iCalendar"; + "iException" = dontDistribute super."iException"; + "iap-verifier" = dontDistribute super."iap-verifier"; + "ib-api" = dontDistribute super."ib-api"; + "iban" = dontDistribute super."iban"; + "ical" = dontDistribute super."ical"; + "iconv" = dontDistribute super."iconv"; + "ideas" = dontDistribute super."ideas"; + "ideas-math" = dontDistribute super."ideas-math"; + "idempotent" = dontDistribute super."idempotent"; + "identifiers" = dontDistribute super."identifiers"; + "idiii" = dontDistribute super."idiii"; + "idna" = dontDistribute super."idna"; + "idna2008" = dontDistribute super."idna2008"; + "idris" = dontDistribute super."idris"; + "ieee" = dontDistribute super."ieee"; + "ieee-utils" = dontDistribute super."ieee-utils"; + "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix"; + "ieee754-parser" = dontDistribute super."ieee754-parser"; + "ifcxt" = dontDistribute super."ifcxt"; + "iff" = dontDistribute super."iff"; + "ifscs" = dontDistribute super."ifscs"; + "ig" = dontDistribute super."ig"; + "ige-mac-integration" = dontDistribute super."ige-mac-integration"; + "igraph" = dontDistribute super."igraph"; + "igrf" = dontDistribute super."igrf"; + "ihaskell" = doDistribute super."ihaskell_0_6_5_0"; + "ihaskell-display" = dontDistribute super."ihaskell-display"; + "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r"; + "ihaskell-parsec" = dontDistribute super."ihaskell-parsec"; + "ihaskell-plot" = dontDistribute super."ihaskell-plot"; + "ihaskell-widgets" = dontDistribute super."ihaskell-widgets"; + "ihttp" = dontDistribute super."ihttp"; + "illuminate" = dontDistribute super."illuminate"; + "image-type" = dontDistribute super."image-type"; + "imagefilters" = dontDistribute super."imagefilters"; + "imagemagick" = dontDistribute super."imagemagick"; + "imagepaste" = dontDistribute super."imagepaste"; + "imapget" = dontDistribute super."imapget"; + "imbib" = dontDistribute super."imbib"; + "imgurder" = dontDistribute super."imgurder"; + "imm" = dontDistribute super."imm"; + "imparse" = dontDistribute super."imparse"; + "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl"; + "implicit" = dontDistribute super."implicit"; + "implicit-params" = dontDistribute super."implicit-params"; + "imports" = dontDistribute super."imports"; + "improve" = dontDistribute super."improve"; + "inc-ref" = dontDistribute super."inc-ref"; + "inch" = dontDistribute super."inch"; + "incremental-computing" = dontDistribute super."incremental-computing"; + "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; + "increments" = dontDistribute super."increments"; + "indentation" = dontDistribute super."indentation"; + "indentparser" = dontDistribute super."indentparser"; + "index-core" = dontDistribute super."index-core"; + "indexed" = dontDistribute super."indexed"; + "indexed-do-notation" = dontDistribute super."indexed-do-notation"; + "indexed-extras" = dontDistribute super."indexed-extras"; + "indexed-free" = dontDistribute super."indexed-free"; + "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; + "indices" = dontDistribute super."indices"; + "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; + "inf-interval" = dontDistribute super."inf-interval"; + "infer-upstream" = dontDistribute super."infer-upstream"; + "infernu" = dontDistribute super."infernu"; + "infinite-search" = dontDistribute super."infinite-search"; + "infinity" = dontDistribute super."infinity"; + "infix" = dontDistribute super."infix"; + "inflist" = dontDistribute super."inflist"; + "influxdb" = dontDistribute super."influxdb"; + "informative" = dontDistribute super."informative"; + "inilist" = dontDistribute super."inilist"; + "inject" = dontDistribute super."inject"; + "inject-function" = dontDistribute super."inject-function"; + "inline-c" = dontDistribute super."inline-c"; + "inline-c-cpp" = dontDistribute super."inline-c-cpp"; + "inline-c-win32" = dontDistribute super."inline-c-win32"; + "inline-r" = dontDistribute super."inline-r"; + "inquire" = dontDistribute super."inquire"; + "inserts" = dontDistribute super."inserts"; + "inspection-proxy" = dontDistribute super."inspection-proxy"; + "instant-aeson" = dontDistribute super."instant-aeson"; + "instant-bytes" = dontDistribute super."instant-bytes"; + "instant-deepseq" = dontDistribute super."instant-deepseq"; + "instant-generics" = dontDistribute super."instant-generics"; + "instant-hashable" = dontDistribute super."instant-hashable"; + "instant-zipper" = dontDistribute super."instant-zipper"; + "instinct" = dontDistribute super."instinct"; + "instrument-chord" = dontDistribute super."instrument-chord"; + "int-cast" = dontDistribute super."int-cast"; + "integer-pure" = dontDistribute super."integer-pure"; + "intel-aes" = dontDistribute super."intel-aes"; + "interchangeable" = dontDistribute super."interchangeable"; + "interleavableGen" = dontDistribute super."interleavableGen"; + "interleavableIO" = dontDistribute super."interleavableIO"; + "interleave" = dontDistribute super."interleave"; + "interlude" = dontDistribute super."interlude"; + "intern" = dontDistribute super."intern"; + "internetmarke" = dontDistribute super."internetmarke"; + "interpol" = dontDistribute super."interpol"; + "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; + "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; + "interpolation" = dontDistribute super."interpolation"; + "intricacy" = dontDistribute super."intricacy"; + "intset" = dontDistribute super."intset"; + "invertible-syntax" = dontDistribute super."invertible-syntax"; + "io-capture" = dontDistribute super."io-capture"; + "io-reactive" = dontDistribute super."io-reactive"; + "io-region" = dontDistribute super."io-region"; + "io-storage" = dontDistribute super."io-storage"; + "io-streams-http" = dontDistribute super."io-streams-http"; + "io-throttle" = dontDistribute super."io-throttle"; + "ioctl" = dontDistribute super."ioctl"; + "ioref-stable" = dontDistribute super."ioref-stable"; + "iothread" = dontDistribute super."iothread"; + "iotransaction" = dontDistribute super."iotransaction"; + "ip-quoter" = dontDistribute super."ip-quoter"; + "ipatch" = dontDistribute super."ipatch"; + "ipc" = dontDistribute super."ipc"; + "ipcvar" = dontDistribute super."ipcvar"; + "ipopt-hs" = dontDistribute super."ipopt-hs"; + "ipprint" = dontDistribute super."ipprint"; + "iproute" = doDistribute super."iproute_1_5_0"; + "iptables-helpers" = dontDistribute super."iptables-helpers"; + "iptadmin" = dontDistribute super."iptadmin"; + "ipython-kernel" = doDistribute super."ipython-kernel_0_6_1_3"; + "irc" = dontDistribute super."irc"; + "irc-bytestring" = dontDistribute super."irc-bytestring"; + "irc-client" = dontDistribute super."irc-client"; + "irc-colors" = dontDistribute super."irc-colors"; + "irc-conduit" = dontDistribute super."irc-conduit"; + "irc-core" = dontDistribute super."irc-core"; + "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-fun-bot" = dontDistribute super."irc-fun-bot"; + "irc-fun-client" = dontDistribute super."irc-fun-client"; + "irc-fun-color" = dontDistribute super."irc-fun-color"; + "irc-fun-messages" = dontDistribute super."irc-fun-messages"; + "ircbot" = dontDistribute super."ircbot"; + "ircbouncer" = dontDistribute super."ircbouncer"; + "ireal" = dontDistribute super."ireal"; + "iron-mq" = dontDistribute super."iron-mq"; + "ironforge" = dontDistribute super."ironforge"; + "is" = dontDistribute super."is"; + "isdicom" = dontDistribute super."isdicom"; + "isevaluated" = dontDistribute super."isevaluated"; + "isiz" = dontDistribute super."isiz"; + "ismtp" = dontDistribute super."ismtp"; + "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps"; + "iso8601-time" = dontDistribute super."iso8601-time"; + "isohunt" = dontDistribute super."isohunt"; + "itanium-abi" = dontDistribute super."itanium-abi"; + "iter-stats" = dontDistribute super."iter-stats"; + "iterIO" = dontDistribute super."iterIO"; + "iteratee" = dontDistribute super."iteratee"; + "iteratee-compress" = dontDistribute super."iteratee-compress"; + "iteratee-mtl" = dontDistribute super."iteratee-mtl"; + "iteratee-parsec" = dontDistribute super."iteratee-parsec"; + "iteratee-stm" = dontDistribute super."iteratee-stm"; + "iterio-server" = dontDistribute super."iterio-server"; + "ivar-simple" = dontDistribute super."ivar-simple"; + "ivor" = dontDistribute super."ivor"; + "ivory" = dontDistribute super."ivory"; + "ivory-backend-c" = dontDistribute super."ivory-backend-c"; + "ivory-bitdata" = dontDistribute super."ivory-bitdata"; + "ivory-examples" = dontDistribute super."ivory-examples"; + "ivory-hw" = dontDistribute super."ivory-hw"; + "ivory-opts" = dontDistribute super."ivory-opts"; + "ivory-quickcheck" = dontDistribute super."ivory-quickcheck"; + "ivory-stdlib" = dontDistribute super."ivory-stdlib"; + "ivy-web" = dontDistribute super."ivy-web"; + "ix-shapable" = dontDistribute super."ix-shapable"; + "ixdopp" = dontDistribute super."ixdopp"; + "ixmonad" = dontDistribute super."ixmonad"; + "ixset" = dontDistribute super."ixset"; + "ixset-typed" = dontDistribute super."ixset-typed"; + "iyql" = dontDistribute super."iyql"; + "j2hs" = dontDistribute super."j2hs"; + "ja-base-extra" = dontDistribute super."ja-base-extra"; + "jack" = dontDistribute super."jack"; + "jack-bindings" = dontDistribute super."jack-bindings"; + "jackminimix" = dontDistribute super."jackminimix"; + "jacobi-roots" = dontDistribute super."jacobi-roots"; + "jail" = dontDistribute super."jail"; + "jailbreak-cabal" = dontDistribute super."jailbreak-cabal"; + "jalaali" = dontDistribute super."jalaali"; + "jalla" = dontDistribute super."jalla"; + "jammittools" = dontDistribute super."jammittools"; + "jarfind" = dontDistribute super."jarfind"; + "java-bridge" = dontDistribute super."java-bridge"; + "java-bridge-extras" = dontDistribute super."java-bridge-extras"; + "java-character" = dontDistribute super."java-character"; + "java-reflect" = dontDistribute super."java-reflect"; + "javasf" = dontDistribute super."javasf"; + "javav" = dontDistribute super."javav"; + "jcdecaux-vls" = dontDistribute super."jcdecaux-vls"; + "jdi" = dontDistribute super."jdi"; + "jespresso" = dontDistribute super."jespresso"; + "jobqueue" = dontDistribute super."jobqueue"; + "join" = dontDistribute super."join"; + "joinlist" = dontDistribute super."joinlist"; + "jonathanscard" = dontDistribute super."jonathanscard"; + "jort" = dontDistribute super."jort"; + "jose" = dontDistribute super."jose"; + "jose-jwt" = doDistribute super."jose-jwt_0_6_2"; + "jpeg" = dontDistribute super."jpeg"; + "js-good-parts" = dontDistribute super."js-good-parts"; + "jsaddle" = dontDistribute super."jsaddle"; + "jsaddle-hello" = dontDistribute super."jsaddle-hello"; + "jsc" = dontDistribute super."jsc"; + "jsmw" = dontDistribute super."jsmw"; + "json-assertions" = dontDistribute super."json-assertions"; + "json-b" = dontDistribute super."json-b"; + "json-enumerator" = dontDistribute super."json-enumerator"; + "json-extra" = dontDistribute super."json-extra"; + "json-fu" = dontDistribute super."json-fu"; + "json-litobj" = dontDistribute super."json-litobj"; + "json-python" = dontDistribute super."json-python"; + "json-qq" = dontDistribute super."json-qq"; + "json-rpc" = dontDistribute super."json-rpc"; + "json-rpc-client" = dontDistribute super."json-rpc-client"; + "json-rpc-server" = dontDistribute super."json-rpc-server"; + "json-sop" = dontDistribute super."json-sop"; + "json-state" = dontDistribute super."json-state"; + "json-stream" = dontDistribute super."json-stream"; + "json-togo" = dontDistribute super."json-togo"; + "json-tools" = dontDistribute super."json-tools"; + "json-types" = dontDistribute super."json-types"; + "json2" = dontDistribute super."json2"; + "json2-hdbc" = dontDistribute super."json2-hdbc"; + "json2-types" = dontDistribute super."json2-types"; + "json2yaml" = dontDistribute super."json2yaml"; + "jsonresume" = dontDistribute super."jsonresume"; + "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit"; + "jsonschema-gen" = dontDistribute super."jsonschema-gen"; + "jsonsql" = dontDistribute super."jsonsql"; + "jsontsv" = dontDistribute super."jsontsv"; + "jspath" = dontDistribute super."jspath"; + "judy" = dontDistribute super."judy"; + "jukebox" = dontDistribute super."jukebox"; + "jumpthefive" = dontDistribute super."jumpthefive"; + "jvm-parser" = dontDistribute super."jvm-parser"; + "kademlia" = dontDistribute super."kademlia"; + "kafka-client" = dontDistribute super."kafka-client"; + "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = dontDistribute super."kansas-comet"; + "kansas-lava" = dontDistribute super."kansas-lava"; + "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; + "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; + "kansas-lava-shake" = dontDistribute super."kansas-lava-shake"; + "karakuri" = dontDistribute super."karakuri"; + "karver" = dontDistribute super."karver"; + "katt" = dontDistribute super."katt"; + "kbq-gu" = dontDistribute super."kbq-gu"; + "kd-tree" = dontDistribute super."kd-tree"; + "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra"; + "keera-callbacks" = dontDistribute super."keera-callbacks"; + "keera-hails-i18n" = dontDistribute super."keera-hails-i18n"; + "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller"; + "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk"; + "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel"; + "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel"; + "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config"; + "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk"; + "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view"; + "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk"; + "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs"; + "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk"; + "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network"; + "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; + "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; + "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; + "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; + "keera-posture" = dontDistribute super."keera-posture"; + "keiretsu" = dontDistribute super."keiretsu"; + "kevin" = dontDistribute super."kevin"; + "keyed" = dontDistribute super."keyed"; + "keyring" = dontDistribute super."keyring"; + "keystore" = dontDistribute super."keystore"; + "keyvaluehash" = dontDistribute super."keyvaluehash"; + "keyword-args" = dontDistribute super."keyword-args"; + "kibro" = dontDistribute super."kibro"; + "kicad-data" = dontDistribute super."kicad-data"; + "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser"; + "kickchan" = dontDistribute super."kickchan"; + "kif-parser" = dontDistribute super."kif-parser"; + "kinds" = dontDistribute super."kinds"; + "kit" = dontDistribute super."kit"; + "kmeans-par" = dontDistribute super."kmeans-par"; + "kmeans-vector" = dontDistribute super."kmeans-vector"; + "knots" = dontDistribute super."knots"; + "koellner-phonetic" = dontDistribute super."koellner-phonetic"; + "kontrakcja-templates" = dontDistribute super."kontrakcja-templates"; + "korfu" = dontDistribute super."korfu"; + "kqueue" = dontDistribute super."kqueue"; + "kraken" = dontDistribute super."kraken"; + "krpc" = dontDistribute super."krpc"; + "ks-test" = dontDistribute super."ks-test"; + "ktx" = dontDistribute super."ktx"; + "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate"; + "kyotocabinet" = dontDistribute super."kyotocabinet"; + "l-bfgs-b" = dontDistribute super."l-bfgs-b"; + "labeled-graph" = dontDistribute super."labeled-graph"; + "labeled-tree" = dontDistribute super."labeled-tree"; + "laborantin-hs" = dontDistribute super."laborantin-hs"; + "labyrinth" = dontDistribute super."labyrinth"; + "labyrinth-server" = dontDistribute super."labyrinth-server"; + "lackey" = dontDistribute super."lackey"; + "lagrangian" = dontDistribute super."lagrangian"; + "laika" = dontDistribute super."laika"; + "lambda-ast" = dontDistribute super."lambda-ast"; + "lambda-bridge" = dontDistribute super."lambda-bridge"; + "lambda-canvas" = dontDistribute super."lambda-canvas"; + "lambda-devs" = dontDistribute super."lambda-devs"; + "lambda-options" = dontDistribute super."lambda-options"; + "lambda-placeholders" = dontDistribute super."lambda-placeholders"; + "lambda-toolbox" = dontDistribute super."lambda-toolbox"; + "lambda2js" = dontDistribute super."lambda2js"; + "lambdaBase" = dontDistribute super."lambdaBase"; + "lambdaFeed" = dontDistribute super."lambdaFeed"; + "lambdaLit" = dontDistribute super."lambdaLit"; + "lambdabot-utils" = dontDistribute super."lambdabot-utils"; + "lambdacat" = dontDistribute super."lambdacat"; + "lambdacms-core" = dontDistribute super."lambdacms-core"; + "lambdacms-media" = dontDistribute super."lambdacms-media"; + "lambdacube" = dontDistribute super."lambdacube"; + "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-core" = dontDistribute super."lambdacube-core"; + "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; + "lambdacube-engine" = dontDistribute super."lambdacube-engine"; + "lambdacube-examples" = dontDistribute super."lambdacube-examples"; + "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-samples" = dontDistribute super."lambdacube-samples"; + "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdiff" = dontDistribute super."lambdiff"; + "lame-tester" = dontDistribute super."lame-tester"; + "language-asn1" = dontDistribute super."language-asn1"; + "language-bash" = dontDistribute super."language-bash"; + "language-boogie" = dontDistribute super."language-boogie"; + "language-c-comments" = dontDistribute super."language-c-comments"; + "language-c-inline" = dontDistribute super."language-c-inline"; + "language-cil" = dontDistribute super."language-cil"; + "language-css" = dontDistribute super."language-css"; + "language-dot" = dontDistribute super."language-dot"; + "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis"; + "language-eiffel" = dontDistribute super."language-eiffel"; + "language-fortran" = dontDistribute super."language-fortran"; + "language-gcl" = dontDistribute super."language-gcl"; + "language-go" = dontDistribute super."language-go"; + "language-guess" = dontDistribute super."language-guess"; + "language-java-classfile" = dontDistribute super."language-java-classfile"; + "language-kort" = dontDistribute super."language-kort"; + "language-lua" = dontDistribute super."language-lua"; + "language-lua-qq" = dontDistribute super."language-lua-qq"; + "language-lua2" = dontDistribute super."language-lua2"; + "language-mixal" = dontDistribute super."language-mixal"; + "language-nix" = dontDistribute super."language-nix"; + "language-objc" = dontDistribute super."language-objc"; + "language-openscad" = dontDistribute super."language-openscad"; + "language-pig" = dontDistribute super."language-pig"; + "language-puppet" = dontDistribute super."language-puppet"; + "language-python" = dontDistribute super."language-python"; + "language-python-colour" = dontDistribute super."language-python-colour"; + "language-python-test" = dontDistribute super."language-python-test"; + "language-qux" = dontDistribute super."language-qux"; + "language-sh" = dontDistribute super."language-sh"; + "language-slice" = dontDistribute super."language-slice"; + "language-spelling" = dontDistribute super."language-spelling"; + "language-sqlite" = dontDistribute super."language-sqlite"; + "language-thrift" = dontDistribute super."language-thrift"; + "language-typescript" = dontDistribute super."language-typescript"; + "language-vhdl" = dontDistribute super."language-vhdl"; + "lat" = dontDistribute super."lat"; + "latest-npm-version" = dontDistribute super."latest-npm-version"; + "latex" = dontDistribute super."latex"; + "latex-formulae-hakyll" = dontDistribute super."latex-formulae-hakyll"; + "latex-formulae-image" = dontDistribute super."latex-formulae-image"; + "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc"; + "lattices" = doDistribute super."lattices_1_3"; + "launchpad-control" = dontDistribute super."launchpad-control"; + "lax" = dontDistribute super."lax"; + "layers" = dontDistribute super."layers"; + "layers-game" = dontDistribute super."layers-game"; + "layout" = dontDistribute super."layout"; + "layout-bootstrap" = dontDistribute super."layout-bootstrap"; + "lazy-io" = dontDistribute super."lazy-io"; + "lazyarray" = dontDistribute super."lazyarray"; + "lazyio" = dontDistribute super."lazyio"; + "lazysplines" = dontDistribute super."lazysplines"; + "lbfgs" = dontDistribute super."lbfgs"; + "lcs" = dontDistribute super."lcs"; + "lda" = dontDistribute super."lda"; + "ldap-client" = dontDistribute super."ldap-client"; + "ldif" = dontDistribute super."ldif"; + "leaf" = dontDistribute super."leaf"; + "leaky" = dontDistribute super."leaky"; + "leankit-api" = dontDistribute super."leankit-api"; + "leapseconds-announced" = dontDistribute super."leapseconds-announced"; + "learn" = dontDistribute super."learn"; + "learn-physics" = dontDistribute super."learn-physics"; + "learn-physics-examples" = dontDistribute super."learn-physics-examples"; + "learning-hmm" = dontDistribute super."learning-hmm"; + "leetify" = dontDistribute super."leetify"; + "leksah" = dontDistribute super."leksah"; + "leksah-server" = dontDistribute super."leksah-server"; + "lendingclub" = dontDistribute super."lendingclub"; + "lens" = doDistribute super."lens_4_12_3"; + "lens-datetime" = dontDistribute super."lens-datetime"; + "lens-prelude" = dontDistribute super."lens-prelude"; + "lens-properties" = dontDistribute super."lens-properties"; + "lens-regex" = dontDistribute super."lens-regex"; + "lens-sop" = dontDistribute super."lens-sop"; + "lens-text-encoding" = dontDistribute super."lens-text-encoding"; + "lens-time" = dontDistribute super."lens-time"; + "lens-tutorial" = dontDistribute super."lens-tutorial"; + "lens-utils" = dontDistribute super."lens-utils"; + "lenses" = dontDistribute super."lenses"; + "lensref" = dontDistribute super."lensref"; + "lentil" = dontDistribute super."lentil"; + "level-monad" = dontDistribute super."level-monad"; + "leveldb-haskell" = dontDistribute super."leveldb-haskell"; + "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork"; + "levmar" = dontDistribute super."levmar"; + "levmar-chart" = dontDistribute super."levmar-chart"; + "lgtk" = dontDistribute super."lgtk"; + "lha" = dontDistribute super."lha"; + "lhae" = dontDistribute super."lhae"; + "lhc" = dontDistribute super."lhc"; + "lhe" = dontDistribute super."lhe"; + "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl"; + "lhs2html" = dontDistribute super."lhs2html"; + "lhslatex" = dontDistribute super."lhslatex"; + "libGenI" = dontDistribute super."libGenI"; + "libarchive-conduit" = dontDistribute super."libarchive-conduit"; + "libconfig" = dontDistribute super."libconfig"; + "libcspm" = dontDistribute super."libcspm"; + "libexpect" = dontDistribute super."libexpect"; + "libffi" = dontDistribute super."libffi"; + "libgraph" = dontDistribute super."libgraph"; + "libhbb" = dontDistribute super."libhbb"; + "libinfluxdb" = dontDistribute super."libinfluxdb"; + "libjenkins" = dontDistribute super."libjenkins"; + "liblastfm" = dontDistribute super."liblastfm"; + "liblinear-enumerator" = dontDistribute super."liblinear-enumerator"; + "libltdl" = dontDistribute super."libltdl"; + "libmpd" = dontDistribute super."libmpd"; + "libnvvm" = dontDistribute super."libnvvm"; + "liboleg" = dontDistribute super."liboleg"; + "libpafe" = dontDistribute super."libpafe"; + "libpq" = dontDistribute super."libpq"; + "librandomorg" = dontDistribute super."librandomorg"; + "libravatar" = dontDistribute super."libravatar"; + "libssh2" = dontDistribute super."libssh2"; + "libssh2-conduit" = dontDistribute super."libssh2-conduit"; + "libstackexchange" = dontDistribute super."libstackexchange"; + "libsystemd-daemon" = dontDistribute super."libsystemd-daemon"; + "libsystemd-journal" = dontDistribute super."libsystemd-journal"; + "libtagc" = dontDistribute super."libtagc"; + "libvirt-hs" = dontDistribute super."libvirt-hs"; + "libvorbis" = dontDistribute super."libvorbis"; + "libxml" = dontDistribute super."libxml"; + "libxml-enumerator" = dontDistribute super."libxml-enumerator"; + "libxslt" = dontDistribute super."libxslt"; + "life" = dontDistribute super."life"; + "lift-generics" = dontDistribute super."lift-generics"; + "lifted-threads" = dontDistribute super."lifted-threads"; + "lifter" = dontDistribute super."lifter"; + "ligature" = dontDistribute super."ligature"; + "ligd" = dontDistribute super."ligd"; + "lighttpd-conf" = dontDistribute super."lighttpd-conf"; + "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq"; + "lilypond" = dontDistribute super."lilypond"; + "limp" = dontDistribute super."limp"; + "limp-cbc" = dontDistribute super."limp-cbc"; + "lin-alg" = dontDistribute super."lin-alg"; + "linda" = dontDistribute super."linda"; + "lindenmayer" = dontDistribute super."lindenmayer"; + "line-break" = dontDistribute super."line-break"; + "line2pdf" = dontDistribute super."line2pdf"; + "linear" = doDistribute super."linear_1_19_1_3"; + "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas"; + "linear-circuit" = dontDistribute super."linear-circuit"; + "linear-grammar" = dontDistribute super."linear-grammar"; + "linear-maps" = dontDistribute super."linear-maps"; + "linear-opengl" = dontDistribute super."linear-opengl"; + "linear-vect" = dontDistribute super."linear-vect"; + "linearEqSolver" = dontDistribute super."linearEqSolver"; + "linearscan" = dontDistribute super."linearscan"; + "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; + "linebreak" = dontDistribute super."linebreak"; + "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "linkchk" = dontDistribute super."linkchk"; + "linkcore" = dontDistribute super."linkcore"; + "linkedhashmap" = dontDistribute super."linkedhashmap"; + "linklater" = dontDistribute super."linklater"; + "linode" = dontDistribute super."linode"; + "linux-blkid" = dontDistribute super."linux-blkid"; + "linux-cgroup" = dontDistribute super."linux-cgroup"; + "linux-evdev" = dontDistribute super."linux-evdev"; + "linux-inotify" = dontDistribute super."linux-inotify"; + "linux-kmod" = dontDistribute super."linux-kmod"; + "linux-mount" = dontDistribute super."linux-mount"; + "linux-perf" = dontDistribute super."linux-perf"; + "linux-ptrace" = dontDistribute super."linux-ptrace"; + "linux-xattr" = dontDistribute super."linux-xattr"; + "linx-gateway" = dontDistribute super."linx-gateway"; + "lio" = dontDistribute super."lio"; + "lio-eci11" = dontDistribute super."lio-eci11"; + "lio-fs" = dontDistribute super."lio-fs"; + "lio-simple" = dontDistribute super."lio-simple"; + "lipsum-gen" = dontDistribute super."lipsum-gen"; + "liquid-fixpoint" = dontDistribute super."liquid-fixpoint"; + "liquidhaskell" = dontDistribute super."liquidhaskell"; + "lispparser" = dontDistribute super."lispparser"; + "list-extras" = dontDistribute super."list-extras"; + "list-grouping" = dontDistribute super."list-grouping"; + "list-mux" = dontDistribute super."list-mux"; + "list-remote-forwards" = dontDistribute super."list-remote-forwards"; + "list-t-attoparsec" = dontDistribute super."list-t-attoparsec"; + "list-t-html-parser" = dontDistribute super."list-t-html-parser"; + "list-t-http-client" = dontDistribute super."list-t-http-client"; + "list-t-libcurl" = dontDistribute super."list-t-libcurl"; + "list-t-text" = dontDistribute super."list-t-text"; + "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; + "listlike-instances" = dontDistribute super."listlike-instances"; + "lists" = dontDistribute super."lists"; + "listsafe" = dontDistribute super."listsafe"; + "lit" = dontDistribute super."lit"; + "literals" = dontDistribute super."literals"; + "live-sequencer" = dontDistribute super."live-sequencer"; + "ll-picosat" = dontDistribute super."ll-picosat"; + "llrbtree" = dontDistribute super."llrbtree"; + "llsd" = dontDistribute super."llsd"; + "llvm" = dontDistribute super."llvm"; + "llvm-analysis" = dontDistribute super."llvm-analysis"; + "llvm-base" = dontDistribute super."llvm-base"; + "llvm-base-types" = dontDistribute super."llvm-base-types"; + "llvm-base-util" = dontDistribute super."llvm-base-util"; + "llvm-data-interop" = dontDistribute super."llvm-data-interop"; + "llvm-extra" = dontDistribute super."llvm-extra"; + "llvm-ffi" = dontDistribute super."llvm-ffi"; + "llvm-general" = dontDistribute super."llvm-general"; + "llvm-general-pure" = dontDistribute super."llvm-general-pure"; + "llvm-general-quote" = dontDistribute super."llvm-general-quote"; + "llvm-ht" = dontDistribute super."llvm-ht"; + "llvm-pkg-config" = dontDistribute super."llvm-pkg-config"; + "llvm-pretty" = dontDistribute super."llvm-pretty"; + "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser"; + "llvm-tf" = dontDistribute super."llvm-tf"; + "llvm-tools" = dontDistribute super."llvm-tools"; + "lmdb" = dontDistribute super."lmdb"; + "load-env" = dontDistribute super."load-env"; + "loadavg" = dontDistribute super."loadavg"; + "local-address" = dontDistribute super."local-address"; + "local-search" = dontDistribute super."local-search"; + "located-base" = dontDistribute super."located-base"; + "locators" = dontDistribute super."locators"; + "loch" = dontDistribute super."loch"; + "lock-file" = dontDistribute super."lock-file"; + "lockfree-queue" = dontDistribute super."lockfree-queue"; + "log" = dontDistribute super."log"; + "log-effect" = dontDistribute super."log-effect"; + "log2json" = dontDistribute super."log2json"; + "logfloat" = dontDistribute super."logfloat"; + "logger" = dontDistribute super."logger"; + "logging" = dontDistribute super."logging"; + "logging-facade-journald" = dontDistribute super."logging-facade-journald"; + "logic-TPTP" = dontDistribute super."logic-TPTP"; + "logic-classes" = dontDistribute super."logic-classes"; + "logicst" = dontDistribute super."logicst"; + "logsink" = dontDistribute super."logsink"; + "lojban" = dontDistribute super."lojban"; + "lojbanParser" = dontDistribute super."lojbanParser"; + "lojbanXiragan" = dontDistribute super."lojbanXiragan"; + "lojysamban" = dontDistribute super."lojysamban"; + "lol" = dontDistribute super."lol"; + "loli" = dontDistribute super."loli"; + "lookup-tables" = dontDistribute super."lookup-tables"; + "loop" = doDistribute super."loop_0_2_0"; + "loop-effin" = dontDistribute super."loop-effin"; + "loop-while" = dontDistribute super."loop-while"; + "loops" = dontDistribute super."loops"; + "loopy" = dontDistribute super."loopy"; + "lord" = dontDistribute super."lord"; + "lorem" = dontDistribute super."lorem"; + "loris" = dontDistribute super."loris"; + "loshadka" = dontDistribute super."loshadka"; + "lostcities" = dontDistribute super."lostcities"; + "lowgl" = dontDistribute super."lowgl"; + "ls-usb" = dontDistribute super."ls-usb"; + "lscabal" = dontDistribute super."lscabal"; + "lss" = dontDistribute super."lss"; + "lsystem" = dontDistribute super."lsystem"; + "ltk" = dontDistribute super."ltk"; + "ltl" = dontDistribute super."ltl"; + "lua-bytecode" = dontDistribute super."lua-bytecode"; + "luachunk" = dontDistribute super."luachunk"; + "luautils" = dontDistribute super."luautils"; + "lub" = dontDistribute super."lub"; + "lucid-foundation" = dontDistribute super."lucid-foundation"; + "lucienne" = dontDistribute super."lucienne"; + "luhn" = dontDistribute super."luhn"; + "lui" = dontDistribute super."lui"; + "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; + "lushtags" = dontDistribute super."lushtags"; + "luthor" = dontDistribute super."luthor"; + "lvish" = dontDistribute super."lvish"; + "lvmlib" = dontDistribute super."lvmlib"; + "lvmrun" = dontDistribute super."lvmrun"; + "lxc" = dontDistribute super."lxc"; + "lye" = dontDistribute super."lye"; + "lz4" = dontDistribute super."lz4"; + "lzma" = dontDistribute super."lzma"; + "lzma-clib" = dontDistribute super."lzma-clib"; + "lzma-enumerator" = dontDistribute super."lzma-enumerator"; + "lzma-streams" = dontDistribute super."lzma-streams"; + "maam" = dontDistribute super."maam"; + "mac" = dontDistribute super."mac"; + "maccatcher" = dontDistribute super."maccatcher"; + "machinecell" = dontDistribute super."machinecell"; + "machines-zlib" = dontDistribute super."machines-zlib"; + "macho" = dontDistribute super."macho"; + "maclight" = dontDistribute super."maclight"; + "macosx-make-standalone" = dontDistribute super."macosx-make-standalone"; + "mage" = dontDistribute super."mage"; + "magico" = dontDistribute super."magico"; + "magma" = dontDistribute super."magma"; + "mahoro" = dontDistribute super."mahoro"; + "maid" = dontDistribute super."maid"; + "mailbox-count" = dontDistribute super."mailbox-count"; + "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe"; + "mailgun" = dontDistribute super."mailgun"; + "majordomo" = dontDistribute super."majordomo"; + "majority" = dontDistribute super."majority"; + "make-hard-links" = dontDistribute super."make-hard-links"; + "make-package" = dontDistribute super."make-package"; + "makedo" = dontDistribute super."makedo"; + "manatee" = dontDistribute super."manatee"; + "manatee-all" = dontDistribute super."manatee-all"; + "manatee-anything" = dontDistribute super."manatee-anything"; + "manatee-browser" = dontDistribute super."manatee-browser"; + "manatee-core" = dontDistribute super."manatee-core"; + "manatee-curl" = dontDistribute super."manatee-curl"; + "manatee-editor" = dontDistribute super."manatee-editor"; + "manatee-filemanager" = dontDistribute super."manatee-filemanager"; + "manatee-imageviewer" = dontDistribute super."manatee-imageviewer"; + "manatee-ircclient" = dontDistribute super."manatee-ircclient"; + "manatee-mplayer" = dontDistribute super."manatee-mplayer"; + "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer"; + "manatee-processmanager" = dontDistribute super."manatee-processmanager"; + "manatee-reader" = dontDistribute super."manatee-reader"; + "manatee-template" = dontDistribute super."manatee-template"; + "manatee-terminal" = dontDistribute super."manatee-terminal"; + "manatee-welcome" = dontDistribute super."manatee-welcome"; + "mancala" = dontDistribute super."mancala"; + "mandrill" = doDistribute super."mandrill_0_3_0_0"; + "mandulia" = dontDistribute super."mandulia"; + "manifold-random" = dontDistribute super."manifold-random"; + "manifolds" = dontDistribute super."manifolds"; + "marionetta" = dontDistribute super."marionetta"; + "markdown-kate" = dontDistribute super."markdown-kate"; + "markdown-pap" = dontDistribute super."markdown-pap"; + "markdown-unlit" = dontDistribute super."markdown-unlit"; + "markdown2svg" = dontDistribute super."markdown2svg"; + "marked-pretty" = dontDistribute super."marked-pretty"; + "markov" = dontDistribute super."markov"; + "markov-chain" = dontDistribute super."markov-chain"; + "markov-processes" = dontDistribute super."markov-processes"; + "markup" = doDistribute super."markup_1_1_0"; + "markup-preview" = dontDistribute super."markup-preview"; + "marmalade-upload" = dontDistribute super."marmalade-upload"; + "marquise" = dontDistribute super."marquise"; + "marxup" = dontDistribute super."marxup"; + "masakazu-bot" = dontDistribute super."masakazu-bot"; + "mastermind" = dontDistribute super."mastermind"; + "matchers" = dontDistribute super."matchers"; + "mathblog" = dontDistribute super."mathblog"; + "mathgenealogy" = dontDistribute super."mathgenealogy"; + "mathista" = dontDistribute super."mathista"; + "mathlink" = dontDistribute super."mathlink"; + "matlab" = dontDistribute super."matlab"; + "matrix-market" = dontDistribute super."matrix-market"; + "matrix-market-pure" = dontDistribute super."matrix-market-pure"; + "matsuri" = dontDistribute super."matsuri"; + "maude" = dontDistribute super."maude"; + "maxent" = dontDistribute super."maxent"; + "maxsharing" = dontDistribute super."maxsharing"; + "maybe-justify" = dontDistribute super."maybe-justify"; + "maybench" = dontDistribute super."maybench"; + "mbox-tools" = dontDistribute super."mbox-tools"; + "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples"; + "mcmc-samplers" = dontDistribute super."mcmc-samplers"; + "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; + "mcmc-types" = dontDistribute super."mcmc-types"; + "mcpi" = dontDistribute super."mcpi"; + "mdapi" = dontDistribute super."mdapi"; + "mdcat" = dontDistribute super."mdcat"; + "mdo" = dontDistribute super."mdo"; + "mecab" = dontDistribute super."mecab"; + "mecha" = dontDistribute super."mecha"; + "mediawiki" = dontDistribute super."mediawiki"; + "mediawiki2latex" = dontDistribute super."mediawiki2latex"; + "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell"; + "meep" = dontDistribute super."meep"; + "mega-sdist" = dontDistribute super."mega-sdist"; + "megaparsec" = dontDistribute super."megaparsec"; + "meldable-heap" = dontDistribute super."meldable-heap"; + "melody" = dontDistribute super."melody"; + "memcache" = dontDistribute super."memcache"; + "memcache-conduit" = dontDistribute super."memcache-conduit"; + "memcache-haskell" = dontDistribute super."memcache-haskell"; + "memcached" = dontDistribute super."memcached"; + "memexml" = dontDistribute super."memexml"; + "memo-ptr" = dontDistribute super."memo-ptr"; + "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memoization-utils" = dontDistribute super."memoization-utils"; + "memory" = doDistribute super."memory_0_7"; + "memscript" = dontDistribute super."memscript"; + "mersenne-random" = dontDistribute super."mersenne-random"; + "messente" = dontDistribute super."messente"; + "meta-misc" = dontDistribute super."meta-misc"; + "meta-par" = dontDistribute super."meta-par"; + "meta-par-accelerate" = dontDistribute super."meta-par-accelerate"; + "metadata" = dontDistribute super."metadata"; + "metamorphic" = dontDistribute super."metamorphic"; + "metaplug" = dontDistribute super."metaplug"; + "metric" = dontDistribute super."metric"; + "metricsd-client" = dontDistribute super."metricsd-client"; + "metronome" = dontDistribute super."metronome"; + "mezzolens" = dontDistribute super."mezzolens"; + "mfsolve" = dontDistribute super."mfsolve"; + "mgeneric" = dontDistribute super."mgeneric"; + "mi" = dontDistribute super."mi"; + "microbench" = dontDistribute super."microbench"; + "microformats2-parser" = dontDistribute super."microformats2-parser"; + "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_2_0_0"; + "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0"; + "microlens-platform" = dontDistribute super."microlens-platform"; + "microlens-th" = doDistribute super."microlens-th_0_2_1_1"; + "microtimer" = dontDistribute super."microtimer"; + "mida" = dontDistribute super."mida"; + "midi" = dontDistribute super."midi"; + "midi-alsa" = dontDistribute super."midi-alsa"; + "midi-music-box" = dontDistribute super."midi-music-box"; + "midi-util" = dontDistribute super."midi-util"; + "midimory" = dontDistribute super."midimory"; + "midisurface" = dontDistribute super."midisurface"; + "mighttpd" = dontDistribute super."mighttpd"; + "mighttpd2" = dontDistribute super."mighttpd2"; + "mighty-metropolis" = dontDistribute super."mighty-metropolis"; + "mikmod" = dontDistribute super."mikmod"; + "miku" = dontDistribute super."miku"; + "milena" = dontDistribute super."milena"; + "mime" = dontDistribute super."mime"; + "mime-directory" = dontDistribute super."mime-directory"; + "mime-string" = dontDistribute super."mime-string"; + "mines" = dontDistribute super."mines"; + "minesweeper" = dontDistribute super."minesweeper"; + "miniball" = dontDistribute super."miniball"; + "miniforth" = dontDistribute super."miniforth"; + "minilens" = dontDistribute super."minilens"; + "minimal-configuration" = dontDistribute super."minimal-configuration"; + "minimorph" = dontDistribute super."minimorph"; + "minimung" = dontDistribute super."minimung"; + "minions" = dontDistribute super."minions"; + "minioperational" = dontDistribute super."minioperational"; + "miniplex" = dontDistribute super."miniplex"; + "minirotate" = dontDistribute super."minirotate"; + "minisat" = dontDistribute super."minisat"; + "ministg" = dontDistribute super."ministg"; + "miniutter" = dontDistribute super."miniutter"; + "minst-idx" = dontDistribute super."minst-idx"; + "mirror-tweet" = dontDistribute super."mirror-tweet"; + "missing-py2" = dontDistribute super."missing-py2"; + "mix-arrows" = dontDistribute super."mix-arrows"; + "mixed-strategies" = dontDistribute super."mixed-strategies"; + "mkbndl" = dontDistribute super."mkbndl"; + "mkcabal" = dontDistribute super."mkcabal"; + "ml-w" = dontDistribute super."ml-w"; + "mlist" = dontDistribute super."mlist"; + "mmtl" = dontDistribute super."mmtl"; + "mmtl-base" = dontDistribute super."mmtl-base"; + "moan" = dontDistribute super."moan"; + "modbus-tcp" = dontDistribute super."modbus-tcp"; + "modelicaparser" = dontDistribute super."modelicaparser"; + "modsplit" = dontDistribute super."modsplit"; + "modular-arithmetic" = dontDistribute super."modular-arithmetic"; + "modular-prelude" = dontDistribute super."modular-prelude"; + "modular-prelude-classy" = dontDistribute super."modular-prelude-classy"; + "module-management" = dontDistribute super."module-management"; + "modulespection" = dontDistribute super."modulespection"; + "modulo" = dontDistribute super."modulo"; + "moe" = dontDistribute super."moe"; + "moesocks" = dontDistribute super."moesocks"; + "mohws" = dontDistribute super."mohws"; + "mole" = dontDistribute super."mole"; + "monad-abort-fd" = dontDistribute super."monad-abort-fd"; + "monad-atom" = dontDistribute super."monad-atom"; + "monad-atom-simple" = dontDistribute super."monad-atom-simple"; + "monad-bool" = dontDistribute super."monad-bool"; + "monad-classes" = dontDistribute super."monad-classes"; + "monad-codec" = dontDistribute super."monad-codec"; + "monad-exception" = dontDistribute super."monad-exception"; + "monad-fork" = dontDistribute super."monad-fork"; + "monad-gen" = dontDistribute super."monad-gen"; + "monad-interleave" = dontDistribute super."monad-interleave"; + "monad-levels" = dontDistribute super."monad-levels"; + "monad-loops-stm" = dontDistribute super."monad-loops-stm"; + "monad-lrs" = dontDistribute super."monad-lrs"; + "monad-memo" = dontDistribute super."monad-memo"; + "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; + "monad-open" = dontDistribute super."monad-open"; + "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; + "monad-param" = dontDistribute super."monad-param"; + "monad-ran" = dontDistribute super."monad-ran"; + "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-state" = dontDistribute super."monad-state"; + "monad-statevar" = dontDistribute super."monad-statevar"; + "monad-stlike-io" = dontDistribute super."monad-stlike-io"; + "monad-stlike-stm" = dontDistribute super."monad-stlike-stm"; + "monad-supply" = dontDistribute super."monad-supply"; + "monad-task" = dontDistribute super."monad-task"; + "monad-time" = dontDistribute super."monad-time"; + "monad-tx" = dontDistribute super."monad-tx"; + "monad-unify" = dontDistribute super."monad-unify"; + "monad-wrap" = dontDistribute super."monad-wrap"; + "monadIO" = dontDistribute super."monadIO"; + "monadLib-compose" = dontDistribute super."monadLib-compose"; + "monadacme" = dontDistribute super."monadacme"; + "monadbi" = dontDistribute super."monadbi"; + "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; + "monadfibre" = dontDistribute super."monadfibre"; + "monadiccp" = dontDistribute super."monadiccp"; + "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; + "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; + "monadlist" = dontDistribute super."monadlist"; + "monadloc" = dontDistribute super."monadloc"; + "monadloc-pp" = dontDistribute super."monadloc-pp"; + "monadplus" = dontDistribute super."monadplus"; + "monads-fd" = dontDistribute super."monads-fd"; + "monadtransform" = dontDistribute super."monadtransform"; + "monarch" = dontDistribute super."monarch"; + "mongodb-queue" = dontDistribute super."mongodb-queue"; + "mongrel2-handler" = dontDistribute super."mongrel2-handler"; + "monitor" = dontDistribute super."monitor"; + "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_9_3"; + "monoid-absorbing" = dontDistribute super."monoid-absorbing"; + "monoid-owns" = dontDistribute super."monoid-owns"; + "monoid-record" = dontDistribute super."monoid-record"; + "monoid-statistics" = dontDistribute super."monoid-statistics"; + "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidplus" = dontDistribute super."monoidplus"; + "monoids" = dontDistribute super."monoids"; + "monomorphic" = dontDistribute super."monomorphic"; + "montage" = dontDistribute super."montage"; + "montage-client" = dontDistribute super."montage-client"; + "monte-carlo" = dontDistribute super."monte-carlo"; + "moo" = dontDistribute super."moo"; + "moonshine" = dontDistribute super."moonshine"; + "morfette" = dontDistribute super."morfette"; + "morfeusz" = dontDistribute super."morfeusz"; + "morte" = dontDistribute super."morte"; + "mosaico-lib" = dontDistribute super."mosaico-lib"; + "mount" = dontDistribute super."mount"; + "mp" = dontDistribute super."mp"; + "mp3decoder" = dontDistribute super."mp3decoder"; + "mpdmate" = dontDistribute super."mpdmate"; + "mpppc" = dontDistribute super."mpppc"; + "mpretty" = dontDistribute super."mpretty"; + "mprover" = dontDistribute super."mprover"; + "mps" = dontDistribute super."mps"; + "mpvguihs" = dontDistribute super."mpvguihs"; + "mqtt-hs" = dontDistribute super."mqtt-hs"; + "ms" = dontDistribute super."ms"; + "msgpack" = dontDistribute super."msgpack"; + "msgpack-aeson" = dontDistribute super."msgpack-aeson"; + "msgpack-idl" = dontDistribute super."msgpack-idl"; + "msgpack-rpc" = dontDistribute super."msgpack-rpc"; + "msh" = dontDistribute super."msh"; + "msu" = dontDistribute super."msu"; + "mtgoxapi" = dontDistribute super."mtgoxapi"; + "mtl-c" = dontDistribute super."mtl-c"; + "mtl-evil-instances" = dontDistribute super."mtl-evil-instances"; + "mtl-tf" = dontDistribute super."mtl-tf"; + "mtl-unleashed" = dontDistribute super."mtl-unleashed"; + "mtlparse" = dontDistribute super."mtlparse"; + "mtlx" = dontDistribute super."mtlx"; + "mtp" = dontDistribute super."mtp"; + "mtree" = dontDistribute super."mtree"; + "mucipher" = dontDistribute super."mucipher"; + "mudbath" = dontDistribute super."mudbath"; + "muesli" = dontDistribute super."muesli"; + "multext-east-msd" = dontDistribute super."multext-east-msd"; + "multi-cabal" = dontDistribute super."multi-cabal"; + "multifocal" = dontDistribute super."multifocal"; + "multihash" = dontDistribute super."multihash"; + "multipart-names" = dontDistribute super."multipart-names"; + "multipass" = dontDistribute super."multipass"; + "multiplate" = dontDistribute super."multiplate"; + "multiplate-simplified" = dontDistribute super."multiplate-simplified"; + "multiplicity" = dontDistribute super."multiplicity"; + "multirec" = dontDistribute super."multirec"; + "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; + "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset-comb" = dontDistribute super."multiset-comb"; + "multisetrewrite" = dontDistribute super."multisetrewrite"; + "multistate" = dontDistribute super."multistate"; + "muon" = dontDistribute super."muon"; + "murder" = dontDistribute super."murder"; + "murmur3" = dontDistribute super."murmur3"; + "murmurhash3" = dontDistribute super."murmurhash3"; + "music-articulation" = dontDistribute super."music-articulation"; + "music-diatonic" = dontDistribute super."music-diatonic"; + "music-dynamics" = dontDistribute super."music-dynamics"; + "music-dynamics-literal" = dontDistribute super."music-dynamics-literal"; + "music-graphics" = dontDistribute super."music-graphics"; + "music-parts" = dontDistribute super."music-parts"; + "music-pitch" = dontDistribute super."music-pitch"; + "music-pitch-literal" = dontDistribute super."music-pitch-literal"; + "music-preludes" = dontDistribute super."music-preludes"; + "music-score" = dontDistribute super."music-score"; + "music-sibelius" = dontDistribute super."music-sibelius"; + "music-suite" = dontDistribute super."music-suite"; + "music-util" = dontDistribute super."music-util"; + "musicbrainz-email" = dontDistribute super."musicbrainz-email"; + "musicxml" = dontDistribute super."musicxml"; + "musicxml2" = dontDistribute super."musicxml2"; + "mustache" = dontDistribute super."mustache"; + "mustache-haskell" = dontDistribute super."mustache-haskell"; + "mustache2hs" = dontDistribute super."mustache2hs"; + "mutable-iter" = dontDistribute super."mutable-iter"; + "mute-unmute" = dontDistribute super."mute-unmute"; + "mvc" = dontDistribute super."mvc"; + "mvc-updates" = dontDistribute super."mvc-updates"; + "mvclient" = dontDistribute super."mvclient"; + "mwc-probability" = dontDistribute super."mwc-probability"; + "mwc-random-monad" = dontDistribute super."mwc-random-monad"; + "myTestlll" = dontDistribute super."myTestlll"; + "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; + "myo" = dontDistribute super."myo"; + "mysnapsession" = dontDistribute super."mysnapsession"; + "mysnapsession-example" = dontDistribute super."mysnapsession-example"; + "mysql-effect" = dontDistribute super."mysql-effect"; + "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; + "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mzv" = dontDistribute super."mzv"; + "n-m" = dontDistribute super."n-m"; + "nagios-check" = dontDistribute super."nagios-check"; + "nagios-perfdata" = dontDistribute super."nagios-perfdata"; + "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg"; + "named-formlet" = dontDistribute super."named-formlet"; + "named-lock" = dontDistribute super."named-lock"; + "named-records" = dontDistribute super."named-records"; + "namelist" = dontDistribute super."namelist"; + "names" = dontDistribute super."names"; + "names-th" = dontDistribute super."names-th"; + "nano-cryptr" = dontDistribute super."nano-cryptr"; + "nano-hmac" = dontDistribute super."nano-hmac"; + "nano-md5" = dontDistribute super."nano-md5"; + "nanoAgda" = dontDistribute super."nanoAgda"; + "nanocurses" = dontDistribute super."nanocurses"; + "nanomsg" = dontDistribute super."nanomsg"; + "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; + "nanoparsec" = dontDistribute super."nanoparsec"; + "narc" = dontDistribute super."narc"; + "nat" = dontDistribute super."nat"; + "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "nats" = doDistribute super."nats_1"; + "nats-queue" = dontDistribute super."nats-queue"; + "natural-number" = dontDistribute super."natural-number"; + "natural-numbers" = dontDistribute super."natural-numbers"; + "natural-sort" = dontDistribute super."natural-sort"; + "natural-transformation" = dontDistribute super."natural-transformation"; + "naturalcomp" = dontDistribute super."naturalcomp"; + "naturals" = dontDistribute super."naturals"; + "naver-translate" = dontDistribute super."naver-translate"; + "nbt" = dontDistribute super."nbt"; + "nc-indicators" = dontDistribute super."nc-indicators"; + "ncurses" = dontDistribute super."ncurses"; + "neat" = dontDistribute super."neat"; + "needle" = dontDistribute super."needle"; + "neet" = dontDistribute super."neet"; + "nehe-tuts" = dontDistribute super."nehe-tuts"; + "neil" = dontDistribute super."neil"; + "neither" = dontDistribute super."neither"; + "nemesis" = dontDistribute super."nemesis"; + "nemesis-titan" = dontDistribute super."nemesis-titan"; + "nerf" = dontDistribute super."nerf"; + "nero" = dontDistribute super."nero"; + "nero-wai" = dontDistribute super."nero-wai"; + "nero-warp" = dontDistribute super."nero-warp"; + "nested-routes" = dontDistribute super."nested-routes"; + "nested-sets" = dontDistribute super."nested-sets"; + "nestedmap" = dontDistribute super."nestedmap"; + "net-concurrent" = dontDistribute super."net-concurrent"; + "netclock" = dontDistribute super."netclock"; + "netcore" = dontDistribute super."netcore"; + "netlines" = dontDistribute super."netlines"; + "netlink" = dontDistribute super."netlink"; + "netlist" = dontDistribute super."netlist"; + "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl"; + "netpbm" = dontDistribute super."netpbm"; + "netrc" = dontDistribute super."netrc"; + "netspec" = dontDistribute super."netspec"; + "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = dontDistribute super."nettle"; + "nettle-frp" = dontDistribute super."nettle-frp"; + "nettle-netkit" = dontDistribute super."nettle-netkit"; + "nettle-openflow" = dontDistribute super."nettle-openflow"; + "netwire" = dontDistribute super."netwire"; + "netwire-input" = dontDistribute super."netwire-input"; + "netwire-input-glfw" = dontDistribute super."netwire-input-glfw"; + "network-address" = dontDistribute super."network-address"; + "network-anonymous-tor" = doDistribute super."network-anonymous-tor_0_9_2"; + "network-api-support" = dontDistribute super."network-api-support"; + "network-bitcoin" = dontDistribute super."network-bitcoin"; + "network-builder" = dontDistribute super."network-builder"; + "network-bytestring" = dontDistribute super."network-bytestring"; + "network-conduit" = dontDistribute super."network-conduit"; + "network-connection" = dontDistribute super."network-connection"; + "network-data" = dontDistribute super."network-data"; + "network-dbus" = dontDistribute super."network-dbus"; + "network-dns" = dontDistribute super."network-dns"; + "network-enumerator" = dontDistribute super."network-enumerator"; + "network-fancy" = dontDistribute super."network-fancy"; + "network-house" = dontDistribute super."network-house"; + "network-interfacerequest" = dontDistribute super."network-interfacerequest"; + "network-ip" = dontDistribute super."network-ip"; + "network-metrics" = dontDistribute super."network-metrics"; + "network-minihttp" = dontDistribute super."network-minihttp"; + "network-msg" = dontDistribute super."network-msg"; + "network-netpacket" = dontDistribute super."network-netpacket"; + "network-pgi" = dontDistribute super."network-pgi"; + "network-rpca" = dontDistribute super."network-rpca"; + "network-server" = dontDistribute super."network-server"; + "network-service" = dontDistribute super."network-service"; + "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr"; + "network-simple-tls" = dontDistribute super."network-simple-tls"; + "network-socket-options" = dontDistribute super."network-socket-options"; + "network-stream" = dontDistribute super."network-stream"; + "network-topic-models" = dontDistribute super."network-topic-models"; + "network-transport-amqp" = dontDistribute super."network-transport-amqp"; + "network-transport-composed" = dontDistribute super."network-transport-composed"; + "network-transport-inmemory" = dontDistribute super."network-transport-inmemory"; + "network-transport-tcp" = dontDistribute super."network-transport-tcp"; + "network-transport-tests" = dontDistribute super."network-transport-tests"; + "network-transport-zeromq" = dontDistribute super."network-transport-zeromq"; + "network-uri-static" = dontDistribute super."network-uri-static"; + "network-wai-router" = dontDistribute super."network-wai-router"; + "network-websocket" = dontDistribute super."network-websocket"; + "networked-game" = dontDistribute super."networked-game"; + "newports" = dontDistribute super."newports"; + "newsynth" = dontDistribute super."newsynth"; + "newt" = dontDistribute super."newt"; + "newtype-deriving" = dontDistribute super."newtype-deriving"; + "newtype-th" = dontDistribute super."newtype-th"; + "newtyper" = dontDistribute super."newtyper"; + "nextstep-plist" = dontDistribute super."nextstep-plist"; + "nf" = dontDistribute super."nf"; + "ngrams-loader" = dontDistribute super."ngrams-loader"; + "nibblestring" = dontDistribute super."nibblestring"; + "nicify" = dontDistribute super."nicify"; + "nicify-lib" = dontDistribute super."nicify-lib"; + "nicovideo-translator" = dontDistribute super."nicovideo-translator"; + "nikepub" = dontDistribute super."nikepub"; + "nimber" = dontDistribute super."nimber"; + "nitro" = dontDistribute super."nitro"; + "nix-eval" = dontDistribute super."nix-eval"; + "nix-paths" = dontDistribute super."nix-paths"; + "nixfromnpm" = dontDistribute super."nixfromnpm"; + "nixos-types" = dontDistribute super."nixos-types"; + "nkjp" = dontDistribute super."nkjp"; + "nlp-scores" = dontDistribute super."nlp-scores"; + "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts"; + "nm" = dontDistribute super."nm"; + "nme" = dontDistribute super."nme"; + "nntp" = dontDistribute super."nntp"; + "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; + "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; + "nofib-analyze" = dontDistribute super."nofib-analyze"; + "noise" = dontDistribute super."noise"; + "non-empty" = dontDistribute super."non-empty"; + "non-negative" = dontDistribute super."non-negative"; + "nondeterminism" = dontDistribute super."nondeterminism"; + "nonfree" = dontDistribute super."nonfree"; + "nonlinear-optimization" = dontDistribute super."nonlinear-optimization"; + "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad"; + "noodle" = dontDistribute super."noodle"; + "normaldistribution" = dontDistribute super."normaldistribution"; + "not-gloss" = dontDistribute super."not-gloss"; + "not-gloss-examples" = dontDistribute super."not-gloss-examples"; + "not-in-base" = dontDistribute super."not-in-base"; + "notcpp" = dontDistribute super."notcpp"; + "notmuch-haskell" = dontDistribute super."notmuch-haskell"; + "notmuch-web" = dontDistribute super."notmuch-web"; + "notzero" = dontDistribute super."notzero"; + "np-extras" = dontDistribute super."np-extras"; + "np-linear" = dontDistribute super."np-linear"; + "nptools" = dontDistribute super."nptools"; + "nth-prime" = dontDistribute super."nth-prime"; + "nthable" = dontDistribute super."nthable"; + "ntp-control" = dontDistribute super."ntp-control"; + "null-canvas" = dontDistribute super."null-canvas"; + "nullary" = dontDistribute super."nullary"; + "number" = dontDistribute super."number"; + "numbering" = dontDistribute super."numbering"; + "numerals" = dontDistribute super."numerals"; + "numerals-base" = dontDistribute super."numerals-base"; + "numeric-extras" = doDistribute super."numeric-extras_0_0_3"; + "numeric-limits" = dontDistribute super."numeric-limits"; + "numeric-prelude" = dontDistribute super."numeric-prelude"; + "numeric-qq" = dontDistribute super."numeric-qq"; + "numeric-quest" = dontDistribute super."numeric-quest"; + "numeric-tools" = dontDistribute super."numeric-tools"; + "numericpeano" = dontDistribute super."numericpeano"; + "nums" = dontDistribute super."nums"; + "numtype-dk" = dontDistribute super."numtype-dk"; + "numtype-tf" = dontDistribute super."numtype-tf"; + "nurbs" = dontDistribute super."nurbs"; + "nvim-hs" = dontDistribute super."nvim-hs"; + "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib"; + "nyan" = dontDistribute super."nyan"; + "nylas" = dontDistribute super."nylas"; + "nymphaea" = dontDistribute super."nymphaea"; + "oauthenticated" = dontDistribute super."oauthenticated"; + "obdd" = dontDistribute super."obdd"; + "oberon0" = dontDistribute super."oberon0"; + "obj" = dontDistribute super."obj"; + "objectid" = dontDistribute super."objectid"; + "observable-sharing" = dontDistribute super."observable-sharing"; + "octohat" = dontDistribute super."octohat"; + "octopus" = dontDistribute super."octopus"; + "oculus" = dontDistribute super."oculus"; + "off-simple" = dontDistribute super."off-simple"; + "ofx" = dontDistribute super."ofx"; + "ohloh-hs" = dontDistribute super."ohloh-hs"; + "oi" = dontDistribute super."oi"; + "oidc-client" = dontDistribute super."oidc-client"; + "ois-input-manager" = dontDistribute super."ois-input-manager"; + "old-version" = dontDistribute super."old-version"; + "olwrapper" = dontDistribute super."olwrapper"; + "omaketex" = dontDistribute super."omaketex"; + "omega" = dontDistribute super."omega"; + "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; + "on-a-horse" = dontDistribute super."on-a-horse"; + "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; + "one-liner" = dontDistribute super."one-liner"; + "one-time-password" = dontDistribute super."one-time-password"; + "oneOfN" = dontDistribute super."oneOfN"; + "oneormore" = dontDistribute super."oneormore"; + "only" = dontDistribute super."only"; + "onu-course" = dontDistribute super."onu-course"; + "oo-prototypes" = dontDistribute super."oo-prototypes"; + "opaleye-classy" = dontDistribute super."opaleye-classy"; + "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; + "open-browser" = dontDistribute super."open-browser"; + "open-haddock" = dontDistribute super."open-haddock"; + "open-pandoc" = dontDistribute super."open-pandoc"; + "open-symbology" = dontDistribute super."open-symbology"; + "open-typerep" = dontDistribute super."open-typerep"; + "open-union" = dontDistribute super."open-union"; + "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; + "opencv-raw" = dontDistribute super."opencv-raw"; + "opendatatable" = dontDistribute super."opendatatable"; + "openexchangerates" = dontDistribute super."openexchangerates"; + "openflow" = dontDistribute super."openflow"; + "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo"; + "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator"; + "opengles" = dontDistribute super."opengles"; + "openid" = dontDistribute super."openid"; + "openpgp" = dontDistribute super."openpgp"; + "openpgp-Crypto" = dontDistribute super."openpgp-Crypto"; + "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api"; + "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht"; + "openssh-github-keys" = dontDistribute super."openssh-github-keys"; + "openssl-createkey" = dontDistribute super."openssl-createkey"; + "opentheory" = dontDistribute super."opentheory"; + "opentheory-bits" = dontDistribute super."opentheory-bits"; + "opentheory-byte" = dontDistribute super."opentheory-byte"; + "opentheory-char" = dontDistribute super."opentheory-char"; + "opentheory-divides" = dontDistribute super."opentheory-divides"; + "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci"; + "opentheory-parser" = dontDistribute super."opentheory-parser"; + "opentheory-prime" = dontDistribute super."opentheory-prime"; + "opentheory-primitive" = dontDistribute super."opentheory-primitive"; + "opentheory-probability" = dontDistribute super."opentheory-probability"; + "opentheory-stream" = dontDistribute super."opentheory-stream"; + "opentheory-unicode" = dontDistribute super."opentheory-unicode"; + "operational-alacarte" = dontDistribute super."operational-alacarte"; + "opml" = dontDistribute super."opml"; + "opml-conduit" = dontDistribute super."opml-conduit"; + "opn" = dontDistribute super."opn"; + "optimal-blocks" = dontDistribute super."optimal-blocks"; + "optimization" = dontDistribute super."optimization"; + "optimusprime" = dontDistribute super."optimusprime"; + "optional" = dontDistribute super."optional"; + "options-time" = dontDistribute super."options-time"; + "optparse-declarative" = dontDistribute super."optparse-declarative"; + "orc" = dontDistribute super."orc"; + "orchestrate" = dontDistribute super."orchestrate"; + "orchid" = dontDistribute super."orchid"; + "orchid-demo" = dontDistribute super."orchid-demo"; + "ord-adhoc" = dontDistribute super."ord-adhoc"; + "order-maintenance" = dontDistribute super."order-maintenance"; + "order-statistics" = dontDistribute super."order-statistics"; + "ordered" = dontDistribute super."ordered"; + "orders" = dontDistribute super."orders"; + "ordrea" = dontDistribute super."ordrea"; + "organize-imports" = dontDistribute super."organize-imports"; + "orgmode" = dontDistribute super."orgmode"; + "orgmode-parse" = dontDistribute super."orgmode-parse"; + "origami" = dontDistribute super."origami"; + "os-release" = dontDistribute super."os-release"; + "osc" = dontDistribute super."osc"; + "osm-download" = dontDistribute super."osm-download"; + "oso2pdf" = dontDistribute super."oso2pdf"; + "osx-ar" = dontDistribute super."osx-ar"; + "ot" = dontDistribute super."ot"; + "ottparse-pretty" = dontDistribute super."ottparse-pretty"; + "overture" = dontDistribute super."overture"; + "pack" = dontDistribute super."pack"; + "package-description-remote" = dontDistribute super."package-description-remote"; + "package-o-tron" = dontDistribute super."package-o-tron"; + "package-vt" = dontDistribute super."package-vt"; + "packdeps" = dontDistribute super."packdeps"; + "packed-dawg" = dontDistribute super."packed-dawg"; + "packedstring" = dontDistribute super."packedstring"; + "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; + "packunused" = dontDistribute super."packunused"; + "pacman-memcache" = dontDistribute super."pacman-memcache"; + "padKONTROL" = dontDistribute super."padKONTROL"; + "pagarme" = dontDistribute super."pagarme"; + "pagerduty" = doDistribute super."pagerduty_0_0_3_3"; + "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; + "palindromes" = dontDistribute super."palindromes"; + "pam" = dontDistribute super."pam"; + "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4"; + "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; + "pandoc-crossref" = dontDistribute super."pandoc-crossref"; + "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-lens" = dontDistribute super."pandoc-lens"; + "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; + "pandoc-unlit" = dontDistribute super."pandoc-unlit"; + "papillon" = dontDistribute super."papillon"; + "pappy" = dontDistribute super."pappy"; + "para" = dontDistribute super."para"; + "paragon" = dontDistribute super."paragon"; + "parallel-tasks" = dontDistribute super."parallel-tasks"; + "parallel-tree-search" = dontDistribute super."parallel-tree-search"; + "parameterized-data" = dontDistribute super."parameterized-data"; + "parco" = dontDistribute super."parco"; + "parco-attoparsec" = dontDistribute super."parco-attoparsec"; + "parco-parsec" = dontDistribute super."parco-parsec"; + "parcom-lib" = dontDistribute super."parcom-lib"; + "parconc-examples" = dontDistribute super."parconc-examples"; + "parport" = dontDistribute super."parport"; + "parse-dimacs" = dontDistribute super."parse-dimacs"; + "parse-help" = dontDistribute super."parse-help"; + "parseargs" = doDistribute super."parseargs_0_1_5_2"; + "parsec-extra" = dontDistribute super."parsec-extra"; + "parsec-numbers" = dontDistribute super."parsec-numbers"; + "parsec-parsers" = dontDistribute super."parsec-parsers"; + "parsec-permutation" = dontDistribute super."parsec-permutation"; + "parsec-tagsoup" = dontDistribute super."parsec-tagsoup"; + "parsec-trace" = dontDistribute super."parsec-trace"; + "parsec-utils" = dontDistribute super."parsec-utils"; + "parsec1" = dontDistribute super."parsec1"; + "parsec2" = dontDistribute super."parsec2"; + "parsec3" = dontDistribute super."parsec3"; + "parsec3-numbers" = dontDistribute super."parsec3-numbers"; + "parsedate" = dontDistribute super."parsedate"; + "parseerror-eq" = dontDistribute super."parseerror-eq"; + "parsek" = dontDistribute super."parsek"; + "parsely" = dontDistribute super."parsely"; + "parser-helper" = dontDistribute super."parser-helper"; + "parser241" = dontDistribute super."parser241"; + "parsergen" = dontDistribute super."parsergen"; + "parsestar" = dontDistribute super."parsestar"; + "parsimony" = dontDistribute super."parsimony"; + "partial" = dontDistribute super."partial"; + "partial-isomorphisms" = dontDistribute super."partial-isomorphisms"; + "partial-lens" = dontDistribute super."partial-lens"; + "partial-uri" = dontDistribute super."partial-uri"; + "partly" = dontDistribute super."partly"; + "passage" = dontDistribute super."passage"; + "passwords" = dontDistribute super."passwords"; + "pastis" = dontDistribute super."pastis"; + "pasty" = dontDistribute super."pasty"; + "patch-combinators" = dontDistribute super."patch-combinators"; + "patch-image" = dontDistribute super."patch-image"; + "patches-vector" = dontDistribute super."patches-vector"; + "path-extra" = dontDistribute super."path-extra"; + "pathfinding" = dontDistribute super."pathfinding"; + "pathfindingcore" = dontDistribute super."pathfindingcore"; + "pathtype" = dontDistribute super."pathtype"; + "pathwalk" = dontDistribute super."pathwalk"; + "patronscraper" = dontDistribute super."patronscraper"; + "patterns" = dontDistribute super."patterns"; + "paymill" = dontDistribute super."paymill"; + "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops"; + "paypal-api" = dontDistribute super."paypal-api"; + "pb" = dontDistribute super."pb"; + "pbc4hs" = dontDistribute super."pbc4hs"; + "pbkdf" = dontDistribute super."pbkdf"; + "pcap" = dontDistribute super."pcap"; + "pcap-conduit" = dontDistribute super."pcap-conduit"; + "pcap-enumerator" = dontDistribute super."pcap-enumerator"; + "pcd-loader" = dontDistribute super."pcd-loader"; + "pcf" = dontDistribute super."pcf"; + "pcg-random" = dontDistribute super."pcg-random"; + "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; + "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "pcre-utils" = dontDistribute super."pcre-utils"; + "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; + "pdf-toolbox-core" = dontDistribute super."pdf-toolbox-core"; + "pdf-toolbox-document" = dontDistribute super."pdf-toolbox-document"; + "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; + "pdf2line" = dontDistribute super."pdf2line"; + "pdfsplit" = dontDistribute super."pdfsplit"; + "pdynload" = dontDistribute super."pdynload"; + "peakachu" = dontDistribute super."peakachu"; + "peano" = dontDistribute super."peano"; + "peano-inf" = dontDistribute super."peano-inf"; + "pec" = dontDistribute super."pec"; + "pecoff" = dontDistribute super."pecoff"; + "peg" = dontDistribute super."peg"; + "peggy" = dontDistribute super."peggy"; + "pell" = dontDistribute super."pell"; + "penn-treebank" = dontDistribute super."penn-treebank"; + "penny" = dontDistribute super."penny"; + "penny-bin" = dontDistribute super."penny-bin"; + "penny-lib" = dontDistribute super."penny-lib"; + "peparser" = dontDistribute super."peparser"; + "perceptron" = dontDistribute super."perceptron"; + "perdure" = dontDistribute super."perdure"; + "period" = dontDistribute super."period"; + "perm" = dontDistribute super."perm"; + "permutation" = dontDistribute super."permutation"; + "permute" = dontDistribute super."permute"; + "persist2er" = dontDistribute super."persist2er"; + "persistable-record" = dontDistribute super."persistable-record"; + "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg"; + "persistent-cereal" = dontDistribute super."persistent-cereal"; + "persistent-equivalence" = dontDistribute super."persistent-equivalence"; + "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; + "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; + "persistent-map" = dontDistribute super."persistent-map"; + "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; + "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-protobuf" = dontDistribute super."persistent-protobuf"; + "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; + "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-vector" = dontDistribute super."persistent-vector"; + "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; + "persona" = dontDistribute super."persona"; + "persona-idp" = dontDistribute super."persona-idp"; + "pesca" = dontDistribute super."pesca"; + "peyotls" = dontDistribute super."peyotls"; + "peyotls-codec" = dontDistribute super."peyotls-codec"; + "pez" = dontDistribute super."pez"; + "pg-harness" = dontDistribute super."pg-harness"; + "pg-harness-client" = dontDistribute super."pg-harness-client"; + "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pgdl" = dontDistribute super."pgdl"; + "pgm" = dontDistribute super."pgm"; + "pgp-wordlist" = dontDistribute super."pgp-wordlist"; + "pgsql-simple" = dontDistribute super."pgsql-simple"; + "pgstream" = dontDistribute super."pgstream"; + "phasechange" = dontDistribute super."phasechange"; + "phizzle" = dontDistribute super."phizzle"; + "phone-numbers" = dontDistribute super."phone-numbers"; + "phone-push" = dontDistribute super."phone-push"; + "phonetic-code" = dontDistribute super."phonetic-code"; + "phooey" = dontDistribute super."phooey"; + "photoname" = dontDistribute super."photoname"; + "phraskell" = dontDistribute super."phraskell"; + "phybin" = dontDistribute super."phybin"; + "pi-calculus" = dontDistribute super."pi-calculus"; + "pia-forward" = dontDistribute super."pia-forward"; + "pianola" = dontDistribute super."pianola"; + "picologic" = dontDistribute super."picologic"; + "picosat" = dontDistribute super."picosat"; + "piet" = dontDistribute super."piet"; + "piki" = dontDistribute super."piki"; + "pinboard" = dontDistribute super."pinboard"; + "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; + "pipe-enumerator" = dontDistribute super."pipe-enumerator"; + "pipeclip" = dontDistribute super."pipeclip"; + "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "pipes-cacophony" = dontDistribute super."pipes-cacophony"; + "pipes-cellular" = dontDistribute super."pipes-cellular"; + "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; + "pipes-cereal" = dontDistribute super."pipes-cereal"; + "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; + "pipes-conduit" = dontDistribute super."pipes-conduit"; + "pipes-core" = dontDistribute super."pipes-core"; + "pipes-courier" = dontDistribute super."pipes-courier"; + "pipes-csv" = dontDistribute super."pipes-csv"; + "pipes-errors" = dontDistribute super."pipes-errors"; + "pipes-extra" = dontDistribute super."pipes-extra"; + "pipes-extras" = dontDistribute super."pipes-extras"; + "pipes-files" = dontDistribute super."pipes-files"; + "pipes-interleave" = dontDistribute super."pipes-interleave"; + "pipes-mongodb" = dontDistribute super."pipes-mongodb"; + "pipes-network-tls" = dontDistribute super."pipes-network-tls"; + "pipes-p2p" = dontDistribute super."pipes-p2p"; + "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; + "pipes-rt" = dontDistribute super."pipes-rt"; + "pipes-shell" = dontDistribute super."pipes-shell"; + "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; + "pipes-vector" = dontDistribute super."pipes-vector"; + "pipes-websockets" = dontDistribute super."pipes-websockets"; + "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; + "pipes-zlib" = dontDistribute super."pipes-zlib"; + "pisigma" = dontDistribute super."pisigma"; + "pit" = dontDistribute super."pit"; + "pitchtrack" = dontDistribute super."pitchtrack"; + "pivotal-tracker" = dontDistribute super."pivotal-tracker"; + "pkcs1" = dontDistribute super."pkcs1"; + "pkcs7" = dontDistribute super."pkcs7"; + "pkggraph" = dontDistribute super."pkggraph"; + "pktree" = dontDistribute super."pktree"; + "plailude" = dontDistribute super."plailude"; + "planar-graph" = dontDistribute super."planar-graph"; + "plat" = dontDistribute super."plat"; + "playlists" = dontDistribute super."playlists"; + "plist" = dontDistribute super."plist"; + "plivo" = dontDistribute super."plivo"; + "plot" = doDistribute super."plot_0_2_3_4"; + "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2"; + "plot-gtk-ui" = dontDistribute super."plot-gtk-ui"; + "plot-gtk3" = doDistribute super."plot-gtk3_0_1_0_1"; + "plot-lab" = dontDistribute super."plot-lab"; + "plotfont" = dontDistribute super."plotfont"; + "plotserver-api" = dontDistribute super."plotserver-api"; + "plugins" = dontDistribute super."plugins"; + "plugins-auto" = dontDistribute super."plugins-auto"; + "plugins-multistage" = dontDistribute super."plugins-multistage"; + "plumbers" = dontDistribute super."plumbers"; + "ply-loader" = dontDistribute super."ply-loader"; + "png-file" = dontDistribute super."png-file"; + "pngload" = dontDistribute super."pngload"; + "pngload-fixed" = dontDistribute super."pngload-fixed"; + "pnm" = dontDistribute super."pnm"; + "pocket-dns" = dontDistribute super."pocket-dns"; + "pointedlist" = dontDistribute super."pointedlist"; + "pointfree" = dontDistribute super."pointfree"; + "pointful" = dontDistribute super."pointful"; + "pointless-fun" = dontDistribute super."pointless-fun"; + "pointless-haskell" = dontDistribute super."pointless-haskell"; + "pointless-lenses" = dontDistribute super."pointless-lenses"; + "pointless-rewrite" = dontDistribute super."pointless-rewrite"; + "poker-eval" = dontDistribute super."poker-eval"; + "pokitdok" = dontDistribute super."pokitdok"; + "polar" = dontDistribute super."polar"; + "polar-configfile" = dontDistribute super."polar-configfile"; + "polar-shader" = dontDistribute super."polar-shader"; + "polh-lexicon" = dontDistribute super."polh-lexicon"; + "polimorf" = dontDistribute super."polimorf"; + "poll" = dontDistribute super."poll"; + "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; + "polynomial" = dontDistribute super."polynomial"; + "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; + "polyseq" = dontDistribute super."polyseq"; + "polysoup" = dontDistribute super."polysoup"; + "polytypeable" = dontDistribute super."polytypeable"; + "polytypeable-utils" = dontDistribute super."polytypeable-utils"; + "ponder" = dontDistribute super."ponder"; + "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; + "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; + "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; + "pony" = dontDistribute super."pony"; + "pool" = dontDistribute super."pool"; + "pool-conduit" = dontDistribute super."pool-conduit"; + "pooled-io" = dontDistribute super."pooled-io"; + "pop3-client" = dontDistribute super."pop3-client"; + "popenhs" = dontDistribute super."popenhs"; + "poppler" = dontDistribute super."poppler"; + "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache"; + "portable-lines" = dontDistribute super."portable-lines"; + "portaudio" = dontDistribute super."portaudio"; + "porte" = dontDistribute super."porte"; + "porter" = dontDistribute super."porter"; + "ports" = dontDistribute super."ports"; + "ports-tools" = dontDistribute super."ports-tools"; + "positive" = dontDistribute super."positive"; + "posix-acl" = dontDistribute super."posix-acl"; + "posix-escape" = dontDistribute super."posix-escape"; + "posix-filelock" = dontDistribute super."posix-filelock"; + "posix-paths" = dontDistribute super."posix-paths"; + "posix-pty" = dontDistribute super."posix-pty"; + "posix-timer" = dontDistribute super."posix-timer"; + "posix-waitpid" = dontDistribute super."posix-waitpid"; + "possible" = dontDistribute super."possible"; + "post-mess-age" = doDistribute super."post-mess-age_0_1_0_0"; + "postcodes" = dontDistribute super."postcodes"; + "postgresql-config" = dontDistribute super."postgresql-config"; + "postgresql-connector" = dontDistribute super."postgresql-connector"; + "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; + "postgresql-cube" = dontDistribute super."postgresql-cube"; + "postgresql-error-codes" = dontDistribute super."postgresql-error-codes"; + "postgresql-orm" = dontDistribute super."postgresql-orm"; + "postgresql-query" = dontDistribute super."postgresql-query"; + "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; + "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; + "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; + "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; + "postgresql-typed" = dontDistribute super."postgresql-typed"; + "postgrest" = dontDistribute super."postgrest"; + "postie" = dontDistribute super."postie"; + "postmark" = dontDistribute super."postmark"; + "postmaster" = dontDistribute super."postmaster"; + "potato-tool" = dontDistribute super."potato-tool"; + "potrace" = dontDistribute super."potrace"; + "potrace-diagrams" = dontDistribute super."potrace-diagrams"; + "powermate" = dontDistribute super."powermate"; + "powerpc" = dontDistribute super."powerpc"; + "ppm" = dontDistribute super."ppm"; + "pqc" = dontDistribute super."pqc"; + "pqueue-mtl" = dontDistribute super."pqueue-mtl"; + "practice-room" = dontDistribute super."practice-room"; + "precis" = dontDistribute super."precis"; + "pred-trie" = doDistribute super."pred-trie_0_2_0"; + "predicates" = dontDistribute super."predicates"; + "prednote-test" = dontDistribute super."prednote-test"; + "prefix-units" = doDistribute super."prefix-units_0_1_0_2"; + "prefork" = dontDistribute super."prefork"; + "pregame" = dontDistribute super."pregame"; + "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-generalize" = dontDistribute super."prelude-generalize"; + "prelude-plus" = dontDistribute super."prelude-plus"; + "prelude-prime" = dontDistribute super."prelude-prime"; + "prelude-safeenum" = dontDistribute super."prelude-safeenum"; + "preprocess-haskell" = dontDistribute super."preprocess-haskell"; + "preprocessor-tools" = dontDistribute super."preprocessor-tools"; + "present" = dontDistribute super."present"; + "press" = dontDistribute super."press"; + "presto-hdbc" = dontDistribute super."presto-hdbc"; + "prettify" = dontDistribute super."prettify"; + "pretty-compact" = dontDistribute super."pretty-compact"; + "pretty-error" = dontDistribute super."pretty-error"; + "pretty-hex" = dontDistribute super."pretty-hex"; + "pretty-ncols" = dontDistribute super."pretty-ncols"; + "pretty-sop" = dontDistribute super."pretty-sop"; + "pretty-tree" = dontDistribute super."pretty-tree"; + "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; + "prim-uniq" = dontDistribute super."prim-uniq"; + "primula-board" = dontDistribute super."primula-board"; + "primula-bot" = dontDistribute super."primula-bot"; + "printf-mauke" = dontDistribute super."printf-mauke"; + "printxosd" = dontDistribute super."printxosd"; + "priority-queue" = dontDistribute super."priority-queue"; + "priority-sync" = dontDistribute super."priority-sync"; + "privileged-concurrency" = dontDistribute super."privileged-concurrency"; + "prizm" = dontDistribute super."prizm"; + "probability" = dontDistribute super."probability"; + "probable" = dontDistribute super."probable"; + "proc" = dontDistribute super."proc"; + "process-conduit" = dontDistribute super."process-conduit"; + "process-iterio" = dontDistribute super."process-iterio"; + "process-leksah" = dontDistribute super."process-leksah"; + "process-listlike" = dontDistribute super."process-listlike"; + "process-progress" = dontDistribute super."process-progress"; + "process-qq" = dontDistribute super."process-qq"; + "process-streaming" = dontDistribute super."process-streaming"; + "processing" = dontDistribute super."processing"; + "processor-creative-kit" = dontDistribute super."processor-creative-kit"; + "procrastinating-structure" = dontDistribute super."procrastinating-structure"; + "procrastinating-variable" = dontDistribute super."procrastinating-variable"; + "procstat" = dontDistribute super."procstat"; + "proctest" = dontDistribute super."proctest"; + "prof2dot" = dontDistribute super."prof2dot"; + "prof2pretty" = dontDistribute super."prof2pretty"; + "profiteur" = dontDistribute super."profiteur"; + "progress" = dontDistribute super."progress"; + "progressbar" = dontDistribute super."progressbar"; + "progression" = dontDistribute super."progression"; + "progressive" = dontDistribute super."progressive"; + "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; + "projection" = dontDistribute super."projection"; + "prolog" = dontDistribute super."prolog"; + "prolog-graph" = dontDistribute super."prolog-graph"; + "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; + "prologue" = dontDistribute super."prologue"; + "promise" = dontDistribute super."promise"; + "promises" = dontDistribute super."promises"; + "prompt" = dontDistribute super."prompt"; + "propane" = dontDistribute super."propane"; + "propellor" = dontDistribute super."propellor"; + "properties" = dontDistribute super."properties"; + "property-list" = dontDistribute super."property-list"; + "proplang" = dontDistribute super."proplang"; + "props" = dontDistribute super."props"; + "prosper" = dontDistribute super."prosper"; + "proteaaudio" = dontDistribute super."proteaaudio"; + "protobuf" = dontDistribute super."protobuf"; + "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; + "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "proton-haskell" = dontDistribute super."proton-haskell"; + "prototype" = dontDistribute super."prototype"; + "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; + "proxy-kindness" = dontDistribute super."proxy-kindness"; + "psc-ide" = dontDistribute super."psc-ide"; + "pseudo-boolean" = dontDistribute super."pseudo-boolean"; + "pseudo-trie" = dontDistribute super."pseudo-trie"; + "pseudomacros" = dontDistribute super."pseudomacros"; + "pub" = dontDistribute super."pub"; + "publicsuffix" = dontDistribute super."publicsuffix"; + "publicsuffixlist" = dontDistribute super."publicsuffixlist"; + "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate"; + "pubnub" = dontDistribute super."pubnub"; + "pubsub" = dontDistribute super."pubsub"; + "puffytools" = dontDistribute super."puffytools"; + "pugixml" = dontDistribute super."pugixml"; + "pugs-DrIFT" = dontDistribute super."pugs-DrIFT"; + "pugs-HsSyck" = dontDistribute super."pugs-HsSyck"; + "pugs-compat" = dontDistribute super."pugs-compat"; + "pugs-hsregex" = dontDistribute super."pugs-hsregex"; + "pulse-simple" = dontDistribute super."pulse-simple"; + "punkt" = dontDistribute super."punkt"; + "punycode" = dontDistribute super."punycode"; + "puppetresources" = dontDistribute super."puppetresources"; + "pure-cdb" = dontDistribute super."pure-cdb"; + "pure-fft" = dontDistribute super."pure-fft"; + "pure-priority-queue" = dontDistribute super."pure-priority-queue"; + "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests"; + "pure-zlib" = dontDistribute super."pure-zlib"; + "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast"; + "push-notify" = dontDistribute super."push-notify"; + "push-notify-ccs" = dontDistribute super."push-notify-ccs"; + "push-notify-general" = dontDistribute super."push-notify-general"; + "pusher-haskell" = dontDistribute super."pusher-haskell"; + "pusher-http-haskell" = dontDistribute super."pusher-http-haskell"; + "pushme" = dontDistribute super."pushme"; + "putlenses" = dontDistribute super."putlenses"; + "puzzle-draw" = dontDistribute super."puzzle-draw"; + "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline"; + "pvd" = dontDistribute super."pvd"; + "pwstore-cli" = dontDistribute super."pwstore-cli"; + "pwstore-purehaskell" = dontDistribute super."pwstore-purehaskell"; + "pxsl-tools" = dontDistribute super."pxsl-tools"; + "pyffi" = dontDistribute super."pyffi"; + "pyfi" = dontDistribute super."pyfi"; + "python-pickle" = dontDistribute super."python-pickle"; + "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; + "qd" = dontDistribute super."qd"; + "qd-vec" = dontDistribute super."qd-vec"; + "qed" = dontDistribute super."qed"; + "qhull-simple" = dontDistribute super."qhull-simple"; + "qrcode" = dontDistribute super."qrcode"; + "qt" = dontDistribute super."qt"; + "quadratic-irrational" = dontDistribute super."quadratic-irrational"; + "quantfin" = dontDistribute super."quantfin"; + "quantities" = dontDistribute super."quantities"; + "quantum-arrow" = dontDistribute super."quantum-arrow"; + "qudb" = dontDistribute super."qudb"; + "quenya-verb" = dontDistribute super."quenya-verb"; + "querystring-pickle" = dontDistribute super."querystring-pickle"; + "questioner" = dontDistribute super."questioner"; + "queue" = dontDistribute super."queue"; + "queuelike" = dontDistribute super."queuelike"; + "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-poly" = dontDistribute super."quickcheck-poly"; + "quickcheck-properties" = dontDistribute super."quickcheck-properties"; + "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; + "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad"; + "quickcheck-regex" = dontDistribute super."quickcheck-regex"; + "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng"; + "quickcheck-rematch" = dontDistribute super."quickcheck-rematch"; + "quickcheck-script" = dontDistribute super."quickcheck-script"; + "quickcheck-simple" = dontDistribute super."quickcheck-simple"; + "quickcheck-text" = dontDistribute super."quickcheck-text"; + "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver"; + "quicklz" = dontDistribute super."quicklz"; + "quickpull" = dontDistribute super."quickpull"; + "quickset" = dontDistribute super."quickset"; + "quickspec" = dontDistribute super."quickspec"; + "quicktest" = dontDistribute super."quicktest"; + "quickwebapp" = dontDistribute super."quickwebapp"; + "quiver" = dontDistribute super."quiver"; + "quiver-bytestring" = dontDistribute super."quiver-bytestring"; + "quiver-cell" = dontDistribute super."quiver-cell"; + "quiver-csv" = dontDistribute super."quiver-csv"; + "quiver-enumerator" = dontDistribute super."quiver-enumerator"; + "quiver-http" = dontDistribute super."quiver-http"; + "quoridor-hs" = dontDistribute super."quoridor-hs"; + "qux" = dontDistribute super."qux"; + "rabocsv2qif" = dontDistribute super."rabocsv2qif"; + "rad" = dontDistribute super."rad"; + "radian" = dontDistribute super."radian"; + "radium" = dontDistribute super."radium"; + "radium-formula-parser" = dontDistribute super."radium-formula-parser"; + "radix" = dontDistribute super."radix"; + "rados-haskell" = dontDistribute super."rados-haskell"; + "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rake" = dontDistribute super."rake"; + "rakhana" = dontDistribute super."rakhana"; + "ralist" = dontDistribute super."ralist"; + "rallod" = dontDistribute super."rallod"; + "raml" = dontDistribute super."raml"; + "rand-vars" = dontDistribute super."rand-vars"; + "randfile" = dontDistribute super."randfile"; + "random-access-list" = dontDistribute super."random-access-list"; + "random-derive" = dontDistribute super."random-derive"; + "random-eff" = dontDistribute super."random-eff"; + "random-effin" = dontDistribute super."random-effin"; + "random-extras" = dontDistribute super."random-extras"; + "random-hypergeometric" = dontDistribute super."random-hypergeometric"; + "random-stream" = dontDistribute super."random-stream"; + "random-variates" = dontDistribute super."random-variates"; + "randomgen" = dontDistribute super."randomgen"; + "randproc" = dontDistribute super."randproc"; + "randsolid" = dontDistribute super."randsolid"; + "range-set-list" = dontDistribute super."range-set-list"; + "range-space" = dontDistribute super."range-space"; + "rangemin" = dontDistribute super."rangemin"; + "ranges" = dontDistribute super."ranges"; + "rank1dynamic" = dontDistribute super."rank1dynamic"; + "rascal" = dontDistribute super."rascal"; + "rate-limit" = dontDistribute super."rate-limit"; + "ratio-int" = dontDistribute super."ratio-int"; + "raven-haskell" = dontDistribute super."raven-haskell"; + "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "rawstring-qm" = dontDistribute super."rawstring-qm"; + "razom-text-util" = dontDistribute super."razom-text-util"; + "rbr" = dontDistribute super."rbr"; + "rclient" = dontDistribute super."rclient"; + "rcu" = dontDistribute super."rcu"; + "rdf4h" = dontDistribute super."rdf4h"; + "rdioh" = dontDistribute super."rdioh"; + "rdtsc" = dontDistribute super."rdtsc"; + "rdtsc-enolan" = dontDistribute super."rdtsc-enolan"; + "re2" = dontDistribute super."re2"; + "react-flux" = dontDistribute super."react-flux"; + "react-haskell" = dontDistribute super."react-haskell"; + "reaction-logic" = dontDistribute super."reaction-logic"; + "reactive" = dontDistribute super."reactive"; + "reactive-bacon" = dontDistribute super."reactive-bacon"; + "reactive-balsa" = dontDistribute super."reactive-balsa"; + "reactive-banana" = dontDistribute super."reactive-banana"; + "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; + "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; + "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; + "reactive-glut" = dontDistribute super."reactive-glut"; + "reactive-haskell" = dontDistribute super."reactive-haskell"; + "reactive-io" = dontDistribute super."reactive-io"; + "reactive-thread" = dontDistribute super."reactive-thread"; + "reactor" = dontDistribute super."reactor"; + "read-bounded" = dontDistribute super."read-bounded"; + "read-editor" = dontDistribute super."read-editor"; + "readable" = dontDistribute super."readable"; + "readline" = dontDistribute super."readline"; + "readline-statevar" = dontDistribute super."readline-statevar"; + "readpyc" = dontDistribute super."readpyc"; + "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; + "reasonable-lens" = dontDistribute super."reasonable-lens"; + "reasonable-operational" = dontDistribute super."reasonable-operational"; + "recaptcha" = dontDistribute super."recaptcha"; + "record" = dontDistribute super."record"; + "record-aeson" = dontDistribute super."record-aeson"; + "record-gl" = dontDistribute super."record-gl"; + "record-preprocessor" = dontDistribute super."record-preprocessor"; + "record-syntax" = dontDistribute super."record-syntax"; + "records" = dontDistribute super."records"; + "records-th" = dontDistribute super."records-th"; + "recursion-schemes" = dontDistribute super."recursion-schemes"; + "recursive-line-count" = dontDistribute super."recursive-line-count"; + "redHandlers" = dontDistribute super."redHandlers"; + "reddit" = dontDistribute super."reddit"; + "redis" = dontDistribute super."redis"; + "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; + "redis-simple" = dontDistribute super."redis-simple"; + "redo" = dontDistribute super."redo"; + "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; + "reenact" = dontDistribute super."reenact"; + "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; + "ref" = dontDistribute super."ref"; + "ref-mtl" = dontDistribute super."ref-mtl"; + "ref-tf" = dontDistribute super."ref-tf"; + "refcount" = dontDistribute super."refcount"; + "reference" = dontDistribute super."reference"; + "references" = dontDistribute super."references"; + "refh" = dontDistribute super."refh"; + "refined" = dontDistribute super."refined"; + "reflection" = doDistribute super."reflection_2"; + "reflection-extras" = dontDistribute super."reflection-extras"; + "reflection-without-remorse" = dontDistribute super."reflection-without-remorse"; + "reflex" = dontDistribute super."reflex"; + "reflex-animation" = dontDistribute super."reflex-animation"; + "reflex-dom" = dontDistribute super."reflex-dom"; + "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; + "reflex-gloss" = dontDistribute super."reflex-gloss"; + "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-transformers" = dontDistribute super."reflex-transformers"; + "reform" = dontDistribute super."reform"; + "reform-blaze" = dontDistribute super."reform-blaze"; + "reform-hamlet" = dontDistribute super."reform-hamlet"; + "reform-happstack" = dontDistribute super."reform-happstack"; + "reform-hsp" = dontDistribute super."reform-hsp"; + "regex-applicative-text" = dontDistribute super."regex-applicative-text"; + "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; + "regex-deriv" = dontDistribute super."regex-deriv"; + "regex-dfa" = dontDistribute super."regex-dfa"; + "regex-easy" = dontDistribute super."regex-easy"; + "regex-genex" = dontDistribute super."regex-genex"; + "regex-parsec" = dontDistribute super."regex-parsec"; + "regex-pderiv" = dontDistribute super."regex-pderiv"; + "regex-posix-unittest" = dontDistribute super."regex-posix-unittest"; + "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes"; + "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter"; + "regex-tdfa-text" = dontDistribute super."regex-tdfa-text"; + "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest"; + "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8"; + "regex-tre" = dontDistribute super."regex-tre"; + "regex-xmlschema" = dontDistribute super."regex-xmlschema"; + "regexchar" = dontDistribute super."regexchar"; + "regexdot" = dontDistribute super."regexdot"; + "regexp-tries" = dontDistribute super."regexp-tries"; + "regexpr" = dontDistribute super."regexpr"; + "regexpr-symbolic" = dontDistribute super."regexpr-symbolic"; + "regexqq" = dontDistribute super."regexqq"; + "regional-pointers" = dontDistribute super."regional-pointers"; + "regions" = dontDistribute super."regions"; + "regions-monadsfd" = dontDistribute super."regions-monadsfd"; + "regions-monadstf" = dontDistribute super."regions-monadstf"; + "regions-mtl" = dontDistribute super."regions-mtl"; + "regress" = dontDistribute super."regress"; + "regular" = dontDistribute super."regular"; + "regular-extras" = dontDistribute super."regular-extras"; + "regular-web" = dontDistribute super."regular-web"; + "regular-xmlpickler" = dontDistribute super."regular-xmlpickler"; + "reheat" = dontDistribute super."reheat"; + "rehoo" = dontDistribute super."rehoo"; + "rei" = dontDistribute super."rei"; + "reified-records" = dontDistribute super."reified-records"; + "reify" = dontDistribute super."reify"; + "reinterpret-cast" = dontDistribute super."reinterpret-cast"; + "relacion" = dontDistribute super."relacion"; + "relation" = dontDistribute super."relation"; + "relational-postgresql8" = dontDistribute super."relational-postgresql8"; + "relational-query" = dontDistribute super."relational-query"; + "relational-query-HDBC" = dontDistribute super."relational-query-HDBC"; + "relational-record" = dontDistribute super."relational-record"; + "relational-record-examples" = dontDistribute super."relational-record-examples"; + "relational-schemas" = dontDistribute super."relational-schemas"; + "relative-date" = dontDistribute super."relative-date"; + "relit" = dontDistribute super."relit"; + "rematch" = dontDistribute super."rematch"; + "rematch-text" = dontDistribute super."rematch-text"; + "remote" = dontDistribute super."remote"; + "remote-debugger" = dontDistribute super."remote-debugger"; + "remotion" = dontDistribute super."remotion"; + "renderable" = dontDistribute super."renderable"; + "reord" = dontDistribute super."reord"; + "reorderable" = dontDistribute super."reorderable"; + "repa" = doDistribute super."repa_3_4_0_1"; + "repa-algorithms" = doDistribute super."repa-algorithms_3_4_0_1"; + "repa-array" = dontDistribute super."repa-array"; + "repa-bytestring" = dontDistribute super."repa-bytestring"; + "repa-convert" = dontDistribute super."repa-convert"; + "repa-eval" = dontDistribute super."repa-eval"; + "repa-examples" = dontDistribute super."repa-examples"; + "repa-fftw" = dontDistribute super."repa-fftw"; + "repa-flow" = dontDistribute super."repa-flow"; + "repa-io" = doDistribute super."repa-io_3_4_0_1"; + "repa-linear-algebra" = dontDistribute super."repa-linear-algebra"; + "repa-plugin" = dontDistribute super."repa-plugin"; + "repa-scalar" = dontDistribute super."repa-scalar"; + "repa-series" = dontDistribute super."repa-series"; + "repa-sndfile" = dontDistribute super."repa-sndfile"; + "repa-stream" = dontDistribute super."repa-stream"; + "repa-v4l2" = dontDistribute super."repa-v4l2"; + "repl" = dontDistribute super."repl"; + "repl-toolkit" = dontDistribute super."repl-toolkit"; + "repline" = dontDistribute super."repline"; + "repo-based-blog" = dontDistribute super."repo-based-blog"; + "repr" = dontDistribute super."repr"; + "repr-tree-syb" = dontDistribute super."repr-tree-syb"; + "representable-functors" = dontDistribute super."representable-functors"; + "representable-profunctors" = dontDistribute super."representable-profunctors"; + "representable-tries" = dontDistribute super."representable-tries"; + "request-monad" = dontDistribute super."request-monad"; + "reserve" = dontDistribute super."reserve"; + "resistor-cube" = dontDistribute super."resistor-cube"; + "resolve-trivial-conflicts" = dontDistribute super."resolve-trivial-conflicts"; + "resource-effect" = dontDistribute super."resource-effect"; + "resource-embed" = dontDistribute super."resource-embed"; + "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; + "resource-pool-monad" = dontDistribute super."resource-pool-monad"; + "resource-simple" = dontDistribute super."resource-simple"; + "respond" = dontDistribute super."respond"; + "rest-core" = doDistribute super."rest-core_0_36_0_6"; + "rest-example" = dontDistribute super."rest-example"; + "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; + "rest-happstack" = doDistribute super."rest-happstack_0_2_10_8"; + "rest-snap" = doDistribute super."rest-snap_0_1_17_18"; + "rest-wai" = doDistribute super."rest-wai_0_1_0_8"; + "restful-snap" = dontDistribute super."restful-snap"; + "restricted-workers" = dontDistribute super."restricted-workers"; + "restyle" = dontDistribute super."restyle"; + "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb" = dontDistribute super."rethinkdb"; + "rethinkdb-model" = dontDistribute super."rethinkdb-model"; + "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; + "retryer" = dontDistribute super."retryer"; + "revdectime" = dontDistribute super."revdectime"; + "reverse-apply" = dontDistribute super."reverse-apply"; + "reverse-geocoding" = dontDistribute super."reverse-geocoding"; + "reversi" = dontDistribute super."reversi"; + "rewrite" = dontDistribute super."rewrite"; + "rewriting" = dontDistribute super."rewriting"; + "rex" = dontDistribute super."rex"; + "rezoom" = dontDistribute super."rezoom"; + "rfc3339" = dontDistribute super."rfc3339"; + "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial"; + "riak" = dontDistribute super."riak"; + "riak-protobuf" = dontDistribute super."riak-protobuf"; + "richreports" = dontDistribute super."richreports"; + "riemann" = dontDistribute super."riemann"; + "riff" = dontDistribute super."riff"; + "ring-buffer" = dontDistribute super."ring-buffer"; + "riot" = dontDistribute super."riot"; + "ripple" = dontDistribute super."ripple"; + "ripple-federation" = dontDistribute super."ripple-federation"; + "risc386" = dontDistribute super."risc386"; + "rivers" = dontDistribute super."rivers"; + "rivet" = dontDistribute super."rivet"; + "rivet-core" = dontDistribute super."rivet-core"; + "rivet-migration" = dontDistribute super."rivet-migration"; + "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy"; + "rlglue" = dontDistribute super."rlglue"; + "rmonad" = dontDistribute super."rmonad"; + "rncryptor" = dontDistribute super."rncryptor"; + "rng-utils" = dontDistribute super."rng-utils"; + "robin" = dontDistribute super."robin"; + "robot" = dontDistribute super."robot"; + "robots-txt" = dontDistribute super."robots-txt"; + "rocksdb-haskell" = dontDistribute super."rocksdb-haskell"; + "roguestar" = dontDistribute super."roguestar"; + "roguestar-engine" = dontDistribute super."roguestar-engine"; + "roguestar-gl" = dontDistribute super."roguestar-gl"; + "roguestar-glut" = dontDistribute super."roguestar-glut"; + "rollbar" = dontDistribute super."rollbar"; + "roller" = dontDistribute super."roller"; + "rolling-queue" = dontDistribute super."rolling-queue"; + "roman-numerals" = dontDistribute super."roman-numerals"; + "romkan" = dontDistribute super."romkan"; + "roots" = dontDistribute super."roots"; + "rope" = dontDistribute super."rope"; + "rosa" = dontDistribute super."rosa"; + "rose-trees" = dontDistribute super."rose-trees"; + "rose-trie" = dontDistribute super."rose-trie"; + "rosezipper" = dontDistribute super."rosezipper"; + "roshask" = dontDistribute super."roshask"; + "rosso" = dontDistribute super."rosso"; + "rot13" = dontDistribute super."rot13"; + "rotating-log" = dontDistribute super."rotating-log"; + "rounding" = dontDistribute super."rounding"; + "roundtrip" = dontDistribute super."roundtrip"; + "roundtrip-aeson" = dontDistribute super."roundtrip-aeson"; + "roundtrip-string" = dontDistribute super."roundtrip-string"; + "roundtrip-xml" = dontDistribute super."roundtrip-xml"; + "route-generator" = dontDistribute super."route-generator"; + "route-planning" = dontDistribute super."route-planning"; + "rowrecord" = dontDistribute super."rowrecord"; + "rpc" = dontDistribute super."rpc"; + "rpc-framework" = dontDistribute super."rpc-framework"; + "rpf" = dontDistribute super."rpf"; + "rpm" = dontDistribute super."rpm"; + "rsagl" = dontDistribute super."rsagl"; + "rsagl-frp" = dontDistribute super."rsagl-frp"; + "rsagl-math" = dontDistribute super."rsagl-math"; + "rspp" = dontDistribute super."rspp"; + "rss" = dontDistribute super."rss"; + "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; + "rtld" = dontDistribute super."rtld"; + "rtlsdr" = dontDistribute super."rtlsdr"; + "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; + "rtorrent-state" = dontDistribute super."rtorrent-state"; + "rubberband" = dontDistribute super."rubberband"; + "ruby-marshal" = dontDistribute super."ruby-marshal"; + "ruby-qq" = dontDistribute super."ruby-qq"; + "ruff" = dontDistribute super."ruff"; + "ruler" = dontDistribute super."ruler"; + "ruler-core" = dontDistribute super."ruler-core"; + "rungekutta" = dontDistribute super."rungekutta"; + "runghc" = dontDistribute super."runghc"; + "rwlock" = dontDistribute super."rwlock"; + "rws" = dontDistribute super."rws"; + "s-cargot" = dontDistribute super."s-cargot"; + "s3-signer" = dontDistribute super."s3-signer"; + "safe-access" = dontDistribute super."safe-access"; + "safe-failure" = dontDistribute super."safe-failure"; + "safe-failure-cme" = dontDistribute super."safe-failure-cme"; + "safe-freeze" = dontDistribute super."safe-freeze"; + "safe-globals" = dontDistribute super."safe-globals"; + "safe-lazy-io" = dontDistribute super."safe-lazy-io"; + "safe-length" = dontDistribute super."safe-length"; + "safe-plugins" = dontDistribute super."safe-plugins"; + "safe-printf" = dontDistribute super."safe-printf"; + "safeint" = dontDistribute super."safeint"; + "safer-file-handles" = dontDistribute super."safer-file-handles"; + "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; + "safer-file-handles-text" = dontDistribute super."safer-file-handles-text"; + "saferoute" = dontDistribute super."saferoute"; + "sai-shape-syb" = dontDistribute super."sai-shape-syb"; + "saltine" = dontDistribute super."saltine"; + "saltine-quickcheck" = dontDistribute super."saltine-quickcheck"; + "salvia" = dontDistribute super."salvia"; + "salvia-demo" = dontDistribute super."salvia-demo"; + "salvia-extras" = dontDistribute super."salvia-extras"; + "salvia-protocol" = dontDistribute super."salvia-protocol"; + "salvia-sessions" = dontDistribute super."salvia-sessions"; + "salvia-websocket" = dontDistribute super."salvia-websocket"; + "sample-frame" = dontDistribute super."sample-frame"; + "sample-frame-np" = dontDistribute super."sample-frame-np"; + "samtools" = dontDistribute super."samtools"; + "samtools-conduit" = dontDistribute super."samtools-conduit"; + "samtools-enumerator" = dontDistribute super."samtools-enumerator"; + "samtools-iteratee" = dontDistribute super."samtools-iteratee"; + "sandlib" = dontDistribute super."sandlib"; + "sandman" = dontDistribute super."sandman"; + "sarasvati" = dontDistribute super."sarasvati"; + "sasl" = dontDistribute super."sasl"; + "sat" = dontDistribute super."sat"; + "sat-micro-hs" = dontDistribute super."sat-micro-hs"; + "satchmo" = dontDistribute super."satchmo"; + "satchmo-backends" = dontDistribute super."satchmo-backends"; + "satchmo-examples" = dontDistribute super."satchmo-examples"; + "satchmo-funsat" = dontDistribute super."satchmo-funsat"; + "satchmo-minisat" = dontDistribute super."satchmo-minisat"; + "satchmo-toysat" = dontDistribute super."satchmo-toysat"; + "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; + "sc3-rdu" = dontDistribute super."sc3-rdu"; + "scalable-server" = dontDistribute super."scalable-server"; + "scaleimage" = dontDistribute super."scaleimage"; + "scalp-webhooks" = dontDistribute super."scalp-webhooks"; + "scan" = dontDistribute super."scan"; + "scan-vector-machine" = dontDistribute super."scan-vector-machine"; + "scat" = dontDistribute super."scat"; + "scc" = dontDistribute super."scc"; + "scenegraph" = dontDistribute super."scenegraph"; + "scgi" = dontDistribute super."scgi"; + "schedevr" = dontDistribute super."schedevr"; + "schedule-planner" = dontDistribute super."schedule-planner"; + "schedyield" = dontDistribute super."schedyield"; + "scholdoc" = dontDistribute super."scholdoc"; + "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc"; + "scholdoc-texmath" = dontDistribute super."scholdoc-texmath"; + "scholdoc-types" = dontDistribute super."scholdoc-types"; + "schonfinkeling" = dontDistribute super."schonfinkeling"; + "sci-ratio" = dontDistribute super."sci-ratio"; + "science-constants" = dontDistribute super."science-constants"; + "science-constants-dimensional" = dontDistribute super."science-constants-dimensional"; + "scion" = dontDistribute super."scion"; + "scion-browser" = dontDistribute super."scion-browser"; + "scons2dot" = dontDistribute super."scons2dot"; + "scope" = dontDistribute super."scope"; + "scope-cairo" = dontDistribute super."scope-cairo"; + "scottish" = dontDistribute super."scottish"; + "scotty-binding-play" = dontDistribute super."scotty-binding-play"; + "scotty-blaze" = dontDistribute super."scotty-blaze"; + "scotty-cookie" = dontDistribute super."scotty-cookie"; + "scotty-fay" = dontDistribute super."scotty-fay"; + "scotty-hastache" = dontDistribute super."scotty-hastache"; + "scotty-rest" = dontDistribute super."scotty-rest"; + "scotty-session" = dontDistribute super."scotty-session"; + "scotty-tls" = dontDistribute super."scotty-tls"; + "scp-streams" = dontDistribute super."scp-streams"; + "scrabble-bot" = dontDistribute super."scrabble-bot"; + "scrobble" = dontDistribute super."scrobble"; + "scroll" = dontDistribute super."scroll"; + "scrypt" = dontDistribute super."scrypt"; + "scrz" = dontDistribute super."scrz"; + "scyther-proof" = dontDistribute super."scyther-proof"; + "sde-solver" = dontDistribute super."sde-solver"; + "sdf2p1-parser" = dontDistribute super."sdf2p1-parser"; + "sdl2" = doDistribute super."sdl2_1_3_1"; + "sdl2-cairo" = dontDistribute super."sdl2-cairo"; + "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image"; + "sdl2-compositor" = dontDistribute super."sdl2-compositor"; + "sdl2-image" = dontDistribute super."sdl2-image"; + "sdl2-ttf" = dontDistribute super."sdl2-ttf"; + "sdnv" = dontDistribute super."sdnv"; + "sdr" = dontDistribute super."sdr"; + "seacat" = dontDistribute super."seacat"; + "seal-module" = dontDistribute super."seal-module"; + "search" = dontDistribute super."search"; + "sec" = dontDistribute super."sec"; + "secdh" = dontDistribute super."secdh"; + "seclib" = dontDistribute super."seclib"; + "second-transfer" = doDistribute super."second-transfer_0_6_1_0"; + "secp256k1" = dontDistribute super."secp256k1"; + "secret-santa" = dontDistribute super."secret-santa"; + "secret-sharing" = dontDistribute super."secret-sharing"; + "secrm" = dontDistribute super."secrm"; + "secure-sockets" = dontDistribute super."secure-sockets"; + "sednaDBXML" = dontDistribute super."sednaDBXML"; + "select" = dontDistribute super."select"; + "selectors" = dontDistribute super."selectors"; + "selenium" = dontDistribute super."selenium"; + "selenium-server" = dontDistribute super."selenium-server"; + "selfrestart" = dontDistribute super."selfrestart"; + "selinux" = dontDistribute super."selinux"; + "semaphore-plus" = dontDistribute super."semaphore-plus"; + "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; + "semigroups" = doDistribute super."semigroups_0_16_2_2"; + "semigroups-actions" = dontDistribute super."semigroups-actions"; + "semiring" = dontDistribute super."semiring"; + "semiring-simple" = dontDistribute super."semiring-simple"; + "semver-range" = dontDistribute super."semver-range"; + "sendgrid-haskell" = dontDistribute super."sendgrid-haskell"; + "sensenet" = dontDistribute super."sensenet"; + "sentry" = dontDistribute super."sentry"; + "senza" = dontDistribute super."senza"; + "separated" = dontDistribute super."separated"; + "seqaid" = dontDistribute super."seqaid"; + "seqid" = dontDistribute super."seqid"; + "seqid-streams" = dontDistribute super."seqid-streams"; + "seqloc-datafiles" = dontDistribute super."seqloc-datafiles"; + "sequence" = dontDistribute super."sequence"; + "sequent-core" = dontDistribute super."sequent-core"; + "sequential-index" = dontDistribute super."sequential-index"; + "sequor" = dontDistribute super."sequor"; + "serial" = dontDistribute super."serial"; + "serial-test-generators" = dontDistribute super."serial-test-generators"; + "serialport" = dontDistribute super."serialport"; + "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; + "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-cassava" = dontDistribute super."servant-cassava"; + "servant-ede" = dontDistribute super."servant-ede"; + "servant-examples" = dontDistribute super."servant-examples"; + "servant-lucid" = dontDistribute super."servant-lucid"; + "servant-mock" = dontDistribute super."servant-mock"; + "servant-pool" = dontDistribute super."servant-pool"; + "servant-postgresql" = dontDistribute super."servant-postgresql"; + "servant-response" = dontDistribute super."servant-response"; + "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-swagger" = dontDistribute super."servant-swagger"; + "servant-yaml" = dontDistribute super."servant-yaml"; + "servius" = dontDistribute super."servius"; + "ses-html" = dontDistribute super."ses-html"; + "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; + "sessions" = dontDistribute super."sessions"; + "set-cover" = dontDistribute super."set-cover"; + "set-with" = dontDistribute super."set-with"; + "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; + "setops" = dontDistribute super."setops"; + "sets" = dontDistribute super."sets"; + "setters" = dontDistribute super."setters"; + "settings" = dontDistribute super."settings"; + "sexp" = dontDistribute super."sexp"; + "sexp-show" = dontDistribute super."sexp-show"; + "sexpr" = dontDistribute super."sexpr"; + "sext" = dontDistribute super."sext"; + "sfml-audio" = dontDistribute super."sfml-audio"; + "sfmt" = dontDistribute super."sfmt"; + "sgd" = dontDistribute super."sgd"; + "sgf" = dontDistribute super."sgf"; + "sgrep" = dontDistribute super."sgrep"; + "sha-streams" = dontDistribute super."sha-streams"; + "shadower" = dontDistribute super."shadower"; + "shadowsocks" = dontDistribute super."shadowsocks"; + "shady-gen" = dontDistribute super."shady-gen"; + "shady-graphics" = dontDistribute super."shady-graphics"; + "shake-cabal-build" = dontDistribute super."shake-cabal-build"; + "shake-extras" = dontDistribute super."shake-extras"; + "shake-minify" = dontDistribute super."shake-minify"; + "shake-pack" = dontDistribute super."shake-pack"; + "shaker" = dontDistribute super."shaker"; + "shakespeare-css" = dontDistribute super."shakespeare-css"; + "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; + "shakespeare-js" = dontDistribute super."shakespeare-js"; + "shakespeare-text" = dontDistribute super."shakespeare-text"; + "shana" = dontDistribute super."shana"; + "shapefile" = dontDistribute super."shapefile"; + "shapely-data" = dontDistribute super."shapely-data"; + "sharc-timbre" = dontDistribute super."sharc-timbre"; + "shared-buffer" = dontDistribute super."shared-buffer"; + "shared-fields" = dontDistribute super."shared-fields"; + "shared-memory" = dontDistribute super."shared-memory"; + "sharedio" = dontDistribute super."sharedio"; + "she" = dontDistribute super."she"; + "shelduck" = dontDistribute super."shelduck"; + "shell-escape" = dontDistribute super."shell-escape"; + "shell-monad" = dontDistribute super."shell-monad"; + "shell-pipe" = dontDistribute super."shell-pipe"; + "shellish" = dontDistribute super."shellish"; + "shellmate" = dontDistribute super."shellmate"; + "shelly-extra" = dontDistribute super."shelly-extra"; + "shivers-cfg" = dontDistribute super."shivers-cfg"; + "shoap" = dontDistribute super."shoap"; + "shortcircuit" = dontDistribute super."shortcircuit"; + "shorten-strings" = dontDistribute super."shorten-strings"; + "should-not-typecheck" = dontDistribute super."should-not-typecheck"; + "show-type" = dontDistribute super."show-type"; + "showdown" = dontDistribute super."showdown"; + "shpider" = dontDistribute super."shpider"; + "shplit" = dontDistribute super."shplit"; + "shqq" = dontDistribute super."shqq"; + "shuffle" = dontDistribute super."shuffle"; + "sieve" = dontDistribute super."sieve"; + "sifflet" = dontDistribute super."sifflet"; + "sifflet-lib" = dontDistribute super."sifflet-lib"; + "sign" = dontDistribute super."sign"; + "signal" = dontDistribute super."signal"; + "signals" = dontDistribute super."signals"; + "signed-multiset" = dontDistribute super."signed-multiset"; + "simd" = dontDistribute super."simd"; + "simgi" = dontDistribute super."simgi"; + "simple" = dontDistribute super."simple"; + "simple-actors" = dontDistribute super."simple-actors"; + "simple-atom" = dontDistribute super."simple-atom"; + "simple-bluetooth" = dontDistribute super."simple-bluetooth"; + "simple-c-value" = dontDistribute super."simple-c-value"; + "simple-conduit" = dontDistribute super."simple-conduit"; + "simple-config" = dontDistribute super."simple-config"; + "simple-css" = dontDistribute super."simple-css"; + "simple-eval" = dontDistribute super."simple-eval"; + "simple-firewire" = dontDistribute super."simple-firewire"; + "simple-form" = dontDistribute super."simple-form"; + "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm"; + "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr"; + "simple-get-opt" = dontDistribute super."simple-get-opt"; + "simple-index" = dontDistribute super."simple-index"; + "simple-log" = dontDistribute super."simple-log"; + "simple-log-syslog" = dontDistribute super."simple-log-syslog"; + "simple-neural-networks" = dontDistribute super."simple-neural-networks"; + "simple-nix" = dontDistribute super."simple-nix"; + "simple-observer" = dontDistribute super."simple-observer"; + "simple-pascal" = dontDistribute super."simple-pascal"; + "simple-pipe" = dontDistribute super."simple-pipe"; + "simple-postgresql-orm" = dontDistribute super."simple-postgresql-orm"; + "simple-rope" = dontDistribute super."simple-rope"; + "simple-server" = dontDistribute super."simple-server"; + "simple-session" = dontDistribute super."simple-session"; + "simple-sessions" = dontDistribute super."simple-sessions"; + "simple-smt" = dontDistribute super."simple-smt"; + "simple-sql-parser" = dontDistribute super."simple-sql-parser"; + "simple-stacked-vm" = dontDistribute super."simple-stacked-vm"; + "simple-tabular" = dontDistribute super."simple-tabular"; + "simple-templates" = dontDistribute super."simple-templates"; + "simple-vec3" = dontDistribute super."simple-vec3"; + "simpleargs" = dontDistribute super."simpleargs"; + "simpleirc" = dontDistribute super."simpleirc"; + "simpleirc-lens" = dontDistribute super."simpleirc-lens"; + "simplenote" = dontDistribute super."simplenote"; + "simpleprelude" = dontDistribute super."simpleprelude"; + "simplesmtpclient" = dontDistribute super."simplesmtpclient"; + "simplessh" = dontDistribute super."simplessh"; + "simplest-sqlite" = dontDistribute super."simplest-sqlite"; + "simplex" = dontDistribute super."simplex"; + "simplex-basic" = dontDistribute super."simplex-basic"; + "simseq" = dontDistribute super."simseq"; + "simtreelo" = dontDistribute super."simtreelo"; + "sindre" = dontDistribute super."sindre"; + "singleton-nats" = dontDistribute super."singleton-nats"; + "singletons" = doDistribute super."singletons_1_1_2_1"; + "sink" = dontDistribute super."sink"; + "sirkel" = dontDistribute super."sirkel"; + "sitemap" = dontDistribute super."sitemap"; + "sized" = dontDistribute super."sized"; + "sized-types" = dontDistribute super."sized-types"; + "sized-vector" = dontDistribute super."sized-vector"; + "sizes" = dontDistribute super."sizes"; + "sjsp" = dontDistribute super."sjsp"; + "skeleton" = dontDistribute super."skeleton"; + "skeletons" = dontDistribute super."skeletons"; + "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; + "skype4hs" = dontDistribute super."skype4hs"; + "skypelogexport" = dontDistribute super."skypelogexport"; + "slack" = dontDistribute super."slack"; + "slack-api" = dontDistribute super."slack-api"; + "slack-notify-haskell" = dontDistribute super."slack-notify-haskell"; + "slice-cpp-gen" = dontDistribute super."slice-cpp-gen"; + "slidemews" = dontDistribute super."slidemews"; + "sloane" = dontDistribute super."sloane"; + "slot-lambda" = dontDistribute super."slot-lambda"; + "sloth" = dontDistribute super."sloth"; + "smallarray" = dontDistribute super."smallarray"; + "smallcaps" = dontDistribute super."smallcaps"; + "smallcheck-laws" = dontDistribute super."smallcheck-laws"; + "smallcheck-lens" = dontDistribute super."smallcheck-lens"; + "smallcheck-series" = dontDistribute super."smallcheck-series"; + "smallpt-hs" = dontDistribute super."smallpt-hs"; + "smallstring" = dontDistribute super."smallstring"; + "smaoin" = dontDistribute super."smaoin"; + "smartGroup" = dontDistribute super."smartGroup"; + "smartcheck" = dontDistribute super."smartcheck"; + "smartconstructor" = dontDistribute super."smartconstructor"; + "smartword" = dontDistribute super."smartword"; + "sme" = dontDistribute super."sme"; + "smsaero" = dontDistribute super."smsaero"; + "smt-lib" = dontDistribute super."smt-lib"; + "smtlib2" = dontDistribute super."smtlib2"; + "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; + "smtp2mta" = dontDistribute super."smtp2mta"; + "smtps-gmail" = dontDistribute super."smtps-gmail"; + "snake-game" = dontDistribute super."snake-game"; + "snap-accept" = dontDistribute super."snap-accept"; + "snap-app" = dontDistribute super."snap-app"; + "snap-auth-cli" = dontDistribute super."snap-auth-cli"; + "snap-blaze" = dontDistribute super."snap-blaze"; + "snap-blaze-clay" = dontDistribute super."snap-blaze-clay"; + "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities"; + "snap-cors" = dontDistribute super."snap-cors"; + "snap-elm" = dontDistribute super."snap-elm"; + "snap-error-collector" = dontDistribute super."snap-error-collector"; + "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; + "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; + "snap-loader-static" = dontDistribute super."snap-loader-static"; + "snap-predicates" = dontDistribute super."snap-predicates"; + "snap-testing" = dontDistribute super."snap-testing"; + "snap-utils" = dontDistribute super."snap-utils"; + "snap-web-routes" = dontDistribute super."snap-web-routes"; + "snaplet-acid-state" = dontDistribute super."snaplet-acid-state"; + "snaplet-actionlog" = dontDistribute super."snaplet-actionlog"; + "snaplet-amqp" = dontDistribute super."snaplet-amqp"; + "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid"; + "snaplet-coffee" = dontDistribute super."snaplet-coffee"; + "snaplet-css-min" = dontDistribute super."snaplet-css-min"; + "snaplet-environments" = dontDistribute super."snaplet-environments"; + "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs"; + "snaplet-hasql" = dontDistribute super."snaplet-hasql"; + "snaplet-haxl" = dontDistribute super."snaplet-haxl"; + "snaplet-hdbc" = dontDistribute super."snaplet-hdbc"; + "snaplet-hslogger" = dontDistribute super."snaplet-hslogger"; + "snaplet-i18n" = dontDistribute super."snaplet-i18n"; + "snaplet-influxdb" = dontDistribute super."snaplet-influxdb"; + "snaplet-lss" = dontDistribute super."snaplet-lss"; + "snaplet-mandrill" = dontDistribute super."snaplet-mandrill"; + "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB"; + "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic"; + "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple"; + "snaplet-oauth" = dontDistribute super."snaplet-oauth"; + "snaplet-persistent" = dontDistribute super."snaplet-persistent"; + "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple"; + "snaplet-postmark" = dontDistribute super."snaplet-postmark"; + "snaplet-purescript" = dontDistribute super."snaplet-purescript"; + "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha"; + "snaplet-redis" = dontDistribute super."snaplet-redis"; + "snaplet-redson" = dontDistribute super."snaplet-redson"; + "snaplet-rest" = dontDistribute super."snaplet-rest"; + "snaplet-riak" = dontDistribute super."snaplet-riak"; + "snaplet-sass" = dontDistribute super."snaplet-sass"; + "snaplet-sedna" = dontDistribute super."snaplet-sedna"; + "snaplet-ses-html" = dontDistribute super."snaplet-ses-html"; + "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple"; + "snaplet-stripe" = dontDistribute super."snaplet-stripe"; + "snaplet-tasks" = dontDistribute super."snaplet-tasks"; + "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions"; + "snaplet-wordpress" = dontDistribute super."snaplet-wordpress"; + "snappy" = dontDistribute super."snappy"; + "snappy-conduit" = dontDistribute super."snappy-conduit"; + "snappy-framing" = dontDistribute super."snappy-framing"; + "snappy-iteratee" = dontDistribute super."snappy-iteratee"; + "sndfile-enumerators" = dontDistribute super."sndfile-enumerators"; + "sneakyterm" = dontDistribute super."sneakyterm"; + "sneathlane-haste" = dontDistribute super."sneathlane-haste"; + "snippet-extractor" = dontDistribute super."snippet-extractor"; + "snm" = dontDistribute super."snm"; + "snow-white" = dontDistribute super."snow-white"; + "snowball" = dontDistribute super."snowball"; + "snowglobe" = dontDistribute super."snowglobe"; + "soap" = dontDistribute super."soap"; + "soap-openssl" = dontDistribute super."soap-openssl"; + "soap-tls" = dontDistribute super."soap-tls"; + "sock2stream" = dontDistribute super."sock2stream"; + "sockaddr" = dontDistribute super."sockaddr"; + "socket" = dontDistribute super."socket"; + "socket-activation" = dontDistribute super."socket-activation"; + "socket-sctp" = dontDistribute super."socket-sctp"; + "socketio" = dontDistribute super."socketio"; + "soegtk" = dontDistribute super."soegtk"; + "sonic-visualiser" = dontDistribute super."sonic-visualiser"; + "sophia" = dontDistribute super."sophia"; + "sort-by-pinyin" = dontDistribute super."sort-by-pinyin"; + "sorted" = dontDistribute super."sorted"; + "sorted-list" = dontDistribute super."sorted-list"; + "sorting" = dontDistribute super."sorting"; + "sorty" = dontDistribute super."sorty"; + "sound-collage" = dontDistribute super."sound-collage"; + "sounddelay" = dontDistribute super."sounddelay"; + "source-code-server" = dontDistribute super."source-code-server"; + "sousit" = dontDistribute super."sousit"; + "sox" = dontDistribute super."sox"; + "soxlib" = dontDistribute super."soxlib"; + "soyuz" = dontDistribute super."soyuz"; + "spacefill" = dontDistribute super."spacefill"; + "spacepart" = dontDistribute super."spacepart"; + "spaceprobe" = dontDistribute super."spaceprobe"; + "spanout" = dontDistribute super."spanout"; + "sparse" = dontDistribute super."sparse"; + "sparse-lin-alg" = dontDistribute super."sparse-lin-alg"; + "sparsebit" = dontDistribute super."sparsebit"; + "sparsecheck" = dontDistribute super."sparsecheck"; + "sparser" = dontDistribute super."sparser"; + "spata" = dontDistribute super."spata"; + "spatial-math" = dontDistribute super."spatial-math"; + "spawn" = dontDistribute super."spawn"; + "spe" = dontDistribute super."spe"; + "special-functors" = dontDistribute super."special-functors"; + "special-keys" = dontDistribute super."special-keys"; + "specialize-th" = dontDistribute super."specialize-th"; + "species" = dontDistribute super."species"; + "speculation-transformers" = dontDistribute super."speculation-transformers"; + "speedy-slice" = dontDistribute super."speedy-slice"; + "spelling-suggest" = dontDistribute super."spelling-suggest"; + "sphero" = dontDistribute super."sphero"; + "sphinx-cli" = dontDistribute super."sphinx-cli"; + "spice" = dontDistribute super."spice"; + "spike" = dontDistribute super."spike"; + "spine" = dontDistribute super."spine"; + "spir-v" = dontDistribute super."spir-v"; + "splay" = dontDistribute super."splay"; + "splaytree" = dontDistribute super."splaytree"; + "spline3" = dontDistribute super."spline3"; + "splines" = dontDistribute super."splines"; + "split-channel" = dontDistribute super."split-channel"; + "split-record" = dontDistribute super."split-record"; + "split-tchan" = dontDistribute super."split-tchan"; + "splitter" = dontDistribute super."splitter"; + "splot" = dontDistribute super."splot"; + "spool" = dontDistribute super."spool"; + "spoonutil" = dontDistribute super."spoonutil"; + "spoty" = dontDistribute super."spoty"; + "spreadsheet" = dontDistribute super."spreadsheet"; + "spritz" = dontDistribute super."spritz"; + "spsa" = dontDistribute super."spsa"; + "spy" = dontDistribute super."spy"; + "sql-simple" = dontDistribute super."sql-simple"; + "sql-simple-mysql" = dontDistribute super."sql-simple-mysql"; + "sql-simple-pool" = dontDistribute super."sql-simple-pool"; + "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql"; + "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite"; + "sql-words" = dontDistribute super."sql-words"; + "sqlite" = dontDistribute super."sqlite"; + "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed"; + "sqlvalue-list" = dontDistribute super."sqlvalue-list"; + "squeeze" = dontDistribute super."squeeze"; + "sr-extra" = dontDistribute super."sr-extra"; + "srcinst" = dontDistribute super."srcinst"; + "srec" = dontDistribute super."srec"; + "sscgi" = dontDistribute super."sscgi"; + "ssh" = dontDistribute super."ssh"; + "sshd-lint" = dontDistribute super."sshd-lint"; + "sshtun" = dontDistribute super."sshtun"; + "sssp" = dontDistribute super."sssp"; + "sstable" = dontDistribute super."sstable"; + "ssv" = dontDistribute super."ssv"; + "stable-heap" = dontDistribute super."stable-heap"; + "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; + "stable-memo" = dontDistribute super."stable-memo"; + "stable-tree" = dontDistribute super."stable-tree"; + "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; + "stack-prism" = dontDistribute super."stack-prism"; + "stack-run-auto" = dontDistribute super."stack-run-auto"; + "stackage-curator" = dontDistribute super."stackage-curator"; + "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; + "standalone-haddock" = dontDistribute super."standalone-haddock"; + "star-to-star" = dontDistribute super."star-to-star"; + "star-to-star-contra" = dontDistribute super."star-to-star-contra"; + "starling" = dontDistribute super."starling"; + "starrover2" = dontDistribute super."starrover2"; + "stash" = dontDistribute super."stash"; + "state" = dontDistribute super."state"; + "state-plus" = dontDistribute super."state-plus"; + "state-record" = dontDistribute super."state-record"; + "stateWriter" = dontDistribute super."stateWriter"; + "statechart" = dontDistribute super."statechart"; + "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statethread" = dontDistribute super."statethread"; + "statgrab" = dontDistribute super."statgrab"; + "static-hash" = dontDistribute super."static-hash"; + "static-resources" = dontDistribute super."static-resources"; + "staticanalysis" = dontDistribute super."staticanalysis"; + "statistics-dirichlet" = dontDistribute super."statistics-dirichlet"; + "statistics-fusion" = dontDistribute super."statistics-fusion"; + "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; + "stats" = dontDistribute super."stats"; + "statsd" = dontDistribute super."statsd"; + "statsd-datadog" = dontDistribute super."statsd-datadog"; + "statvfs" = dontDistribute super."statvfs"; + "stb-image" = dontDistribute super."stb-image"; + "stb-truetype" = dontDistribute super."stb-truetype"; + "stdata" = dontDistribute super."stdata"; + "stdf" = dontDistribute super."stdf"; + "steambrowser" = dontDistribute super."steambrowser"; + "steeloverseer" = dontDistribute super."steeloverseer"; + "stemmer" = dontDistribute super."stemmer"; + "step-function" = dontDistribute super."step-function"; + "stepwise" = dontDistribute super."stepwise"; + "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey"; + "stitch" = dontDistribute super."stitch"; + "stm-channelize" = dontDistribute super."stm-channelize"; + "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-firehose" = dontDistribute super."stm-firehose"; + "stm-io-hooks" = dontDistribute super."stm-io-hooks"; + "stm-lifted" = dontDistribute super."stm-lifted"; + "stm-linkedlist" = dontDistribute super."stm-linkedlist"; + "stm-orelse-io" = dontDistribute super."stm-orelse-io"; + "stm-promise" = dontDistribute super."stm-promise"; + "stm-queue-extras" = dontDistribute super."stm-queue-extras"; + "stm-sbchan" = dontDistribute super."stm-sbchan"; + "stm-split" = dontDistribute super."stm-split"; + "stm-tlist" = dontDistribute super."stm-tlist"; + "stmcontrol" = dontDistribute super."stmcontrol"; + "stomp-conduit" = dontDistribute super."stomp-conduit"; + "stomp-patterns" = dontDistribute super."stomp-patterns"; + "stomp-queue" = dontDistribute super."stomp-queue"; + "stompl" = dontDistribute super."stompl"; + "stopwatch" = dontDistribute super."stopwatch"; + "storable" = dontDistribute super."storable"; + "storable-record" = dontDistribute super."storable-record"; + "storable-static-array" = dontDistribute super."storable-static-array"; + "storable-tuple" = dontDistribute super."storable-tuple"; + "storablevector" = dontDistribute super."storablevector"; + "storablevector-carray" = dontDistribute super."storablevector-carray"; + "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion"; + "str" = dontDistribute super."str"; + "stratum-tool" = dontDistribute super."stratum-tool"; + "stream-fusion" = dontDistribute super."stream-fusion"; + "stream-monad" = dontDistribute super."stream-monad"; + "streamed" = dontDistribute super."streamed"; + "streaming" = dontDistribute super."streaming"; + "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; + "streamproc" = dontDistribute super."streamproc"; + "strict-base-types" = dontDistribute super."strict-base-types"; + "strict-concurrency" = dontDistribute super."strict-concurrency"; + "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; + "strict-identity" = dontDistribute super."strict-identity"; + "strict-io" = dontDistribute super."strict-io"; + "strictify" = dontDistribute super."strictify"; + "strictly" = dontDistribute super."strictly"; + "string" = dontDistribute super."string"; + "string-conv" = dontDistribute super."string-conv"; + "string-convert" = dontDistribute super."string-convert"; + "string-qq" = dontDistribute super."string-qq"; + "string-quote" = dontDistribute super."string-quote"; + "string-similarity" = dontDistribute super."string-similarity"; + "stringlike" = dontDistribute super."stringlike"; + "stringprep" = dontDistribute super."stringprep"; + "strings" = dontDistribute super."strings"; + "stringtable-atom" = dontDistribute super."stringtable-atom"; + "strio" = dontDistribute super."strio"; + "stripe" = dontDistribute super."stripe"; + "stripe-core" = dontDistribute super."stripe-core"; + "stripe-haskell" = dontDistribute super."stripe-haskell"; + "stripe-http-streams" = dontDistribute super."stripe-http-streams"; + "strive" = dontDistribute super."strive"; + "strptime" = dontDistribute super."strptime"; + "structs" = dontDistribute super."structs"; + "structural-induction" = dontDistribute super."structural-induction"; + "structured-haskell-mode" = dontDistribute super."structured-haskell-mode"; + "structured-mongoDB" = dontDistribute super."structured-mongoDB"; + "structures" = dontDistribute super."structures"; + "stunclient" = dontDistribute super."stunclient"; + "stunts" = dontDistribute super."stunts"; + "stylized" = dontDistribute super."stylized"; + "sub-state" = dontDistribute super."sub-state"; + "subhask" = dontDistribute super."subhask"; + "subleq-toolchain" = dontDistribute super."subleq-toolchain"; + "subnet" = dontDistribute super."subnet"; + "subtitleParser" = dontDistribute super."subtitleParser"; + "subtitles" = dontDistribute super."subtitles"; + "success" = dontDistribute super."success"; + "suffixarray" = dontDistribute super."suffixarray"; + "suffixtree" = dontDistribute super."suffixtree"; + "sugarhaskell" = dontDistribute super."sugarhaskell"; + "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; + "sundown" = dontDistribute super."sundown"; + "sunlight" = dontDistribute super."sunlight"; + "sunroof-compiler" = dontDistribute super."sunroof-compiler"; + "sunroof-examples" = dontDistribute super."sunroof-examples"; + "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; + "supercollider-ht" = dontDistribute super."supercollider-ht"; + "supercollider-midi" = dontDistribute super."supercollider-midi"; + "superdoc" = dontDistribute super."superdoc"; + "supero" = dontDistribute super."supero"; + "supervisor" = dontDistribute super."supervisor"; + "suspend" = dontDistribute super."suspend"; + "svg2q" = dontDistribute super."svg2q"; + "svgcairo" = dontDistribute super."svgcairo"; + "svgutils" = dontDistribute super."svgutils"; + "svm" = dontDistribute super."svm"; + "svm-light-utils" = dontDistribute super."svm-light-utils"; + "svm-simple" = dontDistribute super."svm-simple"; + "svndump" = dontDistribute super."svndump"; + "swagger2" = dontDistribute super."swagger2"; + "swapper" = dontDistribute super."swapper"; + "swearjure" = dontDistribute super."swearjure"; + "swf" = dontDistribute super."swf"; + "swift-lda" = dontDistribute super."swift-lda"; + "swish" = dontDistribute super."swish"; + "sws" = dontDistribute super."sws"; + "syb-extras" = dontDistribute super."syb-extras"; + "syb-with-class" = dontDistribute super."syb-with-class"; + "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text"; + "sylvia" = dontDistribute super."sylvia"; + "sym" = dontDistribute super."sym"; + "sym-plot" = dontDistribute super."sym-plot"; + "sync" = dontDistribute super."sync"; + "sync-mht" = dontDistribute super."sync-mht"; + "synchronous-channels" = dontDistribute super."synchronous-channels"; + "syncthing-hs" = dontDistribute super."syncthing-hs"; + "synt" = dontDistribute super."synt"; + "syntactic" = dontDistribute super."syntactic"; + "syntactical" = dontDistribute super."syntactical"; + "syntax" = dontDistribute super."syntax"; + "syntax-attoparsec" = dontDistribute super."syntax-attoparsec"; + "syntax-example" = dontDistribute super."syntax-example"; + "syntax-example-json" = dontDistribute super."syntax-example-json"; + "syntax-pretty" = dontDistribute super."syntax-pretty"; + "syntax-printer" = dontDistribute super."syntax-printer"; + "syntax-trees" = dontDistribute super."syntax-trees"; + "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn"; + "synthesizer" = dontDistribute super."synthesizer"; + "synthesizer-alsa" = dontDistribute super."synthesizer-alsa"; + "synthesizer-core" = dontDistribute super."synthesizer-core"; + "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional"; + "synthesizer-filter" = dontDistribute super."synthesizer-filter"; + "synthesizer-inference" = dontDistribute super."synthesizer-inference"; + "synthesizer-llvm" = dontDistribute super."synthesizer-llvm"; + "synthesizer-midi" = dontDistribute super."synthesizer-midi"; + "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient"; + "sys-process" = dontDistribute super."sys-process"; + "system-canonicalpath" = dontDistribute super."system-canonicalpath"; + "system-command" = dontDistribute super."system-command"; + "system-gpio" = dontDistribute super."system-gpio"; + "system-inotify" = dontDistribute super."system-inotify"; + "system-lifted" = dontDistribute super."system-lifted"; + "system-random-effect" = dontDistribute super."system-random-effect"; + "system-time-monotonic" = dontDistribute super."system-time-monotonic"; + "system-util" = dontDistribute super."system-util"; + "system-uuid" = dontDistribute super."system-uuid"; + "systemd" = dontDistribute super."systemd"; + "syz" = dontDistribute super."syz"; + "t-regex" = dontDistribute super."t-regex"; + "ta" = dontDistribute super."ta"; + "table" = dontDistribute super."table"; + "table-tennis" = dontDistribute super."table-tennis"; + "tableaux" = dontDistribute super."tableaux"; + "tables" = dontDistribute super."tables"; + "tablestorage" = dontDistribute super."tablestorage"; + "tabloid" = dontDistribute super."tabloid"; + "taffybar" = dontDistribute super."taffybar"; + "tag-bits" = dontDistribute super."tag-bits"; + "tag-stream" = dontDistribute super."tag-stream"; + "tagchup" = dontDistribute super."tagchup"; + "tagged-exception-core" = dontDistribute super."tagged-exception-core"; + "tagged-list" = dontDistribute super."tagged-list"; + "tagged-th" = dontDistribute super."tagged-th"; + "tagged-transformer" = dontDistribute super."tagged-transformer"; + "tagging" = dontDistribute super."tagging"; + "taggy" = dontDistribute super."taggy"; + "taggy-lens" = dontDistribute super."taggy-lens"; + "taglib" = dontDistribute super."taglib"; + "taglib-api" = dontDistribute super."taglib-api"; + "tagset-positional" = dontDistribute super."tagset-positional"; + "tagsoup-ht" = dontDistribute super."tagsoup-ht"; + "tagsoup-parsec" = dontDistribute super."tagsoup-parsec"; + "takahashi" = dontDistribute super."takahashi"; + "takusen-oracle" = dontDistribute super."takusen-oracle"; + "tamarin-prover" = dontDistribute super."tamarin-prover"; + "tamarin-prover-term" = dontDistribute super."tamarin-prover-term"; + "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory"; + "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils"; + "tamper" = dontDistribute super."tamper"; + "target" = dontDistribute super."target"; + "task" = dontDistribute super."task"; + "taskpool" = dontDistribute super."taskpool"; + "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; + "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; + "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; + "tasty-html" = dontDistribute super."tasty-html"; + "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; + "tasty-integrate" = dontDistribute super."tasty-integrate"; + "tasty-laws" = dontDistribute super."tasty-laws"; + "tasty-lens" = dontDistribute super."tasty-lens"; + "tasty-program" = dontDistribute super."tasty-program"; + "tasty-tap" = dontDistribute super."tasty-tap"; + "tateti-tateti" = dontDistribute super."tateti-tateti"; + "tau" = dontDistribute super."tau"; + "tbox" = dontDistribute super."tbox"; + "tcache-AWS" = dontDistribute super."tcache-AWS"; + "tccli" = dontDistribute super."tccli"; + "tce-conf" = dontDistribute super."tce-conf"; + "tconfig" = dontDistribute super."tconfig"; + "tcp" = dontDistribute super."tcp"; + "tdd-util" = dontDistribute super."tdd-util"; + "tdoc" = dontDistribute super."tdoc"; + "teams" = dontDistribute super."teams"; + "teeth" = dontDistribute super."teeth"; + "telegram" = dontDistribute super."telegram"; + "tellbot" = dontDistribute super."tellbot"; + "template-default" = dontDistribute super."template-default"; + "template-haskell-util" = dontDistribute super."template-haskell-util"; + "template-hsml" = dontDistribute super."template-hsml"; + "template-yj" = dontDistribute super."template-yj"; + "templatepg" = dontDistribute super."templatepg"; + "templater" = dontDistribute super."templater"; + "tempodb" = dontDistribute super."tempodb"; + "temporal-csound" = dontDistribute super."temporal-csound"; + "temporal-media" = dontDistribute super."temporal-media"; + "temporal-music-notation" = dontDistribute super."temporal-music-notation"; + "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo"; + "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western"; + "temporary-resourcet" = dontDistribute super."temporary-resourcet"; + "tempus" = dontDistribute super."tempus"; + "tempus-fugit" = dontDistribute super."tempus-fugit"; + "tensor" = dontDistribute super."tensor"; + "term-rewriting" = dontDistribute super."term-rewriting"; + "termbox-bindings" = dontDistribute super."termbox-bindings"; + "termination-combinators" = dontDistribute super."termination-combinators"; + "terminfo" = doDistribute super."terminfo_0_4_0_1"; + "terminfo-hs" = dontDistribute super."terminfo-hs"; + "termplot" = dontDistribute super."termplot"; + "terrahs" = dontDistribute super."terrahs"; + "tersmu" = dontDistribute super."tersmu"; + "test-framework-doctest" = dontDistribute super."test-framework-doctest"; + "test-framework-golden" = dontDistribute super."test-framework-golden"; + "test-framework-program" = dontDistribute super."test-framework-program"; + "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck"; + "test-framework-sandbox" = dontDistribute super."test-framework-sandbox"; + "test-framework-skip" = dontDistribute super."test-framework-skip"; + "test-framework-smallcheck" = dontDistribute super."test-framework-smallcheck"; + "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat"; + "test-framework-th-prime" = dontDistribute super."test-framework-th-prime"; + "test-invariant" = dontDistribute super."test-invariant"; + "test-pkg" = dontDistribute super."test-pkg"; + "test-sandbox" = dontDistribute super."test-sandbox"; + "test-sandbox-compose" = dontDistribute super."test-sandbox-compose"; + "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit"; + "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck"; + "test-shouldbe" = dontDistribute super."test-shouldbe"; + "test-simple" = dontDistribute super."test-simple"; + "testPkg" = dontDistribute super."testPkg"; + "testing-type-modifiers" = dontDistribute super."testing-type-modifiers"; + "testloop" = dontDistribute super."testloop"; + "testpack" = dontDistribute super."testpack"; + "testpattern" = dontDistribute super."testpattern"; + "testrunner" = dontDistribute super."testrunner"; + "tetris" = dontDistribute super."tetris"; + "tex2txt" = dontDistribute super."tex2txt"; + "texrunner" = dontDistribute super."texrunner"; + "text-and-plots" = dontDistribute super."text-and-plots"; + "text-format-simple" = dontDistribute super."text-format-simple"; + "text-icu-translit" = dontDistribute super."text-icu-translit"; + "text-json-qq" = dontDistribute super."text-json-qq"; + "text-latin1" = dontDistribute super."text-latin1"; + "text-ldap" = dontDistribute super."text-ldap"; + "text-locale-encoding" = dontDistribute super."text-locale-encoding"; + "text-normal" = dontDistribute super."text-normal"; + "text-position" = dontDistribute super."text-position"; + "text-postgresql" = dontDistribute super."text-postgresql"; + "text-printer" = dontDistribute super."text-printer"; + "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-register-machine" = dontDistribute super."text-register-machine"; + "text-render" = dontDistribute super."text-render"; + "text-show" = doDistribute super."text-show_2"; + "text-show-instances" = dontDistribute super."text-show-instances"; + "text-stream-decode" = dontDistribute super."text-stream-decode"; + "text-utf7" = dontDistribute super."text-utf7"; + "text-xml-generic" = dontDistribute super."text-xml-generic"; + "text-xml-qq" = dontDistribute super."text-xml-qq"; + "text-zipper" = dontDistribute super."text-zipper"; + "text1" = dontDistribute super."text1"; + "textPlot" = dontDistribute super."textPlot"; + "textmatetags" = dontDistribute super."textmatetags"; + "textocat-api" = dontDistribute super."textocat-api"; + "texts" = dontDistribute super."texts"; + "tfp" = dontDistribute super."tfp"; + "tfp-th" = dontDistribute super."tfp-th"; + "tftp" = dontDistribute super."tftp"; + "tga" = dontDistribute super."tga"; + "th-alpha" = dontDistribute super."th-alpha"; + "th-build" = dontDistribute super."th-build"; + "th-cas" = dontDistribute super."th-cas"; + "th-context" = dontDistribute super."th-context"; + "th-fold" = dontDistribute super."th-fold"; + "th-inline-io-action" = dontDistribute super."th-inline-io-action"; + "th-instance-reification" = dontDistribute super."th-instance-reification"; + "th-instances" = dontDistribute super."th-instances"; + "th-kinds" = dontDistribute super."th-kinds"; + "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift-instances" = dontDistribute super."th-lift-instances"; + "th-orphans" = doDistribute super."th-orphans_0_12_2"; + "th-printf" = dontDistribute super."th-printf"; + "th-sccs" = dontDistribute super."th-sccs"; + "th-traced" = dontDistribute super."th-traced"; + "th-typegraph" = dontDistribute super."th-typegraph"; + "themoviedb" = dontDistribute super."themoviedb"; + "themplate" = dontDistribute super."themplate"; + "theoremquest" = dontDistribute super."theoremquest"; + "theoremquest-client" = dontDistribute super."theoremquest-client"; + "these" = dontDistribute super."these"; + "thespian" = dontDistribute super."thespian"; + "theta-functions" = dontDistribute super."theta-functions"; + "thih" = dontDistribute super."thih"; + "thimk" = dontDistribute super."thimk"; + "thorn" = dontDistribute super."thorn"; + "thread-local-storage" = dontDistribute super."thread-local-storage"; + "threadPool" = dontDistribute super."threadPool"; + "threadmanager" = dontDistribute super."threadmanager"; + "threads-pool" = dontDistribute super."threads-pool"; + "threads-supervisor" = dontDistribute super."threads-supervisor"; + "threadscope" = dontDistribute super."threadscope"; + "threefish" = dontDistribute super."threefish"; + "threepenny-gui" = dontDistribute super."threepenny-gui"; + "thrift" = dontDistribute super."thrift"; + "thrist" = dontDistribute super."thrist"; + "throttle" = dontDistribute super."throttle"; + "thumbnail" = dontDistribute super."thumbnail"; + "tianbar" = dontDistribute super."tianbar"; + "tic-tac-toe" = dontDistribute super."tic-tac-toe"; + "tickle" = dontDistribute super."tickle"; + "tictactoe3d" = dontDistribute super."tictactoe3d"; + "tidal" = dontDistribute super."tidal"; + "tidal-midi" = dontDistribute super."tidal-midi"; + "tidal-vis" = dontDistribute super."tidal-vis"; + "tie-knot" = dontDistribute super."tie-knot"; + "tiempo" = dontDistribute super."tiempo"; + "tiger" = dontDistribute super."tiger"; + "tight-apply" = dontDistribute super."tight-apply"; + "tightrope" = dontDistribute super."tightrope"; + "tighttp" = dontDistribute super."tighttp"; + "tilings" = dontDistribute super."tilings"; + "timberc" = dontDistribute super."timberc"; + "time-extras" = dontDistribute super."time-extras"; + "time-exts" = dontDistribute super."time-exts"; + "time-http" = dontDistribute super."time-http"; + "time-interval" = dontDistribute super."time-interval"; + "time-io-access" = dontDistribute super."time-io-access"; + "time-patterns" = dontDistribute super."time-patterns"; + "time-qq" = dontDistribute super."time-qq"; + "time-recurrence" = dontDistribute super."time-recurrence"; + "time-series" = dontDistribute super."time-series"; + "time-units" = dontDistribute super."time-units"; + "time-w3c" = dontDistribute super."time-w3c"; + "timecalc" = dontDistribute super."timecalc"; + "timeconsole" = dontDistribute super."timeconsole"; + "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; + "timeout" = dontDistribute super."timeout"; + "timeout-control" = dontDistribute super."timeout-control"; + "timeout-with-results" = dontDistribute super."timeout-with-results"; + "timeparsers" = dontDistribute super."timeparsers"; + "timeplot" = dontDistribute super."timeplot"; + "timers" = dontDistribute super."timers"; + "timers-updatable" = dontDistribute super."timers-updatable"; + "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; + "timestamper" = dontDistribute super."timestamper"; + "timezone-olson-th" = dontDistribute super."timezone-olson-th"; + "timing-convenience" = dontDistribute super."timing-convenience"; + "tinyMesh" = dontDistribute super."tinyMesh"; + "tinytemplate" = dontDistribute super."tinytemplate"; + "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; + "tip-lib" = dontDistribute super."tip-lib"; + "titlecase" = dontDistribute super."titlecase"; + "tkhs" = dontDistribute super."tkhs"; + "tkyprof" = dontDistribute super."tkyprof"; + "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_2"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; + "tls-extra" = dontDistribute super."tls-extra"; + "tmpl" = dontDistribute super."tmpl"; + "tn" = dontDistribute super."tn"; + "tnet" = dontDistribute super."tnet"; + "to-haskell" = dontDistribute super."to-haskell"; + "to-string-class" = dontDistribute super."to-string-class"; + "to-string-instances" = dontDistribute super."to-string-instances"; + "todos" = dontDistribute super."todos"; + "tofromxml" = dontDistribute super."tofromxml"; + "toilet" = dontDistribute super."toilet"; + "tokenify" = dontDistribute super."tokenify"; + "tokenize" = dontDistribute super."tokenize"; + "toktok" = dontDistribute super."toktok"; + "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell"; + "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell"; + "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal"; + "toml" = dontDistribute super."toml"; + "toolshed" = dontDistribute super."toolshed"; + "topkata" = dontDistribute super."topkata"; + "torch" = dontDistribute super."torch"; + "total" = dontDistribute super."total"; + "total-map" = dontDistribute super."total-map"; + "total-maps" = dontDistribute super."total-maps"; + "touched" = dontDistribute super."touched"; + "toysolver" = dontDistribute super."toysolver"; + "tpdb" = dontDistribute super."tpdb"; + "trace" = dontDistribute super."trace"; + "trace-call" = dontDistribute super."trace-call"; + "trace-function-call" = dontDistribute super."trace-function-call"; + "traced" = dontDistribute super."traced"; + "tracer" = dontDistribute super."tracer"; + "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; + "trajectory" = dontDistribute super."trajectory"; + "transactional-events" = dontDistribute super."transactional-events"; + "transf" = dontDistribute super."transf"; + "transformations" = dontDistribute super."transformations"; + "transformers-abort" = dontDistribute super."transformers-abort"; + "transformers-compose" = dontDistribute super."transformers-compose"; + "transformers-convert" = dontDistribute super."transformers-convert"; + "transformers-free" = dontDistribute super."transformers-free"; + "transformers-runnable" = dontDistribute super."transformers-runnable"; + "transformers-supply" = dontDistribute super."transformers-supply"; + "transient" = dontDistribute super."transient"; + "translatable-intset" = dontDistribute super."translatable-intset"; + "translate" = dontDistribute super."translate"; + "travis" = dontDistribute super."travis"; + "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; + "trawl" = dontDistribute super."trawl"; + "traypoweroff" = dontDistribute super."traypoweroff"; + "tree-monad" = dontDistribute super."tree-monad"; + "treemap-html" = dontDistribute super."treemap-html"; + "treemap-html-tools" = dontDistribute super."treemap-html-tools"; + "treersec" = dontDistribute super."treersec"; + "treeviz" = dontDistribute super."treeviz"; + "tremulous-query" = dontDistribute super."tremulous-query"; + "trhsx" = dontDistribute super."trhsx"; + "triangulation" = dontDistribute super."triangulation"; + "tries" = dontDistribute super."tries"; + "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; + "trivia" = dontDistribute super."trivia"; + "trivial-constraint" = dontDistribute super."trivial-constraint"; + "tropical" = dontDistribute super."tropical"; + "true-name" = dontDistribute super."true-name"; + "truelevel" = dontDistribute super."truelevel"; + "trurl" = dontDistribute super."trurl"; + "truthful" = dontDistribute super."truthful"; + "tsession" = dontDistribute super."tsession"; + "tsession-happstack" = dontDistribute super."tsession-happstack"; + "tskiplist" = dontDistribute super."tskiplist"; + "tslogger" = dontDistribute super."tslogger"; + "tsp-viz" = dontDistribute super."tsp-viz"; + "tsparse" = dontDistribute super."tsparse"; + "tst" = dontDistribute super."tst"; + "tsvsql" = dontDistribute super."tsvsql"; + "ttrie" = dontDistribute super."ttrie"; + "tttool" = doDistribute super."tttool_1_4_0_5"; + "tubes" = dontDistribute super."tubes"; + "tuntap" = dontDistribute super."tuntap"; + "tup-functor" = dontDistribute super."tup-functor"; + "tuple-gen" = dontDistribute super."tuple-gen"; + "tuple-generic" = dontDistribute super."tuple-generic"; + "tuple-hlist" = dontDistribute super."tuple-hlist"; + "tuple-lenses" = dontDistribute super."tuple-lenses"; + "tuple-morph" = dontDistribute super."tuple-morph"; + "tuple-th" = dontDistribute super."tuple-th"; + "tupleinstances" = dontDistribute super."tupleinstances"; + "turing" = dontDistribute super."turing"; + "turing-music" = dontDistribute super."turing-music"; + "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; + "turni" = dontDistribute super."turni"; + "tweak" = dontDistribute super."tweak"; + "twentefp" = dontDistribute super."twentefp"; + "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics"; + "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees"; + "twentefp-graphs" = dontDistribute super."twentefp-graphs"; + "twentefp-number" = dontDistribute super."twentefp-number"; + "twentefp-rosetree" = dontDistribute super."twentefp-rosetree"; + "twentefp-trees" = dontDistribute super."twentefp-trees"; + "twentefp-websockets" = dontDistribute super."twentefp-websockets"; + "twhs" = dontDistribute super."twhs"; + "twidge" = dontDistribute super."twidge"; + "twilight-stm" = dontDistribute super."twilight-stm"; + "twilio" = dontDistribute super."twilio"; + "twill" = dontDistribute super."twill"; + "twiml" = dontDistribute super."twiml"; + "twine" = dontDistribute super."twine"; + "twisty" = dontDistribute super."twisty"; + "twitch" = dontDistribute super."twitch"; + "twitter" = dontDistribute super."twitter"; + "twitter-conduit" = dontDistribute super."twitter-conduit"; + "twitter-enumerator" = dontDistribute super."twitter-enumerator"; + "twitter-types" = dontDistribute super."twitter-types"; + "twitter-types-lens" = dontDistribute super."twitter-types-lens"; + "tx" = dontDistribute super."tx"; + "txt-sushi" = dontDistribute super."txt-sushi"; + "txt2rtf" = dontDistribute super."txt2rtf"; + "txtblk" = dontDistribute super."txtblk"; + "ty" = dontDistribute super."ty"; + "typalyze" = dontDistribute super."typalyze"; + "type-aligned" = dontDistribute super."type-aligned"; + "type-booleans" = dontDistribute super."type-booleans"; + "type-cereal" = dontDistribute super."type-cereal"; + "type-combinators" = dontDistribute super."type-combinators"; + "type-digits" = dontDistribute super."type-digits"; + "type-equality" = dontDistribute super."type-equality"; + "type-equality-check" = dontDistribute super."type-equality-check"; + "type-fun" = dontDistribute super."type-fun"; + "type-functions" = dontDistribute super."type-functions"; + "type-hint" = dontDistribute super."type-hint"; + "type-int" = dontDistribute super."type-int"; + "type-iso" = dontDistribute super."type-iso"; + "type-level" = dontDistribute super."type-level"; + "type-level-bst" = dontDistribute super."type-level-bst"; + "type-level-natural-number" = dontDistribute super."type-level-natural-number"; + "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction"; + "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations"; + "type-level-sets" = dontDistribute super."type-level-sets"; + "type-level-tf" = dontDistribute super."type-level-tf"; + "type-list" = doDistribute super."type-list_0_2_0_0"; + "type-natural" = dontDistribute super."type-natural"; + "type-ord" = dontDistribute super."type-ord"; + "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal"; + "type-prelude" = dontDistribute super."type-prelude"; + "type-settheory" = dontDistribute super."type-settheory"; + "type-spine" = dontDistribute super."type-spine"; + "type-structure" = dontDistribute super."type-structure"; + "type-sub-th" = dontDistribute super."type-sub-th"; + "type-unary" = dontDistribute super."type-unary"; + "typeable-th" = dontDistribute super."typeable-th"; + "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; + "typed-wire" = dontDistribute super."typed-wire"; + "typedquery" = dontDistribute super."typedquery"; + "typehash" = dontDistribute super."typehash"; + "typelevel" = dontDistribute super."typelevel"; + "typelevel-tensor" = dontDistribute super."typelevel-tensor"; + "typeof" = dontDistribute super."typeof"; + "typeparams" = dontDistribute super."typeparams"; + "typesafe-endian" = dontDistribute super."typesafe-endian"; + "typescript-docs" = dontDistribute super."typescript-docs"; + "typical" = dontDistribute super."typical"; + "typography-geometry" = dontDistribute super."typography-geometry"; + "tz" = dontDistribute super."tz"; + "tzdata" = dontDistribute super."tzdata"; + "uAgda" = dontDistribute super."uAgda"; + "ua-parser" = dontDistribute super."ua-parser"; + "uacpid" = dontDistribute super."uacpid"; + "uberlast" = dontDistribute super."uberlast"; + "uconv" = dontDistribute super."uconv"; + "udbus" = dontDistribute super."udbus"; + "udbus-model" = dontDistribute super."udbus-model"; + "udcode" = dontDistribute super."udcode"; + "udev" = dontDistribute super."udev"; + "uglymemo" = dontDistribute super."uglymemo"; + "uhc-light" = dontDistribute super."uhc-light"; + "uhc-util" = dontDistribute super."uhc-util"; + "uhexdump" = dontDistribute super."uhexdump"; + "uhttpc" = dontDistribute super."uhttpc"; + "ui-command" = dontDistribute super."ui-command"; + "uid" = dontDistribute super."uid"; + "una" = dontDistribute super."una"; + "unagi-chan" = dontDistribute super."unagi-chan"; + "unagi-streams" = dontDistribute super."unagi-streams"; + "unamb" = dontDistribute super."unamb"; + "unamb-custom" = dontDistribute super."unamb-custom"; + "unbound" = dontDistribute super."unbound"; + "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; + "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unexceptionalio" = dontDistribute super."unexceptionalio"; + "unfoldable" = dontDistribute super."unfoldable"; + "ungadtagger" = dontDistribute super."ungadtagger"; + "uni-events" = dontDistribute super."uni-events"; + "uni-graphs" = dontDistribute super."uni-graphs"; + "uni-htk" = dontDistribute super."uni-htk"; + "uni-posixutil" = dontDistribute super."uni-posixutil"; + "uni-reactor" = dontDistribute super."uni-reactor"; + "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph"; + "uni-util" = dontDistribute super."uni-util"; + "unicode" = dontDistribute super."unicode"; + "unicode-names" = dontDistribute super."unicode-names"; + "unicode-normalization" = dontDistribute super."unicode-normalization"; + "unicode-prelude" = dontDistribute super."unicode-prelude"; + "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-symbols" = dontDistribute super."unicode-symbols"; + "unicoder" = dontDistribute super."unicoder"; + "unification-fd" = dontDistribute super."unification-fd"; + "uniform-io" = dontDistribute super."uniform-io"; + "uniform-pair" = dontDistribute super."uniform-pair"; + "union-find-array" = dontDistribute super."union-find-array"; + "union-map" = dontDistribute super."union-map"; + "unique" = dontDistribute super."unique"; + "unique-logic" = dontDistribute super."unique-logic"; + "unique-logic-tf" = dontDistribute super."unique-logic-tf"; + "uniqueid" = dontDistribute super."uniqueid"; + "unit" = dontDistribute super."unit"; + "units" = dontDistribute super."units"; + "units-attoparsec" = dontDistribute super."units-attoparsec"; + "units-defs" = dontDistribute super."units-defs"; + "units-parser" = dontDistribute super."units-parser"; + "unittyped" = dontDistribute super."unittyped"; + "universal-binary" = dontDistribute super."universal-binary"; + "universe" = dontDistribute super."universe"; + "universe-base" = dontDistribute super."universe-base"; + "universe-instances-base" = dontDistribute super."universe-instances-base"; + "universe-instances-extended" = dontDistribute super."universe-instances-extended"; + "universe-instances-trans" = dontDistribute super."universe-instances-trans"; + "universe-reverse-instances" = dontDistribute super."universe-reverse-instances"; + "universe-th" = dontDistribute super."universe-th"; + "unix-bytestring" = dontDistribute super."unix-bytestring"; + "unix-fcntl" = dontDistribute super."unix-fcntl"; + "unix-handle" = dontDistribute super."unix-handle"; + "unix-io-extra" = dontDistribute super."unix-io-extra"; + "unix-memory" = dontDistribute super."unix-memory"; + "unix-process-conduit" = dontDistribute super."unix-process-conduit"; + "unix-pty-light" = dontDistribute super."unix-pty-light"; + "unlit" = dontDistribute super."unlit"; + "unm-hip" = dontDistribute super."unm-hip"; + "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch"; + "unordered-graphs" = dontDistribute super."unordered-graphs"; + "unpack-funcs" = dontDistribute super."unpack-funcs"; + "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin"; + "unsafe" = dontDistribute super."unsafe"; + "unsafe-promises" = dontDistribute super."unsafe-promises"; + "unsafely" = dontDistribute super."unsafely"; + "unsafeperformst" = dontDistribute super."unsafeperformst"; + "unscramble" = dontDistribute super."unscramble"; + "unusable-pkg" = dontDistribute super."unusable-pkg"; + "uom-plugin" = dontDistribute super."uom-plugin"; + "up" = dontDistribute super."up"; + "up-grade" = dontDistribute super."up-grade"; + "uploadcare" = dontDistribute super."uploadcare"; + "upskirt" = dontDistribute super."upskirt"; + "ureader" = dontDistribute super."ureader"; + "urembed" = dontDistribute super."urembed"; + "uri" = dontDistribute super."uri"; + "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_1"; + "uri-conduit" = dontDistribute super."uri-conduit"; + "uri-enumerator" = dontDistribute super."uri-enumerator"; + "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; + "uri-template" = dontDistribute super."uri-template"; + "url-generic" = dontDistribute super."url-generic"; + "urlcheck" = dontDistribute super."urlcheck"; + "urldecode" = dontDistribute super."urldecode"; + "urldisp-happstack" = dontDistribute super."urldisp-happstack"; + "urlencoded" = dontDistribute super."urlencoded"; + "urlpath" = doDistribute super."urlpath_2_1_0"; + "urn" = dontDistribute super."urn"; + "urxml" = dontDistribute super."urxml"; + "usb" = dontDistribute super."usb"; + "usb-enumerator" = dontDistribute super."usb-enumerator"; + "usb-hid" = dontDistribute super."usb-hid"; + "usb-id-database" = dontDistribute super."usb-id-database"; + "usb-iteratee" = dontDistribute super."usb-iteratee"; + "usb-safe" = dontDistribute super."usb-safe"; + "userid" = dontDistribute super."userid"; + "utc" = dontDistribute super."utc"; + "utf8-env" = dontDistribute super."utf8-env"; + "utf8-prelude" = dontDistribute super."utf8-prelude"; + "utility-ht" = dontDistribute super."utility-ht"; + "uu-cco" = dontDistribute super."uu-cco"; + "uu-cco-examples" = dontDistribute super."uu-cco-examples"; + "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing"; + "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib"; + "uu-options" = dontDistribute super."uu-options"; + "uu-tc" = dontDistribute super."uu-tc"; + "uuagc" = dontDistribute super."uuagc"; + "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; + "uuagc-cabal" = dontDistribute super."uuagc-cabal"; + "uuagc-diagrams" = dontDistribute super."uuagc-diagrams"; + "uuagd" = dontDistribute super."uuagd"; + "uuid-aeson" = dontDistribute super."uuid-aeson"; + "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; + "uuid-quasi" = dontDistribute super."uuid-quasi"; + "uulib" = dontDistribute super."uulib"; + "uvector" = dontDistribute super."uvector"; + "uvector-algorithms" = dontDistribute super."uvector-algorithms"; + "uxadt" = dontDistribute super."uxadt"; + "uzbl-with-source" = dontDistribute super."uzbl-with-source"; + "v4l2" = dontDistribute super."v4l2"; + "v4l2-examples" = dontDistribute super."v4l2-examples"; + "vacuum" = dontDistribute super."vacuum"; + "vacuum-cairo" = dontDistribute super."vacuum-cairo"; + "vacuum-graphviz" = dontDistribute super."vacuum-graphviz"; + "vacuum-opengl" = dontDistribute super."vacuum-opengl"; + "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph"; + "vado" = dontDistribute super."vado"; + "valid-names" = dontDistribute super."valid-names"; + "validate" = dontDistribute super."validate"; + "validate-input" = doDistribute super."validate-input_0_2_0_0"; + "validated-literals" = dontDistribute super."validated-literals"; + "validation" = dontDistribute super."validation"; + "validations" = dontDistribute super."validations"; + "value-supply" = dontDistribute super."value-supply"; + "vampire" = dontDistribute super."vampire"; + "var" = dontDistribute super."var"; + "varan" = dontDistribute super."varan"; + "variable-precision" = dontDistribute super."variable-precision"; + "variables" = dontDistribute super."variables"; + "varying" = dontDistribute super."varying"; + "vaultaire-common" = dontDistribute super."vaultaire-common"; + "vcache" = dontDistribute super."vcache"; + "vcache-trie" = dontDistribute super."vcache-trie"; + "vcard" = dontDistribute super."vcard"; + "vcd" = dontDistribute super."vcd"; + "vcs-revision" = dontDistribute super."vcs-revision"; + "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse"; + "vcsgui" = dontDistribute super."vcsgui"; + "vcswrapper" = dontDistribute super."vcswrapper"; + "vect" = dontDistribute super."vect"; + "vect-floating" = dontDistribute super."vect-floating"; + "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; + "vect-opengl" = dontDistribute super."vect-opengl"; + "vector" = doDistribute super."vector_0_10_12_3"; + "vector-binary" = dontDistribute super."vector-binary"; + "vector-bytestring" = dontDistribute super."vector-bytestring"; + "vector-clock" = dontDistribute super."vector-clock"; + "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = dontDistribute super."vector-fftw"; + "vector-functorlazy" = dontDistribute super."vector-functorlazy"; + "vector-heterogenous" = dontDistribute super."vector-heterogenous"; + "vector-instances-collections" = dontDistribute super."vector-instances-collections"; + "vector-mmap" = dontDistribute super."vector-mmap"; + "vector-random" = dontDistribute super."vector-random"; + "vector-read-instances" = dontDistribute super."vector-read-instances"; + "vector-space-map" = dontDistribute super."vector-space-map"; + "vector-space-opengl" = dontDistribute super."vector-space-opengl"; + "vector-static" = dontDistribute super."vector-static"; + "vector-strategies" = dontDistribute super."vector-strategies"; + "verbalexpressions" = dontDistribute super."verbalexpressions"; + "verbosity" = dontDistribute super."verbosity"; + "verdict" = dontDistribute super."verdict"; + "verdict-json" = dontDistribute super."verdict-json"; + "verilog" = dontDistribute super."verilog"; + "versions" = dontDistribute super."versions"; + "vhdl" = dontDistribute super."vhdl"; + "views" = dontDistribute super."views"; + "vigilance" = dontDistribute super."vigilance"; + "vimeta" = dontDistribute super."vimeta"; + "vimus" = dontDistribute super."vimus"; + "vintage-basic" = dontDistribute super."vintage-basic"; + "vinyl" = dontDistribute super."vinyl"; + "vinyl-gl" = dontDistribute super."vinyl-gl"; + "vinyl-json" = dontDistribute super."vinyl-json"; + "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; + "virthualenv" = dontDistribute super."virthualenv"; + "vision" = dontDistribute super."vision"; + "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; + "visual-prof" = dontDistribute super."visual-prof"; + "vivid" = dontDistribute super."vivid"; + "vk-aws-route53" = dontDistribute super."vk-aws-route53"; + "vk-posix-pty" = dontDistribute super."vk-posix-pty"; + "vocabulary-kadma" = dontDistribute super."vocabulary-kadma"; + "vorbiscomment" = dontDistribute super."vorbiscomment"; + "vowpal-utils" = dontDistribute super."vowpal-utils"; + "voyeur" = dontDistribute super."voyeur"; + "vte" = dontDistribute super."vte"; + "vtegtk3" = dontDistribute super."vtegtk3"; + "vty" = dontDistribute super."vty"; + "vty-examples" = dontDistribute super."vty-examples"; + "vty-menu" = dontDistribute super."vty-menu"; + "vty-ui" = dontDistribute super."vty-ui"; + "vty-ui-extras" = dontDistribute super."vty-ui-extras"; + "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; + "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; + "wai-devel" = dontDistribute super."wai-devel"; + "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; + "wai-dispatch" = dontDistribute super."wai-dispatch"; + "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; + "wai-graceful" = dontDistribute super."wai-graceful"; + "wai-handler-devel" = dontDistribute super."wai-handler-devel"; + "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi"; + "wai-handler-scgi" = dontDistribute super."wai-handler-scgi"; + "wai-handler-snap" = dontDistribute super."wai-handler-snap"; + "wai-handler-webkit" = dontDistribute super."wai-handler-webkit"; + "wai-hastache" = dontDistribute super."wai-hastache"; + "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; + "wai-lens" = dontDistribute super."wai-lens"; + "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; + "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; + "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; + "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; + "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; + "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac"; + "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client"; + "wai-middleware-metrics" = dontDistribute super."wai-middleware-metrics"; + "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; + "wai-middleware-route" = dontDistribute super."wai-middleware-route"; + "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; + "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; + "wai-request-spec" = dontDistribute super."wai-request-spec"; + "wai-responsible" = dontDistribute super."wai-responsible"; + "wai-router" = dontDistribute super."wai-router"; + "wai-routes" = doDistribute super."wai-routes_0_7_3"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; + "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; + "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; + "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; + "wai-static-cache" = dontDistribute super."wai-static-cache"; + "wai-static-pages" = dontDistribute super."wai-static-pages"; + "wai-test" = dontDistribute super."wai-test"; + "wai-thrift" = dontDistribute super."wai-thrift"; + "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; + "wai-util" = dontDistribute super."wai-util"; + "wait-handle" = dontDistribute super."wait-handle"; + "waitfree" = dontDistribute super."waitfree"; + "warc" = dontDistribute super."warc"; + "warp" = doDistribute super."warp_3_1_3_1"; + "warp-dynamic" = dontDistribute super."warp-dynamic"; + "warp-static" = dontDistribute super."warp-static"; + "warp-tls" = doDistribute super."warp-tls_3_1_3"; + "warp-tls-uid" = dontDistribute super."warp-tls-uid"; + "watchdog" = dontDistribute super."watchdog"; + "watcher" = dontDistribute super."watcher"; + "watchit" = dontDistribute super."watchit"; + "wavconvert" = dontDistribute super."wavconvert"; + "wavefront" = dontDistribute super."wavefront"; + "wavesurfer" = dontDistribute super."wavesurfer"; + "wavy" = dontDistribute super."wavy"; + "wcwidth" = dontDistribute super."wcwidth"; + "weather-api" = dontDistribute super."weather-api"; + "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell"; + "web-css" = dontDistribute super."web-css"; + "web-encodings" = dontDistribute super."web-encodings"; + "web-mongrel2" = dontDistribute super."web-mongrel2"; + "web-page" = dontDistribute super."web-page"; + "web-plugins" = dontDistribute super."web-plugins"; + "web-routes" = dontDistribute super."web-routes"; + "web-routes-boomerang" = dontDistribute super."web-routes-boomerang"; + "web-routes-happstack" = dontDistribute super."web-routes-happstack"; + "web-routes-hsp" = dontDistribute super."web-routes-hsp"; + "web-routes-mtl" = dontDistribute super."web-routes-mtl"; + "web-routes-quasi" = dontDistribute super."web-routes-quasi"; + "web-routes-regular" = dontDistribute super."web-routes-regular"; + "web-routes-th" = dontDistribute super."web-routes-th"; + "web-routes-transformers" = dontDistribute super."web-routes-transformers"; + "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; + "webcrank" = dontDistribute super."webcrank"; + "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; + "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_3_1"; + "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webidl" = dontDistribute super."webidl"; + "webify" = dontDistribute super."webify"; + "webkit" = dontDistribute super."webkit"; + "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore"; + "webkitgtk3" = dontDistribute super."webkitgtk3"; + "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore"; + "webrtc-vad" = dontDistribute super."webrtc-vad"; + "webserver" = dontDistribute super."webserver"; + "websnap" = dontDistribute super."websnap"; + "websockets-snap" = dontDistribute super."websockets-snap"; + "webwire" = dontDistribute super."webwire"; + "wedding-announcement" = dontDistribute super."wedding-announcement"; + "wedged" = dontDistribute super."wedged"; + "weighted-regexp" = dontDistribute super."weighted-regexp"; + "weighted-search" = dontDistribute super."weighted-search"; + "welshy" = dontDistribute super."welshy"; + "wheb-mongo" = dontDistribute super."wheb-mongo"; + "wheb-redis" = dontDistribute super."wheb-redis"; + "wheb-strapped" = dontDistribute super."wheb-strapped"; + "while-lang-parser" = dontDistribute super."while-lang-parser"; + "whim" = dontDistribute super."whim"; + "whiskers" = dontDistribute super."whiskers"; + "whitespace" = dontDistribute super."whitespace"; + "whois" = dontDistribute super."whois"; + "why3" = dontDistribute super."why3"; + "wigner-symbols" = dontDistribute super."wigner-symbols"; + "wikipedia4epub" = dontDistribute super."wikipedia4epub"; + "win-hp-path" = dontDistribute super."win-hp-path"; + "windowslive" = dontDistribute super."windowslive"; + "winerror" = dontDistribute super."winerror"; + "winio" = dontDistribute super."winio"; + "wiring" = dontDistribute super."wiring"; + "withdependencies" = dontDistribute super."withdependencies"; + "witness" = dontDistribute super."witness"; + "witty" = dontDistribute super."witty"; + "wkt" = dontDistribute super."wkt"; + "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm"; + "wlc-hs" = dontDistribute super."wlc-hs"; + "wobsurv" = dontDistribute super."wobsurv"; + "woffex" = dontDistribute super."woffex"; + "wol" = dontDistribute super."wol"; + "wolf" = dontDistribute super."wolf"; + "woot" = dontDistribute super."woot"; + "word-trie" = dontDistribute super."word-trie"; + "word24" = dontDistribute super."word24"; + "wordcloud" = dontDistribute super."wordcloud"; + "wordexp" = dontDistribute super."wordexp"; + "words" = dontDistribute super."words"; + "wordsearch" = dontDistribute super."wordsearch"; + "wordsetdiff" = dontDistribute super."wordsetdiff"; + "workflow-osx" = dontDistribute super."workflow-osx"; + "wp-archivebot" = dontDistribute super."wp-archivebot"; + "wraparound" = dontDistribute super."wraparound"; + "wraxml" = dontDistribute super."wraxml"; + "wreq-sb" = dontDistribute super."wreq-sb"; + "wright" = dontDistribute super."wright"; + "wsedit" = dontDistribute super."wsedit"; + "wtk" = dontDistribute super."wtk"; + "wtk-gtk" = dontDistribute super."wtk-gtk"; + "wumpus-basic" = dontDistribute super."wumpus-basic"; + "wumpus-core" = dontDistribute super."wumpus-core"; + "wumpus-drawing" = dontDistribute super."wumpus-drawing"; + "wumpus-microprint" = dontDistribute super."wumpus-microprint"; + "wumpus-tree" = dontDistribute super."wumpus-tree"; + "wuss" = dontDistribute super."wuss"; + "wx" = dontDistribute super."wx"; + "wxAsteroids" = dontDistribute super."wxAsteroids"; + "wxFruit" = dontDistribute super."wxFruit"; + "wxc" = dontDistribute super."wxc"; + "wxcore" = dontDistribute super."wxcore"; + "wxdirect" = dontDistribute super."wxdirect"; + "wxhnotepad" = dontDistribute super."wxhnotepad"; + "wxturtle" = dontDistribute super."wxturtle"; + "wybor" = dontDistribute super."wybor"; + "wyvern" = dontDistribute super."wyvern"; + "x-dsp" = dontDistribute super."x-dsp"; + "x11-xim" = dontDistribute super."x11-xim"; + "x11-xinput" = dontDistribute super."x11-xinput"; + "x509-util" = dontDistribute super."x509-util"; + "xattr" = dontDistribute super."xattr"; + "xbattbar" = dontDistribute super."xbattbar"; + "xcb-types" = dontDistribute super."xcb-types"; + "xcffib" = dontDistribute super."xcffib"; + "xchat-plugin" = dontDistribute super."xchat-plugin"; + "xcp" = dontDistribute super."xcp"; + "xdg-basedir" = dontDistribute super."xdg-basedir"; + "xdg-userdirs" = dontDistribute super."xdg-userdirs"; + "xdot" = dontDistribute super."xdot"; + "xfconf" = dontDistribute super."xfconf"; + "xhaskell-library" = dontDistribute super."xhaskell-library"; + "xhb" = dontDistribute super."xhb"; + "xhb-atom-cache" = dontDistribute super."xhb-atom-cache"; + "xhb-ewmh" = dontDistribute super."xhb-ewmh"; + "xhtml" = doDistribute super."xhtml_3000_2_1"; + "xhtml-combinators" = dontDistribute super."xhtml-combinators"; + "xilinx-lava" = dontDistribute super."xilinx-lava"; + "xine" = dontDistribute super."xine"; + "xing-api" = dontDistribute super."xing-api"; + "xinput-conduit" = dontDistribute super."xinput-conduit"; + "xkbcommon" = dontDistribute super."xkbcommon"; + "xkcd" = dontDistribute super."xkcd"; + "xlsx-templater" = dontDistribute super."xlsx-templater"; + "xml-basic" = dontDistribute super."xml-basic"; + "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit-parse" = dontDistribute super."xml-conduit-parse"; + "xml-conduit-writer" = dontDistribute super."xml-conduit-writer"; + "xml-enumerator" = dontDistribute super."xml-enumerator"; + "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; + "xml-extractors" = dontDistribute super."xml-extractors"; + "xml-helpers" = dontDistribute super."xml-helpers"; + "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens"; + "xml-monad" = dontDistribute super."xml-monad"; + "xml-parsec" = dontDistribute super."xml-parsec"; + "xml-picklers" = dontDistribute super."xml-picklers"; + "xml-pipe" = dontDistribute super."xml-pipe"; + "xml-prettify" = dontDistribute super."xml-prettify"; + "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; + "xml2html" = dontDistribute super."xml2html"; + "xml2json" = dontDistribute super."xml2json"; + "xml2x" = dontDistribute super."xml2x"; + "xmltv" = dontDistribute super."xmltv"; + "xmms2-client" = dontDistribute super."xmms2-client"; + "xmms2-client-glib" = dontDistribute super."xmms2-client-glib"; + "xmobar" = dontDistribute super."xmobar"; + "xmonad" = dontDistribute super."xmonad"; + "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch"; + "xmonad-contrib" = dontDistribute super."xmonad-contrib"; + "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch"; + "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl"; + "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper"; + "xmonad-eval" = dontDistribute super."xmonad-eval"; + "xmonad-extras" = dontDistribute super."xmonad-extras"; + "xmonad-screenshot" = dontDistribute super."xmonad-screenshot"; + "xmonad-utils" = dontDistribute super."xmonad-utils"; + "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper"; + "xmonad-windownames" = dontDistribute super."xmonad-windownames"; + "xmpipe" = dontDistribute super."xmpipe"; + "xorshift" = dontDistribute super."xorshift"; + "xosd" = dontDistribute super."xosd"; + "xournal-builder" = dontDistribute super."xournal-builder"; + "xournal-convert" = dontDistribute super."xournal-convert"; + "xournal-parser" = dontDistribute super."xournal-parser"; + "xournal-render" = dontDistribute super."xournal-render"; + "xournal-types" = dontDistribute super."xournal-types"; + "xsact" = dontDistribute super."xsact"; + "xsd" = dontDistribute super."xsd"; + "xsha1" = dontDistribute super."xsha1"; + "xslt" = dontDistribute super."xslt"; + "xtc" = dontDistribute super."xtc"; + "xtest" = dontDistribute super."xtest"; + "xturtle" = dontDistribute super."xturtle"; + "xxhash" = dontDistribute super."xxhash"; + "y0l0bot" = dontDistribute super."y0l0bot"; + "yabi" = dontDistribute super."yabi"; + "yabi-muno" = dontDistribute super."yabi-muno"; + "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit"; + "yahoo-web-search" = dontDistribute super."yahoo-web-search"; + "yajl" = dontDistribute super."yajl"; + "yajl-enumerator" = dontDistribute super."yajl-enumerator"; + "yall" = dontDistribute super."yall"; + "yamemo" = dontDistribute super."yamemo"; + "yaml-config" = dontDistribute super."yaml-config"; + "yaml-light" = dontDistribute super."yaml-light"; + "yaml-light-lens" = dontDistribute super."yaml-light-lens"; + "yaml-rpc" = dontDistribute super."yaml-rpc"; + "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty"; + "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap"; + "yaml2owl" = dontDistribute super."yaml2owl"; + "yamlkeysdiff" = dontDistribute super."yamlkeysdiff"; + "yampa-canvas" = dontDistribute super."yampa-canvas"; + "yampa-glfw" = dontDistribute super."yampa-glfw"; + "yampa-glut" = dontDistribute super."yampa-glut"; + "yampa2048" = dontDistribute super."yampa2048"; + "yaop" = dontDistribute super."yaop"; + "yap" = dontDistribute super."yap"; + "yarr" = dontDistribute super."yarr"; + "yarr-image-io" = dontDistribute super."yarr-image-io"; + "yate" = dontDistribute super."yate"; + "yavie" = dontDistribute super."yavie"; + "ycextra" = dontDistribute super."ycextra"; + "yeganesh" = dontDistribute super."yeganesh"; + "yeller" = dontDistribute super."yeller"; + "yes-precure5-command" = dontDistribute super."yes-precure5-command"; + "yesod-angular" = dontDistribute super."yesod-angular"; + "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; + "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; + "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; + "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; + "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; + "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; + "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; + "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; + "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; + "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-crud" = dontDistribute super."yesod-crud"; + "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; + "yesod-csp" = dontDistribute super."yesod-csp"; + "yesod-datatables" = dontDistribute super."yesod-datatables"; + "yesod-dsl" = dontDistribute super."yesod-dsl"; + "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-goodies" = dontDistribute super."yesod-goodies"; + "yesod-json" = dontDistribute super."yesod-json"; + "yesod-links" = dontDistribute super."yesod-links"; + "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-markdown" = dontDistribute super."yesod-markdown"; + "yesod-media-simple" = dontDistribute super."yesod-media-simple"; + "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1"; + "yesod-paginate" = dontDistribute super."yesod-paginate"; + "yesod-pagination" = dontDistribute super."yesod-pagination"; + "yesod-paginator" = dontDistribute super."yesod-paginator"; + "yesod-platform" = dontDistribute super."yesod-platform"; + "yesod-pnotify" = dontDistribute super."yesod-pnotify"; + "yesod-pure" = dontDistribute super."yesod-pure"; + "yesod-purescript" = dontDistribute super."yesod-purescript"; + "yesod-raml" = dontDistribute super."yesod-raml"; + "yesod-raml-bin" = dontDistribute super."yesod-raml-bin"; + "yesod-raml-docs" = dontDistribute super."yesod-raml-docs"; + "yesod-raml-mock" = dontDistribute super."yesod-raml-mock"; + "yesod-recaptcha" = dontDistribute super."yesod-recaptcha"; + "yesod-routes" = dontDistribute super."yesod-routes"; + "yesod-routes-flow" = dontDistribute super."yesod-routes-flow"; + "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript"; + "yesod-rst" = dontDistribute super."yesod-rst"; + "yesod-s3" = dontDistribute super."yesod-s3"; + "yesod-sass" = dontDistribute super."yesod-sass"; + "yesod-session-redis" = dontDistribute super."yesod-session-redis"; + "yesod-table" = doDistribute super."yesod-table_1_0_6"; + "yesod-tableview" = dontDistribute super."yesod-tableview"; + "yesod-test" = doDistribute super."yesod-test_1_4_4"; + "yesod-test-json" = dontDistribute super."yesod-test-json"; + "yesod-tls" = dontDistribute super."yesod-tls"; + "yesod-transloadit" = dontDistribute super."yesod-transloadit"; + "yesod-vend" = dontDistribute super."yesod-vend"; + "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra"; + "yesod-worker" = dontDistribute super."yesod-worker"; + "yet-another-logger" = dontDistribute super."yet-another-logger"; + "yhccore" = dontDistribute super."yhccore"; + "yi" = dontDistribute super."yi"; + "yi-contrib" = dontDistribute super."yi-contrib"; + "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; + "yi-fuzzy-open" = dontDistribute super."yi-fuzzy-open"; + "yi-gtk" = dontDistribute super."yi-gtk"; + "yi-language" = dontDistribute super."yi-language"; + "yi-monokai" = dontDistribute super."yi-monokai"; + "yi-rope" = dontDistribute super."yi-rope"; + "yi-snippet" = dontDistribute super."yi-snippet"; + "yi-solarized" = dontDistribute super."yi-solarized"; + "yi-spolsky" = dontDistribute super."yi-spolsky"; + "yi-vty" = dontDistribute super."yi-vty"; + "yices" = dontDistribute super."yices"; + "yices-easy" = dontDistribute super."yices-easy"; + "yices-painless" = dontDistribute super."yices-painless"; + "yjftp" = dontDistribute super."yjftp"; + "yjftp-libs" = dontDistribute super."yjftp-libs"; + "yjsvg" = dontDistribute super."yjsvg"; + "yjtools" = dontDistribute super."yjtools"; + "yocto" = dontDistribute super."yocto"; + "yoko" = dontDistribute super."yoko"; + "york-lava" = dontDistribute super."york-lava"; + "youtube" = dontDistribute super."youtube"; + "yql" = dontDistribute super."yql"; + "yst" = dontDistribute super."yst"; + "yuiGrid" = dontDistribute super."yuiGrid"; + "yuuko" = dontDistribute super."yuuko"; + "yxdb-utils" = dontDistribute super."yxdb-utils"; + "z3" = dontDistribute super."z3"; + "zalgo" = dontDistribute super."zalgo"; + "zampolit" = dontDistribute super."zampolit"; + "zasni-gerna" = dontDistribute super."zasni-gerna"; + "zcache" = dontDistribute super."zcache"; + "zenc" = dontDistribute super."zenc"; + "zendesk-api" = dontDistribute super."zendesk-api"; + "zeno" = dontDistribute super."zeno"; + "zerobin" = dontDistribute super."zerobin"; + "zeromq-haskell" = dontDistribute super."zeromq-haskell"; + "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; + "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; + "zeroth" = dontDistribute super."zeroth"; + "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zim-parser" = dontDistribute super."zim-parser"; + "zip-conduit" = dontDistribute super."zip-conduit"; + "zipedit" = dontDistribute super."zipedit"; + "zipkin" = dontDistribute super."zipkin"; + "zipper" = dontDistribute super."zipper"; + "zippers" = dontDistribute super."zippers"; + "zippo" = dontDistribute super."zippo"; + "zlib-conduit" = dontDistribute super."zlib-conduit"; + "zmcat" = dontDistribute super."zmcat"; + "zmidi-core" = dontDistribute super."zmidi-core"; + "zmidi-score" = dontDistribute super."zmidi-score"; + "zmqat" = dontDistribute super."zmqat"; + "zoneinfo" = dontDistribute super."zoneinfo"; + "zoom" = dontDistribute super."zoom"; + "zoom-cache" = dontDistribute super."zoom-cache"; + "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm"; + "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile"; + "zoom-refs" = dontDistribute super."zoom-refs"; + "zot" = dontDistribute super."zot"; + "zsh-battery" = dontDistribute super."zsh-battery"; + "ztail" = dontDistribute super."ztail"; + +} diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index ffc93b5d40e..631da53ead6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -584,6 +584,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -606,6 +607,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -982,6 +984,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1106,6 +1109,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1297,6 +1301,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1339,6 +1344,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1461,6 +1467,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1578,6 +1585,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1691,6 +1699,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1703,6 +1712,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1834,6 +1844,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2054,6 +2065,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2337,6 +2349,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2471,6 +2484,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2728,6 +2742,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "errors" = doDistribute super."errors_2_0_0"; "ersatz" = dontDistribute super."ersatz"; @@ -2970,9 +2985,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3008,6 +3025,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3505,6 +3523,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3739,8 +3758,11 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4323,6 +4345,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4503,6 +4526,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4926,6 +4950,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5233,6 +5258,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5504,6 +5530,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5569,6 +5596,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5589,6 +5617,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5655,6 +5684,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5669,6 +5699,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5783,6 +5814,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5826,6 +5858,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -5952,6 +5985,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6028,6 +6062,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6239,6 +6274,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6357,6 +6393,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_5"; @@ -6372,6 +6409,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6443,6 +6481,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6502,6 +6541,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6626,6 +6666,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6751,6 +6792,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6792,6 +6834,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6938,6 +6981,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_3_1"; @@ -7017,6 +7061,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -7062,6 +7107,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7169,6 +7215,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7351,6 +7398,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7404,6 +7452,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7432,6 +7481,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7696,6 +7746,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7742,6 +7793,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7804,6 +7856,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7814,6 +7867,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "waitra" = doDistribute super."waitra_0_0_3_0"; @@ -7848,6 +7902,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7980,6 +8035,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -8061,6 +8119,7 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index f2a6538601b..55cf748dfe5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -584,6 +584,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -606,6 +607,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -982,6 +984,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1106,6 +1109,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1296,6 +1300,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1338,6 +1343,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1460,6 +1466,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1577,6 +1584,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1690,6 +1698,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1702,6 +1711,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1833,6 +1843,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2052,6 +2063,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2333,6 +2345,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2467,6 +2480,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2724,6 +2738,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "errors" = doDistribute super."errors_2_0_0"; "ersatz" = dontDistribute super."ersatz"; @@ -2965,9 +2980,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3003,6 +3020,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3500,6 +3518,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3734,8 +3753,11 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4316,6 +4338,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4496,6 +4519,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4919,6 +4943,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5226,6 +5251,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5496,6 +5522,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5561,6 +5588,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5581,6 +5609,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5647,6 +5676,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5661,6 +5691,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5775,6 +5806,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5818,6 +5850,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -5944,6 +5977,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6020,6 +6054,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6231,6 +6266,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6348,6 +6384,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_5"; @@ -6363,6 +6400,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6434,6 +6472,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6493,6 +6532,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6617,6 +6657,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6742,6 +6783,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6783,6 +6825,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6928,6 +6971,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_3_1"; @@ -7007,6 +7051,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -7052,6 +7097,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7159,6 +7205,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7340,6 +7387,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7393,6 +7441,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7421,6 +7470,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7684,6 +7734,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7730,6 +7781,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7792,6 +7844,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7802,6 +7855,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "waitra" = doDistribute super."waitra_0_0_3_0"; @@ -7836,6 +7890,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7968,6 +8023,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -8048,6 +8106,7 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index daf12540108..cd1858c1774 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -584,6 +584,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -606,6 +607,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -982,6 +984,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1106,6 +1109,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1296,6 +1300,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1338,6 +1343,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1460,6 +1466,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1577,6 +1584,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1690,6 +1698,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1702,6 +1711,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1832,6 +1842,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2051,6 +2062,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2332,6 +2344,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2466,6 +2479,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2723,6 +2737,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "errors" = doDistribute super."errors_2_0_0"; "ersatz" = dontDistribute super."ersatz"; @@ -2964,9 +2979,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3002,6 +3019,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3499,6 +3517,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3733,8 +3752,11 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4315,6 +4337,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4495,6 +4518,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4918,6 +4942,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5225,6 +5250,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5495,6 +5521,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5560,6 +5587,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5580,6 +5608,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5646,6 +5675,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5660,6 +5690,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5774,6 +5805,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5817,6 +5849,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -5943,6 +5976,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6019,6 +6053,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6230,6 +6265,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6347,6 +6383,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_5"; @@ -6362,6 +6399,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6433,6 +6471,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6492,6 +6531,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6615,6 +6655,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6740,6 +6781,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6781,6 +6823,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6926,6 +6969,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_3_1"; @@ -7004,6 +7048,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -7049,6 +7094,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7156,6 +7202,7 @@ self: super: { "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7337,6 +7384,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7390,6 +7438,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7418,6 +7467,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7681,6 +7731,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7727,6 +7778,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7789,6 +7841,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7799,6 +7852,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; @@ -7832,6 +7886,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7964,6 +8019,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -8044,6 +8102,7 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 0f60a597a3e..c9b18487c15 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -584,6 +584,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -606,6 +607,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -982,6 +984,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1106,6 +1109,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1295,6 +1299,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1337,6 +1342,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1459,6 +1465,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1576,6 +1583,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1689,6 +1697,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1701,6 +1710,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1830,6 +1840,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2049,6 +2060,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2329,6 +2341,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2463,6 +2476,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2720,6 +2734,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "errors" = doDistribute super."errors_2_0_0"; "ersatz" = dontDistribute super."ersatz"; @@ -2959,9 +2974,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -2997,6 +3014,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3494,6 +3512,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3727,8 +3746,11 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4307,6 +4329,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4484,6 +4507,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4906,6 +4930,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -5213,6 +5238,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5482,6 +5508,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5547,6 +5574,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5567,6 +5595,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5633,6 +5662,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5647,6 +5677,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5760,6 +5791,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5803,6 +5835,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -5928,6 +5961,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6002,6 +6036,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6213,6 +6248,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6330,6 +6366,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; @@ -6345,6 +6382,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6416,6 +6454,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6475,6 +6514,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6597,6 +6637,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6722,6 +6763,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6763,6 +6805,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6908,6 +6951,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_4_1"; @@ -6986,6 +7030,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_13"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -7031,6 +7076,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7137,6 +7183,7 @@ self: super: { "task" = dontDistribute super."task"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7316,6 +7363,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7369,6 +7417,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7397,6 +7446,7 @@ self: super: { "tries" = dontDistribute super."tries"; "trifecta" = doDistribute super."trifecta_1_5_1_3"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7660,6 +7710,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7706,6 +7757,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7768,6 +7820,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7778,6 +7831,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; @@ -7811,6 +7865,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7941,6 +7996,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7985,6 +8043,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_1"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -8020,6 +8079,7 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 7d972ee7b98..82a4183307a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -584,6 +584,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -606,6 +607,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -982,6 +984,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1105,6 +1108,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1294,6 +1298,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1336,6 +1341,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1458,6 +1464,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1575,6 +1582,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1688,6 +1696,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1700,6 +1709,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1828,6 +1838,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2047,6 +2058,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2327,6 +2339,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2461,6 +2474,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2718,6 +2732,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -2954,9 +2969,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -2992,6 +3009,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3487,6 +3505,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3719,8 +3738,11 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4042,6 +4064,7 @@ self: super: { "hpodder" = dontDistribute super."hpodder"; "hpp" = dontDistribute super."hpp"; "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc" = doDistribute super."hprotoc_2_1_7"; "hprotoc-fork" = dontDistribute super."hprotoc-fork"; "hps" = dontDistribute super."hps"; "hps-cairo" = dontDistribute super."hps-cairo"; @@ -4298,6 +4321,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4474,6 +4498,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4893,6 +4918,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -4930,6 +4956,7 @@ self: super: { "lock-file" = dontDistribute super."lock-file"; "lockfree-queue" = dontDistribute super."lockfree-queue"; "log" = dontDistribute super."log"; + "log-domain" = doDistribute super."log-domain_0_10_3"; "log-effect" = dontDistribute super."log-effect"; "log2json" = dontDistribute super."log2json"; "logfloat" = dontDistribute super."logfloat"; @@ -5199,6 +5226,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5467,6 +5495,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5532,6 +5561,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5552,6 +5582,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5618,6 +5649,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5632,6 +5664,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5745,6 +5778,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5788,6 +5822,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -5912,6 +5947,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -5986,6 +6022,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6009,6 +6046,8 @@ self: super: { "proteaaudio" = dontDistribute super."proteaaudio"; "protobuf" = dontDistribute super."protobuf"; "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers" = doDistribute super."protocol-buffers_2_1_7"; + "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; "proton-haskell" = dontDistribute super."proton-haskell"; @@ -6195,6 +6234,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6312,6 +6352,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; @@ -6327,6 +6368,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6398,6 +6440,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6457,6 +6500,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6579,6 +6623,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6704,6 +6749,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6745,6 +6791,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6890,6 +6937,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_4_1"; @@ -6968,6 +7016,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_13"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -7013,6 +7062,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7119,6 +7169,7 @@ self: super: { "task" = dontDistribute super."task"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7298,6 +7349,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7351,6 +7403,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7378,6 +7431,7 @@ self: super: { "triangulation" = dontDistribute super."triangulation"; "tries" = dontDistribute super."tries"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7641,6 +7695,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7687,6 +7742,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7747,6 +7803,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7757,6 +7814,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; @@ -7790,6 +7848,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7920,6 +7979,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7964,6 +8026,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_1"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -7999,6 +8062,7 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 2011c11bd0d..701852f4484 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -583,6 +583,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -605,6 +606,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -981,6 +983,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1104,6 +1107,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1292,6 +1296,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1331,6 +1336,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1453,6 +1459,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1570,6 +1577,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1683,6 +1691,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1695,6 +1704,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1823,6 +1833,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2042,6 +2053,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2321,6 +2333,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2411,6 +2424,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_4"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_6"; @@ -2454,6 +2468,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2710,6 +2725,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -2944,9 +2960,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -2982,6 +3000,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3477,6 +3496,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3709,7 +3729,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4030,6 +4053,7 @@ self: super: { "hpodder" = dontDistribute super."hpodder"; "hpp" = dontDistribute super."hpp"; "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc" = doDistribute super."hprotoc_2_1_7"; "hprotoc-fork" = dontDistribute super."hprotoc-fork"; "hps" = dontDistribute super."hps"; "hps-cairo" = dontDistribute super."hps-cairo"; @@ -4285,6 +4309,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4461,6 +4486,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4879,6 +4905,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -4916,6 +4943,7 @@ self: super: { "lock-file" = dontDistribute super."lock-file"; "lockfree-queue" = dontDistribute super."lockfree-queue"; "log" = dontDistribute super."log"; + "log-domain" = doDistribute super."log-domain_0_10_3"; "log-effect" = dontDistribute super."log-effect"; "log2json" = dontDistribute super."log2json"; "logfloat" = dontDistribute super."logfloat"; @@ -5183,6 +5211,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5451,6 +5480,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5516,6 +5546,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5536,6 +5567,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5602,6 +5634,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5616,6 +5649,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5728,6 +5762,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5771,6 +5806,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -5894,6 +5930,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -5967,6 +6004,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -5990,6 +6028,8 @@ self: super: { "proteaaudio" = dontDistribute super."proteaaudio"; "protobuf" = dontDistribute super."protobuf"; "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers" = doDistribute super."protocol-buffers_2_1_7"; + "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; "proton-haskell" = dontDistribute super."proton-haskell"; @@ -6174,6 +6214,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6291,6 +6332,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; @@ -6306,6 +6348,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6377,6 +6420,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6436,6 +6480,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6558,6 +6603,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6602,6 +6648,7 @@ self: super: { "shell-pipe" = dontDistribute super."shell-pipe"; "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; + "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; @@ -6682,6 +6729,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6722,6 +6770,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6866,6 +6915,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_5_0"; @@ -6944,6 +6994,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_14_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -6989,6 +7040,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7095,6 +7147,7 @@ self: super: { "task" = dontDistribute super."task"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1"; @@ -7274,6 +7327,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7327,6 +7381,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7354,6 +7409,7 @@ self: super: { "triangulation" = dontDistribute super."triangulation"; "tries" = dontDistribute super."tries"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7616,6 +7672,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7662,6 +7719,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7721,6 +7779,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7731,6 +7790,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; @@ -7764,6 +7824,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7892,6 +7953,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7936,6 +8000,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_1"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -7971,6 +8036,7 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index a93f85b0977..8886aa895e7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -583,6 +583,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -605,6 +606,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListLike" = doDistribute super."ListLike_4_2_0"; "ListTree" = dontDistribute super."ListTree"; @@ -981,6 +983,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1104,6 +1107,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1292,6 +1296,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1331,6 +1336,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1453,6 +1459,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1569,6 +1576,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1680,6 +1688,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1692,6 +1701,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1819,6 +1829,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2037,6 +2048,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2315,6 +2327,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2405,6 +2418,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; @@ -2443,6 +2457,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2699,6 +2714,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -2933,9 +2949,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -2971,6 +2989,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3466,6 +3485,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3698,7 +3718,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4019,6 +4042,7 @@ self: super: { "hpodder" = dontDistribute super."hpodder"; "hpp" = dontDistribute super."hpp"; "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc" = doDistribute super."hprotoc_2_1_7"; "hprotoc-fork" = dontDistribute super."hprotoc-fork"; "hps" = dontDistribute super."hps"; "hps-cairo" = dontDistribute super."hps-cairo"; @@ -4274,6 +4298,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4450,6 +4475,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4868,6 +4894,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -4905,6 +4932,7 @@ self: super: { "lock-file" = dontDistribute super."lock-file"; "lockfree-queue" = dontDistribute super."lockfree-queue"; "log" = dontDistribute super."log"; + "log-domain" = doDistribute super."log-domain_0_10_3"; "log-effect" = dontDistribute super."log-effect"; "log2json" = dontDistribute super."log2json"; "logfloat" = dontDistribute super."logfloat"; @@ -5170,6 +5198,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5438,6 +5467,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5503,6 +5533,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5523,6 +5554,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5589,6 +5621,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5603,6 +5636,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5715,6 +5749,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5758,6 +5793,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -5881,6 +5917,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -5952,6 +5989,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -5975,6 +6013,8 @@ self: super: { "proteaaudio" = dontDistribute super."proteaaudio"; "protobuf" = dontDistribute super."protobuf"; "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers" = doDistribute super."protocol-buffers_2_1_7"; + "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; "proton-haskell" = dontDistribute super."proton-haskell"; @@ -6158,6 +6198,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6275,6 +6316,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; @@ -6290,6 +6332,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6361,6 +6404,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6420,6 +6464,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6542,6 +6587,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6586,6 +6632,7 @@ self: super: { "shell-pipe" = dontDistribute super."shell-pipe"; "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; + "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; @@ -6666,6 +6713,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6706,6 +6754,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6850,6 +6899,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_5_0"; @@ -6928,6 +6978,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -6972,6 +7023,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7078,6 +7130,7 @@ self: super: { "task" = dontDistribute super."task"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; @@ -7256,6 +7309,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7309,6 +7363,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7336,6 +7391,7 @@ self: super: { "triangulation" = dontDistribute super."triangulation"; "tries" = dontDistribute super."tries"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7598,6 +7654,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7644,6 +7701,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7663,6 +7721,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_1"; "wai-cors" = doDistribute super."wai-cors_0_2_3"; @@ -7702,6 +7761,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7712,6 +7772,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; @@ -7745,6 +7806,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7872,6 +7934,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7916,6 +7981,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_1"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -7951,6 +8017,7 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index 60304efa594..e57c1488001 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -582,6 +582,7 @@ self: super: { "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; "Kleislify" = dontDistribute super."Kleislify"; "Konf" = dontDistribute super."Konf"; + "Kriens" = dontDistribute super."Kriens"; "KyotoCabinet" = dontDistribute super."KyotoCabinet"; "L-seed" = dontDistribute super."L-seed"; "LDAP" = dontDistribute super."LDAP"; @@ -604,6 +605,7 @@ self: super: { "LibZip" = dontDistribute super."LibZip"; "Limit" = dontDistribute super."Limit"; "LinearSplit" = dontDistribute super."LinearSplit"; + "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; "LinkChecker" = dontDistribute super."LinkChecker"; "ListTree" = dontDistribute super."ListTree"; "ListWriter" = dontDistribute super."ListWriter"; @@ -979,6 +981,7 @@ self: super: { "Win32-services" = dontDistribute super."Win32-services"; "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; "Wired" = dontDistribute super."Wired"; + "WordAlignment" = dontDistribute super."WordAlignment"; "WordNet" = dontDistribute super."WordNet"; "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; "Wordlint" = dontDistribute super."Wordlint"; @@ -1102,6 +1105,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1290,6 +1294,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -1329,6 +1334,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-dejafu" = dontDistribute super."async-dejafu"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1451,6 +1457,7 @@ self: super: { "battleships" = dontDistribute super."battleships"; "bayes-stack" = dontDistribute super."bayes-stack"; "bbdb" = dontDistribute super."bbdb"; + "bbi" = dontDistribute super."bbi"; "bcrypt" = doDistribute super."bcrypt_0_0_6"; "bdd" = dontDistribute super."bdd"; "bdelta" = dontDistribute super."bdelta"; @@ -1566,6 +1573,7 @@ self: super: { "binembed" = dontDistribute super."binembed"; "binembed-example" = dontDistribute super."binembed-example"; "bio" = dontDistribute super."bio"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; "biophd" = dontDistribute super."biophd"; "biosff" = dontDistribute super."biosff"; "biostockholm" = dontDistribute super."biostockholm"; @@ -1677,6 +1685,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_0_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1689,6 +1698,7 @@ self: super: { "bytestring-rematch" = dontDistribute super."bytestring-rematch"; "bytestring-short" = dontDistribute super."bytestring-short"; "bytestring-show" = dontDistribute super."bytestring-show"; + "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder"; "bytestringparser" = dontDistribute super."bytestringparser"; "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; "bytestringreadp" = dontDistribute super."bytestringreadp"; @@ -1815,6 +1825,7 @@ self: super: { "cef" = dontDistribute super."cef"; "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -2033,6 +2044,7 @@ self: super: { "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1"; "conduit-iconv" = dontDistribute super."conduit-iconv"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-parse" = dontDistribute super."conduit-parse"; @@ -2311,6 +2323,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2400,6 +2413,7 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3"; @@ -2438,6 +2452,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2693,6 +2708,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -2925,9 +2941,11 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; + "foscam-sort" = dontDistribute super."foscam-sort"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -2963,6 +2981,7 @@ self: super: { "friday" = dontDistribute super."friday"; "friday-devil" = dontDistribute super."friday-devil"; "friday-juicypixels" = dontDistribute super."friday-juicypixels"; + "friday-scale-dct" = dontDistribute super."friday-scale-dct"; "friendly-time" = dontDistribute super."friendly-time"; "frp-arduino" = dontDistribute super."frp-arduino"; "frpnow" = dontDistribute super."frpnow"; @@ -3458,6 +3477,7 @@ self: super: { "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-mirror" = doDistribute super."hackage-mirror_0_1_0_0"; "hackage-plot" = dontDistribute super."hackage-plot"; "hackage-proxy" = dontDistribute super."hackage-proxy"; "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; @@ -3690,7 +3710,10 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "hasql-th" = dontDistribute super."hasql-th"; + "hasql-transaction" = dontDistribute super."hasql-transaction"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; "haste-compiler" = dontDistribute super."haste-compiler"; @@ -4011,6 +4034,7 @@ self: super: { "hpodder" = dontDistribute super."hpodder"; "hpp" = dontDistribute super."hpp"; "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc" = doDistribute super."hprotoc_2_1_7"; "hprotoc-fork" = dontDistribute super."hprotoc-fork"; "hps" = dontDistribute super."hps"; "hps-cairo" = dontDistribute super."hps-cairo"; @@ -4266,6 +4290,7 @@ self: super: { "human-readable-duration" = dontDistribute super."human-readable-duration"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; + "hunit-dejafu" = dontDistribute super."hunit-dejafu"; "hunit-gui" = dontDistribute super."hunit-gui"; "hunit-parsec" = dontDistribute super."hunit-parsec"; "hunit-rematch" = dontDistribute super."hunit-rematch"; @@ -4442,6 +4467,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4860,6 +4886,7 @@ self: super: { "list-t-libcurl" = dontDistribute super."list-t-libcurl"; "list-t-text" = dontDistribute super."list-t-text"; "list-tries" = dontDistribute super."list-tries"; + "list-zip-def" = dontDistribute super."list-zip-def"; "listlike-instances" = dontDistribute super."listlike-instances"; "lists" = dontDistribute super."lists"; "listsafe" = dontDistribute super."listsafe"; @@ -4897,6 +4924,7 @@ self: super: { "lock-file" = dontDistribute super."lock-file"; "lockfree-queue" = dontDistribute super."lockfree-queue"; "log" = dontDistribute super."log"; + "log-domain" = doDistribute super."log-domain_0_10_3"; "log-effect" = dontDistribute super."log-effect"; "log2json" = dontDistribute super."log2json"; "logfloat" = dontDistribute super."logfloat"; @@ -5162,6 +5190,7 @@ self: super: { "monad-param" = dontDistribute super."monad-param"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; "monad-state" = dontDistribute super."monad-state"; "monad-statevar" = dontDistribute super."monad-statevar"; "monad-stlike-io" = dontDistribute super."monad-stlike-io"; @@ -5430,6 +5459,7 @@ self: super: { "nntp" = dontDistribute super."nntp"; "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; "no-role-annots" = dontDistribute super."no-role-annots"; + "nofib-analyse" = dontDistribute super."nofib-analyse"; "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; @@ -5495,6 +5525,7 @@ self: super: { "omaketex" = dontDistribute super."omaketex"; "omega" = dontDistribute super."omega"; "omnicodec" = dontDistribute super."omnicodec"; + "omnifmt" = dontDistribute super."omnifmt"; "on-a-horse" = dontDistribute super."on-a-horse"; "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; "one-liner" = dontDistribute super."one-liner"; @@ -5514,6 +5545,7 @@ self: super: { "open-typerep" = dontDistribute super."open-typerep"; "open-union" = dontDistribute super."open-union"; "open-witness" = dontDistribute super."open-witness"; + "opencog-atomspace" = dontDistribute super."opencog-atomspace"; "opencv-raw" = dontDistribute super."opencv-raw"; "opendatatable" = dontDistribute super."opendatatable"; "openexchangerates" = dontDistribute super."openexchangerates"; @@ -5580,6 +5612,7 @@ self: super: { "packed-dawg" = dontDistribute super."packed-dawg"; "packedstring" = dontDistribute super."packedstring"; "packer" = dontDistribute super."packer"; + "packman" = dontDistribute super."packman"; "packunused" = dontDistribute super."packunused"; "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; @@ -5594,6 +5627,7 @@ self: super: { "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-include" = dontDistribute super."pandoc-include"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5706,6 +5740,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5749,6 +5784,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = dontDistribute super."pinch"; + "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_6"; @@ -5872,6 +5908,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -5943,6 +5980,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -5966,6 +6004,8 @@ self: super: { "proteaaudio" = dontDistribute super."proteaaudio"; "protobuf" = dontDistribute super."protobuf"; "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers" = doDistribute super."protocol-buffers_2_1_7"; + "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_7"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; "proton-haskell" = dontDistribute super."proton-haskell"; @@ -6149,6 +6189,7 @@ self: super: { "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; + "reedsolomon" = dontDistribute super."reedsolomon"; "reenact" = dontDistribute super."reenact"; "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; "ref" = dontDistribute super."ref"; @@ -6266,6 +6307,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_6"; "respond" = dontDistribute super."respond"; "rest-client" = doDistribute super."rest-client_0_5_0_3"; "rest-core" = doDistribute super."rest-core_0_36_0_6"; @@ -6281,6 +6323,7 @@ self: super: { "rethinkdb" = dontDistribute super."rethinkdb"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "retry" = doDistribute super."retry_0_6"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6352,6 +6395,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -6411,6 +6455,7 @@ self: super: { "satchmo-minisat" = dontDistribute super."satchmo-minisat"; "satchmo-toysat" = dontDistribute super."satchmo-toysat"; "sbp" = dontDistribute super."sbp"; + "sbvPlugin" = dontDistribute super."sbvPlugin"; "sc3-rdu" = dontDistribute super."sc3-rdu"; "scalable-server" = dontDistribute super."scalable-server"; "scaleimage" = dontDistribute super."scaleimage"; @@ -6533,6 +6578,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6577,6 +6623,7 @@ self: super: { "shell-pipe" = dontDistribute super."shell-pipe"; "shellish" = dontDistribute super."shellish"; "shellmate" = dontDistribute super."shellmate"; + "shelly" = doDistribute super."shelly_1_6_4"; "shelly-extra" = dontDistribute super."shelly-extra"; "shivers-cfg" = dontDistribute super."shivers-cfg"; "shoap" = dontDistribute super."shoap"; @@ -6657,6 +6704,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6697,6 +6745,7 @@ self: super: { "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; "snap-extras" = dontDistribute super."snap-extras"; + "snap-language" = dontDistribute super."snap-language"; "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; @@ -6841,6 +6890,7 @@ self: super: { "ssv" = dontDistribute super."ssv"; "stable-heap" = dontDistribute super."stable-heap"; "stable-maps" = dontDistribute super."stable-maps"; + "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; "stack" = doDistribute super."stack_0_1_5_0"; @@ -6919,6 +6969,7 @@ self: super: { "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; "streamproc" = dontDistribute super."streamproc"; "strict-base-types" = dontDistribute super."strict-base-types"; "strict-concurrency" = dontDistribute super."strict-concurrency"; @@ -6963,6 +7014,7 @@ self: super: { "suffixtree" = dontDistribute super."suffixtree"; "sugarhaskell" = dontDistribute super."sugarhaskell"; "suitable" = dontDistribute super."suitable"; + "sump" = dontDistribute super."sump"; "sundown" = dontDistribute super."sundown"; "sunlight" = dontDistribute super."sunlight"; "sunroof-compiler" = dontDistribute super."sunroof-compiler"; @@ -7069,6 +7121,7 @@ self: super: { "task" = dontDistribute super."task"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; + "tasty-dejafu" = dontDistribute super."tasty-dejafu"; "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; "tasty-fail-fast" = dontDistribute super."tasty-fail-fast"; "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2"; @@ -7247,6 +7300,7 @@ self: super: { "timecalc" = dontDistribute super."timecalc"; "timeconsole" = dontDistribute super."timeconsole"; "timeless" = dontDistribute super."timeless"; + "timemap" = dontDistribute super."timemap"; "timeout" = dontDistribute super."timeout"; "timeout-control" = dontDistribute super."timeout-control"; "timeout-with-results" = dontDistribute super."timeout-with-results"; @@ -7300,6 +7354,7 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = dontDistribute super."tracy"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; @@ -7327,6 +7382,7 @@ self: super: { "triangulation" = dontDistribute super."triangulation"; "tries" = dontDistribute super."tries"; "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; "trivia" = dontDistribute super."trivia"; "trivial-constraint" = dontDistribute super."trivial-constraint"; "tropical" = dontDistribute super."tropical"; @@ -7589,6 +7645,7 @@ self: super: { "variable-precision" = dontDistribute super."variable-precision"; "variables" = dontDistribute super."variables"; "varying" = dontDistribute super."varying"; + "vault" = doDistribute super."vault_0_3_0_4"; "vaultaire-common" = dontDistribute super."vaultaire-common"; "vcache" = dontDistribute super."vcache"; "vcache-trie" = dontDistribute super."vcache-trie"; @@ -7635,6 +7692,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; @@ -7654,6 +7712,7 @@ self: super: { "vty-ui" = dontDistribute super."vty-ui"; "vty-ui-extras" = dontDistribute super."vty-ui-extras"; "waddle" = dontDistribute super."waddle"; + "wai" = doDistribute super."wai_3_0_4_0"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_1"; "wai-cors" = doDistribute super."wai-cors_0_2_3"; @@ -7693,6 +7752,7 @@ self: super: { "wai-router" = dontDistribute super."wai-router"; "wai-routes" = doDistribute super."wai-routes_0_7_3"; "wai-routing" = doDistribute super."wai-routing_0_12_1"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-postgresql" = dontDistribute super."wai-session-postgresql"; "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; @@ -7703,6 +7763,7 @@ self: super: { "wai-throttler" = dontDistribute super."wai-throttler"; "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_6"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; @@ -7736,6 +7797,7 @@ self: super: { "web-routes-th" = dontDistribute super."web-routes-th"; "web-routes-transformers" = dontDistribute super."web-routes-transformers"; "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webapp" = dontDistribute super."webapp"; "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; @@ -7863,6 +7925,9 @@ self: super: { "xml-pipe" = dontDistribute super."xml-pipe"; "xml-prettify" = dontDistribute super."xml-prettify"; "xml-push" = dontDistribute super."xml-push"; + "xml-query" = dontDistribute super."xml-query"; + "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; + "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; @@ -7907,6 +7972,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_1"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -7938,13 +8004,16 @@ self: super: { "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; + "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4"; "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a9fa7ae4f10..16ad44023b7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -510,7 +510,6 @@ self: { homepage = "http://www.haskell.org/asn1"; description = "ASN.1 support for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AVar" = callPackage @@ -841,7 +840,6 @@ self: { homepage = "http://allureofthestars.com"; description = "Near-future Sci-Fi roguelike and tactical squad game"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AndroidViewHierarchyImporter" = callPackage @@ -1158,6 +1156,7 @@ self: { homepage = "http://bnfc.digitalgrammars.com/"; description = "A compiler front-end generator"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BNFC-meta" = callPackage @@ -1529,7 +1528,6 @@ self: { homepage = "https://github.com/choener/BiobaseTypes"; description = "Collection of types for bioinformatics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiobaseVienna" = callPackage @@ -1571,7 +1569,6 @@ self: { homepage = "https://github.com/choener/BiobaseXNA"; description = "Efficient RNA/DNA representations"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BirdPP" = callPackage @@ -1601,7 +1598,6 @@ self: { homepage = "https://github.com/joecrayne/hs-bitsyntax"; description = "A module to aid in the (de)serialisation of binary data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Bitly" = callPackage @@ -2242,7 +2238,6 @@ self: { jailbreak = true; description = "A CSP-M parser compatible with FDR-2.91"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CSPM-Interpreter" = callPackage @@ -2260,7 +2255,6 @@ self: { jailbreak = true; description = "An interpreter for CSPM"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CSPM-ToProlog" = callPackage @@ -2277,7 +2271,6 @@ self: { jailbreak = true; description = "some modules specific for the ProB tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CSPM-cspm" = callPackage @@ -2438,6 +2431,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Cabal_1_22_5_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, extensible-exceptions, filepath, HUnit + , old-time, pretty, process, QuickCheck, regex-posix + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , time, unix + }: + mkDerivation { + pname = "Cabal"; + version = "1.22.5.0"; + sha256 = "0e371856c4a5042954e29dee01aa29e340b35af1cc2e1996c2cc939f0150449e"; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + pretty process time unix + ]; + testHaskellDepends = [ + base bytestring containers directory extensible-exceptions filepath + HUnit old-time process QuickCheck regex-posix test-framework + test-framework-hunit test-framework-quickcheck2 unix + ]; + jailbreak = true; + doCheck = false; + homepage = "http://www.haskell.org/cabal/"; + description = "A framework for packaging Haskell software"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Cabal-ide-backend" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , deepseq, directory, extensible-exceptions, filepath, HUnit @@ -2808,7 +2829,6 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Utility functions for using the chart library with GTK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-simple" = callPackage @@ -2827,7 +2847,6 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A wrapper for the chart library to assist with basic plots (Deprecated - use the Easy module instead)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ChasingBottoms_1_3_0_8" = callPackage @@ -3471,7 +3490,6 @@ self: { homepage = "http://github.com/amtal/CoreErlang"; description = "Manipulating Core Erlang source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CoreFoundation" = callPackage @@ -4121,7 +4139,6 @@ self: { homepage = "http://github.com/sordina/Deadpan-DDP"; description = "Write clients for Meteor's DDP Protocol"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DebugTraceHelpers" = callPackage @@ -4847,7 +4864,6 @@ self: { homepage = "http://rwd.rdockins.name/edison/home/"; description = "A library of efficent, purely-functional data structures (Core Implementations)"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "EditTimeReport" = callPackage @@ -5309,7 +5325,6 @@ self: { homepage = "http://www.cs.kent.ac.uk/~oc/pretty.html"; description = "Efficient simple pretty printing combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FTGL" = callPackage @@ -6151,7 +6166,6 @@ self: { homepage = "http://github.com/sordina/GLM"; description = "Simple Gridlab-D GLM parser and utilities"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GLMatrix" = callPackage @@ -6329,7 +6343,7 @@ self: { libraryToolDepends = [ cpphs ]; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GPX" = callPackage @@ -6515,7 +6529,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/GeBoP"; description = "Several games"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GenI" = callPackage @@ -7097,7 +7110,6 @@ self: { homepage = "http://haskell.org/haskellwiki/GtkTV"; description = "Gtk-based GUIs for Tangible Values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GuiHaskell" = callPackage @@ -8797,7 +8809,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "HTTP" = callPackage + "HTTP_4000_2_21" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive, conduit , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl , network, network-uri, old-time, parsec, pureMD5, split @@ -8820,6 +8832,32 @@ self: { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "HTTP" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive, conduit + , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl + , network, network-uri, old-time, parsec, pureMD5, split + , test-framework, test-framework-hunit, wai, warp + }: + mkDerivation { + pname = "HTTP"; + version = "4000.2.22"; + sha256 = "3e212c927aa4524b95425fdd6500c06d3dea145c5b3f46ce6634bc1d1769469c"; + libraryHaskellDepends = [ + array base bytestring mtl network network-uri old-time parsec + ]; + testHaskellDepends = [ + base bytestring case-insensitive conduit conduit-extra deepseq + http-types httpd-shed HUnit mtl network network-uri pureMD5 split + test-framework test-framework-hunit wai warp + ]; + jailbreak = true; + doCheck = false; + homepage = "https://github.com/haskell/HTTP"; + description = "A library for client-side HTTP"; + license = stdenv.lib.licenses.bsd3; }) {}; "HTTP-Simple" = callPackage @@ -10010,8 +10048,8 @@ self: { }: mkDerivation { pname = "Hoed"; - version = "0.3.1"; - sha256 = "69edfc4448adfb2ef1883b8540cf9f134eb567e5d02d77076ede0e0e1bb9bfab"; + version = "0.3.2"; + sha256 = "b7a7101f0b27c0917ca8f1e4a9777735d86ffd05bf258ddef650a967e67d4735"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10684,8 +10722,8 @@ self: { ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }: mkDerivation { pname = "IntervalMap"; - version = "0.4.0.1"; - sha256 = "2e57335d4bc32de03c5b36b2d1f299a49d712105798d3fa5245a67ae6a6d0033"; + version = "0.4.1.1"; + sha256 = "eda9176e35ae9988770af216ba69d7a714f1baec7344789c03f3eaec0a4af423"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base Cabal containers deepseq QuickCheck ]; homepage = "http://www.chr-breitkopf.de/comp/IntervalMap"; @@ -11137,7 +11175,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "JuicyPixels" = callPackage + "JuicyPixels_3_2_6_2" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl , primitive, transformers, vector, zlib }: @@ -11152,6 +11190,26 @@ self: { homepage = "https://github.com/Twinside/Juicy.Pixels"; description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "JuicyPixels" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl + , primitive, transformers, vector, zlib + }: + mkDerivation { + pname = "JuicyPixels"; + version = "3.2.6.4"; + sha256 = "6268583fd7915913b3d68a399184bfcfebfaa010be9aa10232d76324df65a6ac"; + revision = "1"; + editedCabalFile = "98af5e6f6f65e399f518466813f6ada6cfa80ebc1eae6ba98525065f985ced15"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq mtl primitive + transformers vector zlib + ]; + homepage = "https://github.com/Twinside/Juicy.Pixels"; + description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; + license = stdenv.lib.licenses.bsd3; }) {}; "JuicyPixels-canvas" = callPackage @@ -11450,6 +11508,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Kriens" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "Kriens"; + version = "0.1.0.1"; + sha256 = "5c8fa68abb1db66c234dcb378cf0de08b21e3e6a2daaf888feda5a0c0c22d9ac"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/matteoprovenzano/kriens-hs.git"; + description = "Category for Continuation Passing Style"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "KyotoCabinet" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions , kyotocabinet @@ -11583,7 +11653,6 @@ self: { homepage = "http://github.com/LambdaHack/LambdaHack"; description = "A game engine library for roguelike dungeon crawlers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; "LambdaINet" = callPackage @@ -11772,17 +11841,26 @@ self: { }) {}; "LibClang" = callPackage - ({ mkDerivation, base, greencard, time }: + ({ mkDerivation, base, bytestring, c2hs, filepath, hashable, mtl + , ncurses, resourcet, text, time, transformers, transformers-base + , vector + }: mkDerivation { pname = "LibClang"; - version = "0.1.0"; - sha256 = "4bde70794072a231d0faffff1f14a477e9a9999002e5f1134bd4c09edaab6b89"; - libraryHaskellDepends = [ base greencard time ]; + version = "3.4.0"; + sha256 = "b4bdd8fb7fa103b7045534ae43f00bb3d4ad53e909a49feff081f06751e4a44d"; + libraryHaskellDepends = [ + base bytestring filepath hashable mtl resourcet text time + transformers transformers-base vector + ]; + librarySystemDepends = [ ncurses ]; + libraryToolDepends = [ c2hs ]; + jailbreak = true; homepage = "https://github.com/chetant/LibClang/issues"; description = "Haskell bindings for libclang (a C++ parsing library)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) ncurses;}; "LibZip" = callPackage ({ mkDerivation, base, bindings-libzip, bytestring, directory @@ -11831,6 +11909,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "LinguisticsTypes" = callPackage + ({ mkDerivation, aeson, base, bimaps, binary, bytestring, cereal + , cereal-text, deepseq, hashable, intern, log-domain, QuickCheck + , stringable, test-framework, test-framework-quickcheck2 + , test-framework-th, text, text-binary, vector-th-unbox + }: + mkDerivation { + pname = "LinguisticsTypes"; + version = "0.0.0.2"; + sha256 = "9f5a722b1f88207b42801a72b6fc95453f134b7a4252251876a4ef069b7b4bcb"; + libraryHaskellDepends = [ + aeson base bimaps binary bytestring cereal cereal-text deepseq + hashable intern log-domain QuickCheck stringable text text-binary + vector-th-unbox + ]; + testHaskellDepends = [ + aeson base binary cereal QuickCheck stringable test-framework + test-framework-quickcheck2 test-framework-th + ]; + homepage = "https://github.com/choener/LinguisticsTypes"; + description = "Collection of types for natural language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "LinkChecker" = callPackage ({ mkDerivation, base, containers, haskell98, HTTP, mtl, network , tagsoup @@ -12490,7 +12592,7 @@ self: { doHaddock = false; description = "OpenGL for dummies"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MicrosoftTranslator" = callPackage @@ -13230,26 +13332,27 @@ self: { "NaturalLanguageAlphabets" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, bimaps, binary , bytestring, cereal, cereal-text, deepseq, file-embed, hashable - , hashtables, intern, QuickCheck, stringable, system-filepath + , intern, LinguisticsTypes, QuickCheck, stringable, system-filepath , test-framework, test-framework-quickcheck2, test-framework-th , text, text-binary, unordered-containers, vector, vector-th-unbox }: mkDerivation { pname = "NaturalLanguageAlphabets"; - version = "0.0.2.0"; - sha256 = "cde8672cfcf65e0ca4944526789f52f7021ac164bd83fc779030f3c1ffacb878"; + version = "0.1.0.0"; + sha256 = "c233d60b74a4131705e36b5873fae2973f168b8c1c0717055c6d546d40ac6215"; libraryHaskellDepends = [ aeson array attoparsec base bimaps binary bytestring cereal - cereal-text deepseq file-embed hashable hashtables intern + cereal-text deepseq file-embed hashable intern LinguisticsTypes QuickCheck stringable system-filepath text text-binary unordered-containers vector vector-th-unbox ]; testHaskellDepends = [ - aeson base binary cereal QuickCheck stringable test-framework - test-framework-quickcheck2 test-framework-th text + aeson base binary cereal LinguisticsTypes QuickCheck stringable + test-framework test-framework-quickcheck2 test-framework-th text + unordered-containers ]; homepage = "https://github.com/choener/NaturalLanguageAlphabets"; - description = "Alphabet and word representations"; + description = "Simple scoring schemes for word alignments"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -14042,8 +14145,8 @@ self: { }: mkDerivation { pname = "OpenGL"; - version = "2.13.1.0"; - sha256 = "f90dd7cf444ff6827ba947a91a3c513f54e4e987aed51ec741a43202ba0ed325"; + version = "2.13.1.1"; + sha256 = "6db5b3530e234bc643e3279ccbc78992b5e8f462f618593e2cebc80aa9abe0a6"; libraryHaskellDepends = [ base bytestring containers GLURaw ObjectName OpenGLRaw StateVar text transformers @@ -14116,8 +14219,8 @@ self: { }: mkDerivation { pname = "OpenGLRaw"; - version = "2.6.0.0"; - sha256 = "e962c18eb40d6e1ef7c2c3a877b0be14c35dbf533612d33074d5011bd266cc0d"; + version = "2.6.1.0"; + sha256 = "3d41249d8feb456889d79939a59e3f2a7b1c771b514fbdcc352ae4f676aa9db0"; libraryHaskellDepends = [ base bytestring containers half text transformers ]; @@ -14268,7 +14371,6 @@ self: { homepage = "https://github.com/choener/OrderedBits"; description = "Efficient ordered (by popcount) enumeration of bits"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ordinals" = callPackage @@ -14451,25 +14553,24 @@ self: { }) {}; "Paraiso" = callPackage - ({ mkDerivation, array, base, containers, control-monad-failure - , directory, fgl, filepath, HUnit, ListLike, listlike-instances - , mtl, numeric-prelude, QuickCheck, random, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - , typelevel-tensor, vector + ({ mkDerivation, array, base, containers, directory, failure, fgl + , filepath, HUnit, mtl, numeric-prelude, process, QuickCheck + , random, repa, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, typelevel-tensor, vector }: mkDerivation { pname = "Paraiso"; - version = "0.3.1.3"; - sha256 = "29f2154111be164bf7018b6f4b453af81e5a6931d4252795feead058a48dfa9c"; + version = "0.3.1.5"; + sha256 = "4448a2a736f5fec503927d6dc9b5729ef67c818bd2ee14044bcf6c0614951525"; libraryHaskellDepends = [ - array base containers control-monad-failure directory fgl filepath - mtl numeric-prelude random text typelevel-tensor vector + array base containers directory failure fgl filepath mtl + numeric-prelude random text typelevel-tensor vector ]; testHaskellDepends = [ - array base containers control-monad-failure directory fgl filepath - HUnit ListLike listlike-instances mtl numeric-prelude QuickCheck - random test-framework test-framework-hunit - test-framework-quickcheck2 text typelevel-tensor vector + array base containers directory fgl filepath HUnit mtl + numeric-prelude process QuickCheck random repa test-framework + test-framework-hunit test-framework-quickcheck2 text + typelevel-tensor vector ]; homepage = "http://www.paraiso-lang.org/wiki/index.php/Main_Page"; description = "a code generator for partial differential equations solvers"; @@ -14730,7 +14831,6 @@ self: { executableHaskellDepends = [ base containers generic-accessors ]; description = "Real-time line plotter for generic data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PlslTools" = callPackage @@ -14839,7 +14939,6 @@ self: { homepage = "https://github.com/choener/PrimitiveArray"; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Printf-TH" = callPackage @@ -16071,16 +16170,19 @@ self: { }) {}; "SDL-image" = callPackage - ({ mkDerivation, base, SDL }: + ({ mkDerivation, base, SDL, SDL_image }: mkDerivation { pname = "SDL-image"; - version = "0.6.1.1"; - sha256 = "f88b713e9c33a72e8b7a2a4e16871c6b8b993599538aff2faae8622388c002d4"; + version = "0.6.1.2"; + sha256 = "01892919dc9576c9a7b7c6698f2308c9caca61afa5550197be1fdb1231e56df9"; + revision = "1"; + editedCabalFile = "7e837026adb1262504d8bc4799628961f66200ad1a5f25e2b6b5842f0618dd6b"; libraryHaskellDepends = [ base SDL ]; + librarySystemDepends = [ SDL_image ]; description = "Binding to libSDL_image"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {}; + }) {inherit (pkgs) SDL_image;}; "SDL-mixer" = callPackage ({ mkDerivation, base, SDL, SDL_mixer }: @@ -16088,6 +16190,8 @@ self: { pname = "SDL-mixer"; version = "0.6.2.0"; sha256 = "1969170ee9d20811697f1f3d3150d388d45a809ea3d72495980da0968e5719ba"; + revision = "1"; + editedCabalFile = "9f17a645f815b3a0f47507263f0d2a8f57ff9d6893c8c967a7241e16e68b7ca4"; libraryHaskellDepends = [ base SDL ]; librarySystemDepends = [ SDL_mixer ]; description = "Binding to libSDL_mixer"; @@ -16401,14 +16505,15 @@ self: { "SWMMoutGetMB" = callPackage ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 - , split + , pipes-binary, pipes-bytestring, pipes-parse, split }: mkDerivation { pname = "SWMMoutGetMB"; - version = "0.1.0.1"; - sha256 = "a5bc7fb2c1b55dc8bc741bc0a7de92ceb7a5f418efbd2c43cc515b94c2c41083"; + version = "0.1.1.1"; + sha256 = "60b2a2188eaeb2b32bfae2b74a0b61daa25f3c5470cb2babf8082b8a52828f69"; libraryHaskellDepends = [ - base binary bytestring data-binary-ieee754 split + base binary bytestring data-binary-ieee754 pipes-binary + pipes-bytestring pipes-parse split ]; homepage = "https://github.com/siddhanathan/SWMMoutGetMB"; description = "A parser for SWMM 5 binary .OUT files"; @@ -16500,19 +16605,22 @@ self: { }) {}; "SciFlow" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, mtl, shelly - , template-haskell, text, unordered-containers, yaml + ({ mkDerivation, base, bytestring, data-default-class, lens, mtl + , optparse-applicative, shelly, split, template-haskell, text + , th-lift, unordered-containers, yaml }: mkDerivation { pname = "SciFlow"; - version = "0.2.0"; - sha256 = "cfa24767f5c92f1e4e4baeb68382e83c7939d7715342e1a7005e16590b2b70b3"; + version = "0.3.0"; + sha256 = "f23c90f2708edde150c16eff8692ac8cd47bbf2455aaa355c0546e1f9cb0becf"; libraryHaskellDepends = [ - base bytestring data-default-class mtl shelly template-haskell text - unordered-containers yaml + base bytestring data-default-class lens mtl optparse-applicative + shelly split template-haskell text th-lift unordered-containers + yaml ]; description = "Scientific workflow management system"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ScratchFs" = callPackage @@ -16946,8 +17054,8 @@ self: { }: mkDerivation { pname = "SoccerFun"; - version = "0.5.2"; - sha256 = "2738039162c61a5bf7754890d289af4da3ebb6edde0a26d1d204d91726918f77"; + version = "0.5.3"; + sha256 = "1219c1cdf6f9cbfd6dfe27c22fc86c12e47625bddf1f973da50fdd4f51ddb789"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16967,8 +17075,8 @@ self: { }: mkDerivation { pname = "SoccerFunGL"; - version = "0.5.1"; - sha256 = "2ea688f1171d9ea2c747c351087e02c1c21671c4b73c62bc27f482a0e28af8e7"; + version = "0.5.3"; + sha256 = "4eabc997d8e247d127c5cfa07242cb87ba868bf9893f93773e6a155350b4450a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18613,7 +18721,6 @@ self: { homepage = "http://github.com/grwlf/vkhs"; description = "Provides access to Vkontakte social network via public API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) curl;}; "Validation" = callPackage @@ -18848,7 +18955,7 @@ self: { ]; description = "Parsers and utilities for the OBJ WaveFront 3D model format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Weather" = callPackage @@ -19166,6 +19273,46 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "WordAlignment" = callPackage + ({ mkDerivation, ADPfusion, AlignmentAlgorithms, ascii-progress + , attoparsec, base, bytestring, cmdargs, containers + , control-monad-omega, deepseq, file-embed, fmlist, FormalGrammars + , ghc-prim, GrammarProducts, hashable, intern, lens + , LinguisticsTypes, NaturalLanguageAlphabets, parallel, primitive + , PrimitiveArray, QuickCheck, strict, stringable, template-haskell + , test-framework, test-framework-quickcheck2, test-framework-th + , text, text-format, transformers, tuple-th, unordered-containers + , vector + }: + mkDerivation { + pname = "WordAlignment"; + version = "0.1.0.0"; + sha256 = "0182ffbf3dfddcabd73dce16eef232fce5c680125391ce881ddf2b81c97593d0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ADPfusion AlignmentAlgorithms attoparsec base bytestring containers + control-monad-omega deepseq file-embed fmlist FormalGrammars + ghc-prim GrammarProducts hashable intern lens LinguisticsTypes + NaturalLanguageAlphabets primitive PrimitiveArray strict stringable + template-haskell text text-format transformers tuple-th + unordered-containers vector + ]; + executableHaskellDepends = [ + ascii-progress base bytestring cmdargs containers file-embed intern + LinguisticsTypes NaturalLanguageAlphabets parallel strict text + unordered-containers vector + ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + test-framework-th + ]; + homepage = "https://github.com/choener/WordAlignment"; + description = "Bigram word pair alignments"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "WordNet" = callPackage ({ mkDerivation, array, base, containers, filepath }: mkDerivation { @@ -20257,7 +20404,6 @@ self: { homepage = "http://code.haskell.org/~thielema/accelerate-fftw/"; description = "Accelerate frontend to the FFTW library (Fourier transform)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-fourier" = callPackage @@ -20319,7 +20465,6 @@ self: { homepage = "https://github.com/AccelerateHS/accelerate-io"; description = "Read and write Accelerate arrays in various formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-random" = callPackage @@ -20416,27 +20561,6 @@ self: { }) {}; "acid-state" = callPackage - ({ mkDerivation, array, base, bytestring, cereal, containers - , directory, extensible-exceptions, filepath, mtl, network - , safecopy, stm, template-haskell, unix - }: - mkDerivation { - pname = "acid-state"; - version = "0.13.1"; - sha256 = "114fd57ee31529fcde7b7fcdb70face4095fd0aa879655b1b47ceb1cba6591b3"; - revision = "1"; - editedCabalFile = "dbcdc9e45fd8c20f27a82019a8375a9cd81a4568e60f2a4ec8125e3b8d2d5377"; - libraryHaskellDepends = [ - array base bytestring cereal containers directory - extensible-exceptions filepath mtl network safecopy stm - template-haskell unix - ]; - homepage = "http://acid-state.seize.it/"; - description = "Add ACID guarantees to any serializable Haskell data structure"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "acid-state_0_14_0" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , directory, extensible-exceptions, filepath, mtl, network , safecopy, stm, template-haskell, unix @@ -20453,7 +20577,6 @@ self: { homepage = "http://acid-state.seize.it/"; description = "Add ACID guarantees to any serializable Haskell data structure"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acid-state-dist" = callPackage @@ -20473,6 +20596,7 @@ self: { testHaskellDepends = [ acid-state base directory mtl random safecopy ]; + jailbreak = true; description = "A replication backend for acid-state"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -21663,8 +21787,8 @@ self: { }: mkDerivation { pname = "aeson-casing"; - version = "0.1.0.2"; - sha256 = "5df9102c4c4f63d87314fd1d09bdcfa9bd4ebd2efee40e66bf651a1bc848211f"; + version = "0.1.0.4"; + sha256 = "706139db4d17cae7a770802b3103584b3fa1c0d7db5ae2d463cfbaa99549bb5b"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base tasty tasty-hunit tasty-quickcheck tasty-th @@ -21752,6 +21876,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-extra_0_2_3_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , exceptions, hashable, quickcheck-instances, scientific, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "aeson-extra"; + version = "0.2.3.0"; + sha256 = "43ace09b9c03c5c55216b2062228bda94e5fd23333a0cc1eca0e5478546f9e77"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers exceptions hashable + scientific template-haskell text time unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers exceptions hashable + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + template-haskell text time unordered-containers vector + ]; + homepage = "https://github.com/phadej/aeson-extra#readme"; + description = "Extra goodies for aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-filthy" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, text , unordered-containers @@ -21769,6 +21918,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-iproute" = callPackage + ({ mkDerivation, aeson, base, iproute, text }: + mkDerivation { + pname = "aeson-iproute"; + version = "0.1.1"; + sha256 = "9fc733cbe7d47e69b33a0003a73e82f337846006de672f87ce1eafbe6bc159af"; + libraryHaskellDepends = [ aeson base iproute text ]; + homepage = "https://github.com/greydot/aeson-iproute"; + description = "Aeson instances for iproute types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-lens" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, lens, text , unordered-containers, vector @@ -22560,7 +22721,7 @@ self: { homepage = "http://github.com/phaazon/al"; description = "OpenAL 1.1 raw API."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openal;}; "alarmclock_0_2_0_5" = callPackage @@ -22670,7 +22831,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) perl;}; - "alex" = callPackage + "alex_3_1_5" = callPackage ({ mkDerivation, array, base, containers, directory, happy, process , QuickCheck }: @@ -22689,6 +22850,28 @@ self: { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "alex" = callPackage + ({ mkDerivation, array, base, containers, directory, happy, process + , QuickCheck + }: + mkDerivation { + pname = "alex"; + version = "3.1.6"; + sha256 = "2858e6784b60b4cd3e5d7b514ca15663a363c4ca2e44e019b73064168afdfe2f"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base containers directory QuickCheck + ]; + executableToolDepends = [ happy ]; + testHaskellDepends = [ base process ]; + doCheck = false; + homepage = "http://www.haskell.org/alex/"; + description = "Alex is a tool for generating lexical analysers in Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "alex-meta" = callPackage @@ -23349,27 +23532,6 @@ self: { }) {}; "amazonka" = callPackage - ({ mkDerivation, amazonka-core, base, bytestring, conduit - , conduit-extra, directory, exceptions, http-conduit, ini, lens - , mmorph, monad-control, mtl, resourcet, retry, tasty, tasty-hunit - , text, time, transformers, transformers-base, transformers-compat - }: - mkDerivation { - pname = "amazonka"; - version = "1.3.5.1"; - sha256 = "ad61576236ca5dcf2690fa830e9f2b2ed0e0a439f35fcaadf153adab02b14427"; - libraryHaskellDepends = [ - amazonka-core base bytestring conduit conduit-extra directory - exceptions http-conduit ini lens mmorph monad-control mtl resourcet - retry text time transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Comprehensive Amazon Web Services SDK"; - license = "unknown"; - }) {}; - - "amazonka_1_3_6" = callPackage ({ mkDerivation, amazonka-core, base, bytestring, conduit , conduit-extra, directory, exceptions, http-conduit, ini, lens , mmorph, monad-control, mtl, resourcet, retry, tasty, tasty-hunit @@ -23385,32 +23547,12 @@ self: { retry text time transformers transformers-base transformers-compat ]; testHaskellDepends = [ base tasty tasty-hunit ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Comprehensive Amazon Web Services SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-apigateway" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-apigateway"; - version = "1.3.5"; - sha256 = "ea994081797bd6ecd1e202863421528199a73282724d313243a5121995c72e09"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon API Gateway SDK"; - license = "unknown"; - }) {}; - - "amazonka-apigateway_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -23423,11 +23565,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon API Gateway SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-autoscaling_0_3_3" = callPackage @@ -23473,24 +23613,6 @@ self: { }) {}; "amazonka-autoscaling" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-autoscaling"; - version = "1.3.5"; - sha256 = "44e4d2fbaa4ff6cbc223dea51e4deac5bb37ee7ec4d932e80a0c0ff8ca9cf1d0"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Auto Scaling SDK"; - license = "unknown"; - }) {}; - - "amazonka-autoscaling_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -23503,11 +23625,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudformation_0_3_3" = callPackage @@ -23553,24 +23673,6 @@ self: { }) {}; "amazonka-cloudformation" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudformation"; - version = "1.3.5"; - sha256 = "bf56d6e0ed7e2f166e7c250ad5873c74374d9f479a5734f4822482556f9598d5"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudFormation SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudformation_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -23583,11 +23685,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudfront_0_3_3" = callPackage @@ -23633,24 +23733,6 @@ self: { }) {}; "amazonka-cloudfront" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudfront"; - version = "1.3.5"; - sha256 = "6fe3a44979687a1b6d6624924fd237dc22eb842f43e6c490a73075da31b5b734"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudFront SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudfront_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -23663,11 +23745,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudhsm_0_3_3" = callPackage @@ -23713,24 +23793,6 @@ self: { }) {}; "amazonka-cloudhsm" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudhsm"; - version = "1.3.5"; - sha256 = "9b2103b20cbd62dd43bacad9c37e265312bdbc18da544d947e16e07bc325ecd3"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudHSM SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudhsm_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -23743,11 +23805,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch_0_3_3" = callPackage @@ -23793,24 +23853,6 @@ self: { }) {}; "amazonka-cloudsearch" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudsearch"; - version = "1.3.5"; - sha256 = "a8943c444acb8f82facecd8f1da290e0ec0018e13599730cd871325e8b127f88"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudSearch SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudsearch_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -23823,11 +23865,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch-domains_0_3_3" = callPackage @@ -23873,24 +23913,6 @@ self: { }) {}; "amazonka-cloudsearch-domains" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudsearch-domains"; - version = "1.3.5"; - sha256 = "d36f3ee550fc80513623a566b75b0a0eba06b30a2aa54848997f56e371d3c3c4"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudSearch Domain SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudsearch-domains_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -23903,11 +23925,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudtrail_0_3_3" = callPackage @@ -23953,24 +23973,6 @@ self: { }) {}; "amazonka-cloudtrail" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudtrail"; - version = "1.3.5"; - sha256 = "bbbe8345cbc0a214157b42570528902adcc5078a9a459c8fa66a8dd9a3897941"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudTrail SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudtrail_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -23983,11 +23985,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch_0_3_3" = callPackage @@ -24033,24 +24033,6 @@ self: { }) {}; "amazonka-cloudwatch" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudwatch"; - version = "1.3.5"; - sha256 = "e5f4b1aaa761fdefa154cb7bb919bb24aa05d1e6bd01435216f6700f449e3213"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudWatch SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudwatch_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -24063,11 +24045,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch-logs_0_3_3" = callPackage @@ -24113,24 +24093,6 @@ self: { }) {}; "amazonka-cloudwatch-logs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudwatch-logs"; - version = "1.3.5"; - sha256 = "56068fc2720966da3042a6ec03049e9ad97ed1ee8ab047a870fbef135577601a"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudWatch Logs SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudwatch-logs_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -24143,32 +24105,12 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codecommit" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-codecommit"; - version = "1.3.5"; - sha256 = "f857e99df916c7de580eaed343f08524bd316f359f1decf7a1c4d1933db704b1"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CodeCommit SDK"; - license = "unknown"; - }) {}; - - "amazonka-codecommit_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -24181,11 +24123,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeCommit SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codedeploy_0_3_3" = callPackage @@ -24231,24 +24171,6 @@ self: { }) {}; "amazonka-codedeploy" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-codedeploy"; - version = "1.3.5"; - sha256 = "0fd75582517dff6c290640eb41e117baa626c9f4134de867e8534db1746c5442"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CodeDeploy SDK"; - license = "unknown"; - }) {}; - - "amazonka-codedeploy_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -24261,32 +24183,12 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codepipeline" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-codepipeline"; - version = "1.3.5"; - sha256 = "57df1e51da45a6bc413d750e163b2af29f18cae6cc04c4a5d296e566728f4b9f"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CodePipeline SDK"; - license = "unknown"; - }) {}; - - "amazonka-codepipeline_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -24299,11 +24201,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodePipeline SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-identity_0_3_3" = callPackage @@ -24349,24 +24249,6 @@ self: { }) {}; "amazonka-cognito-identity" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cognito-identity"; - version = "1.3.5"; - sha256 = "28ddaf8d06125be07068d324b21b66387d9cb424acba957a7c8d1e4ad04e1a72"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Cognito Identity SDK"; - license = "unknown"; - }) {}; - - "amazonka-cognito-identity_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -24379,11 +24261,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-sync_0_3_3" = callPackage @@ -24429,24 +24309,6 @@ self: { }) {}; "amazonka-cognito-sync" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cognito-sync"; - version = "1.3.5"; - sha256 = "d172d06e115f86d1ef349f944233edf0377c0d737f7f4e72a8edbd1fdf537eb2"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Cognito Sync SDK"; - license = "unknown"; - }) {}; - - "amazonka-cognito-sync_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -24459,11 +24321,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-config_0_3_3" = callPackage @@ -24509,24 +24369,6 @@ self: { }) {}; "amazonka-config" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-config"; - version = "1.3.5"; - sha256 = "43e9d8103d40b13b77ba7d07c6bcbf6ab7e1419ae38aacebb3816caf039c49f1"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Config SDK"; - license = "unknown"; - }) {}; - - "amazonka-config_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -24539,11 +24381,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-core_0_3_3" = callPackage @@ -24638,36 +24478,6 @@ self: { }) {}; "amazonka-core" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring - , case-insensitive, conduit, conduit-extra, cryptonite, exceptions - , hashable, http-conduit, http-types, lens, memory, mtl, QuickCheck - , quickcheck-unicode, resourcet, scientific, semigroups, tagged - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , time, transformers, transformers-compat, unordered-containers - , xml-conduit, xml-types - }: - mkDerivation { - pname = "amazonka-core"; - version = "1.3.5.1"; - sha256 = "112e9af0af8483ccb88115a6b23b3e0197679f549b1f74ed6e5f5572b9798ef1"; - libraryHaskellDepends = [ - aeson attoparsec base bifunctors bytestring case-insensitive - conduit conduit-extra cryptonite exceptions hashable http-conduit - http-types lens memory mtl resourcet scientific semigroups tagged - text time transformers transformers-compat unordered-containers - xml-conduit xml-types - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive http-types lens QuickCheck - quickcheck-unicode tasty tasty-hunit tasty-quickcheck - template-haskell text time - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Core data types and functionality for Amazonka libraries"; - license = "unknown"; - }) {}; - - "amazonka-core_1_3_6" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , case-insensitive, conduit, conduit-extra, cryptonite, exceptions , hashable, http-conduit, http-types, lens, memory, mtl, QuickCheck @@ -24695,7 +24505,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Core data types and functionality for Amazonka libraries"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-datapipeline_0_3_3" = callPackage @@ -24741,24 +24550,6 @@ self: { }) {}; "amazonka-datapipeline" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-datapipeline"; - version = "1.3.5"; - sha256 = "febf62885892f38a92dc133e2c1a8bcfd3cfde981378200f5c1083869862d277"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Data Pipeline SDK"; - license = "unknown"; - }) {}; - - "amazonka-datapipeline_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -24771,32 +24562,12 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-devicefarm" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-devicefarm"; - version = "1.3.5"; - sha256 = "9c9de88c3074368aeb66c4ebff9aea751d87f3afbc6b181a9b601fc4acffb922"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Device Farm SDK"; - license = "unknown"; - }) {}; - - "amazonka-devicefarm_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -24809,11 +24580,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Device Farm SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-directconnect_0_3_3" = callPackage @@ -24859,24 +24628,6 @@ self: { }) {}; "amazonka-directconnect" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-directconnect"; - version = "1.3.5"; - sha256 = "17c84e6dffda69ab92d608982c42cc08b5bbb99ace263d91d0f5469e6d1e9b94"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Direct Connect SDK"; - license = "unknown"; - }) {}; - - "amazonka-directconnect_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -24889,32 +24640,12 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ds" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ds"; - version = "1.3.5"; - sha256 = "90182a5a1b0e21a4fb79a6be7a138b9550e7da8af0a6cf2f0644997c1203d7b5"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Directory Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ds_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -24927,11 +24658,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Directory Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dynamodb_0_3_3" = callPackage @@ -24977,24 +24706,6 @@ self: { }) {}; "amazonka-dynamodb" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-dynamodb"; - version = "1.3.5"; - sha256 = "3377fafd4871e7cbcd596835cd0757fc5536ce69951f1384ecd9f762f5910730"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon DynamoDB SDK"; - license = "unknown"; - }) {}; - - "amazonka-dynamodb_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -25007,32 +24718,12 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dynamodb-streams" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-dynamodb-streams"; - version = "1.3.5"; - sha256 = "678f9d544bfef5f868d49c45cb94873786b045689b2ea996b62adf2b7d317035"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon DynamoDB Streams SDK"; - license = "unknown"; - }) {}; - - "amazonka-dynamodb-streams_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -25045,11 +24736,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB Streams SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ec2_0_3_3" = callPackage @@ -25114,8 +24803,8 @@ self: { }: mkDerivation { pname = "amazonka-ec2"; - version = "1.3.5"; - sha256 = "48f4dbfff89de077e2affa034582f84adeb4e3062dbe1c441bce16000f991702"; + version = "1.3.6"; + sha256 = "d5756ef1f17d84b9e50647477e244e56560d676d5dea35b8c1ea53b5684d4c97"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -25128,26 +24817,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "amazonka-ec2_1_3_6" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ec2"; - version = "1.3.6"; - sha256 = "d5756ef1f17d84b9e50647477e244e56560d676d5dea35b8c1ea53b5684d4c97"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Compute Cloud SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "amazonka-ecs_0_3_3" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { @@ -25191,24 +24860,6 @@ self: { }) {}; "amazonka-ecs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ecs"; - version = "1.3.5"; - sha256 = "98c59a07297ca26db89b316855176fab1b02e4e899eb973bfd527cc0bb503ed4"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon EC2 Container Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ecs_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -25221,32 +24872,12 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-efs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-efs"; - version = "1.3.5"; - sha256 = "c0e531ab119e260af63805287b30aec2e616d2e4fd530262ef8c91db1795b59f"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic File System SDK"; - license = "unknown"; - }) {}; - - "amazonka-efs_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -25259,11 +24890,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic File System SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticache_0_3_3" = callPackage @@ -25309,24 +24938,6 @@ self: { }) {}; "amazonka-elasticache" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elasticache"; - version = "1.3.5"; - sha256 = "a835c08c622896ed353aca1ec7b838015cf8801706f48edcc8666e7330338e18"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon ElastiCache SDK"; - license = "unknown"; - }) {}; - - "amazonka-elasticache_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -25339,11 +24950,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticbeanstalk_0_3_3" = callPackage @@ -25389,24 +24998,6 @@ self: { }) {}; "amazonka-elasticbeanstalk" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elasticbeanstalk"; - version = "1.3.5"; - sha256 = "d76cf25be30f257610680f904eb4a845bcac685d0f3c88eb6f798c7c29685497"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Beanstalk SDK"; - license = "unknown"; - }) {}; - - "amazonka-elasticbeanstalk_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -25419,32 +25010,12 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticsearch" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elasticsearch"; - version = "1.3.5"; - sha256 = "f0039f4947daed7ebb4381bea5a0c583bc6aa690cda4a98d967508b897cd08d6"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elasticsearch Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-elasticsearch_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -25457,11 +25028,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elasticsearch Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elastictranscoder_0_3_3" = callPackage @@ -25507,24 +25076,6 @@ self: { }) {}; "amazonka-elastictranscoder" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elastictranscoder"; - version = "1.3.5"; - sha256 = "1dd28ac053a64d7fe3a56fa832b7468ddcf49da96c469863596cfb8b3813aa26"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Transcoder SDK"; - license = "unknown"; - }) {}; - - "amazonka-elastictranscoder_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -25537,11 +25088,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elb_0_3_3" = callPackage @@ -25587,24 +25136,6 @@ self: { }) {}; "amazonka-elb" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elb"; - version = "1.3.5"; - sha256 = "4af94742aedea95dd8ecccf22a03010a21b83149b0872f03e84cd14f3807c40b"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Load Balancing SDK"; - license = "unknown"; - }) {}; - - "amazonka-elb_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -25617,11 +25148,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-emr_0_3_3" = callPackage @@ -25667,24 +25196,6 @@ self: { }) {}; "amazonka-emr" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-emr"; - version = "1.3.5"; - sha256 = "c54a824b3f1550dcad56e24e2dc718dbacfd06681e2434967736f3c1a2c210fa"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic MapReduce SDK"; - license = "unknown"; - }) {}; - - "amazonka-emr_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -25697,11 +25208,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-glacier_0_3_3" = callPackage @@ -25747,24 +25256,6 @@ self: { }) {}; "amazonka-glacier" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-glacier"; - version = "1.3.5"; - sha256 = "7cfe2bfd39cc47de89b2cb342acb647fdf9881738badf64c999dc25d8ec30114"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Glacier SDK"; - license = "unknown"; - }) {}; - - "amazonka-glacier_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -25777,11 +25268,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iam_0_3_3" = callPackage @@ -25827,24 +25316,6 @@ self: { }) {}; "amazonka-iam" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-iam"; - version = "1.3.5"; - sha256 = "15f9d6801c6510fcdbb9e187a94aa12101ef204ad55ccc68fe672fc8754f86e0"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Identity and Access Management SDK"; - license = "unknown"; - }) {}; - - "amazonka-iam_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -25857,11 +25328,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-importexport_0_3_3" = callPackage @@ -25907,24 +25376,6 @@ self: { }) {}; "amazonka-importexport" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-importexport"; - version = "1.3.5"; - sha256 = "7eed51439110b782d2eafe5c96cad66760dbb840e3c3dcfec71936853327cb9e"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Import/Export SDK"; - license = "unknown"; - }) {}; - - "amazonka-importexport_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -25937,32 +25388,12 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-inspector" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-inspector"; - version = "1.3.5"; - sha256 = "dd4b1dd1366dd2b68977a33b67afad10848c528124cf9bcd2240ea8924ad8500"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Inspector SDK"; - license = "unknown"; - }) {}; - - "amazonka-inspector_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -25975,32 +25406,12 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Inspector SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iot" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-iot"; - version = "1.3.5"; - sha256 = "de13c663eb5a92da27af230ce26635c0ce09273edb84638560758c2baf4909a9"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon IoT SDK"; - license = "unknown"; - }) {}; - - "amazonka-iot_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -26013,32 +25424,12 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon IoT SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iot-dataplane" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-iot-dataplane"; - version = "1.3.5"; - sha256 = "9e1375a3dbd7c841b21159a26588b18b686ee532f5c0d985982236edb681a043"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon IoT Data Plane SDK"; - license = "unknown"; - }) {}; - - "amazonka-iot-dataplane_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -26051,11 +25442,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon IoT Data Plane SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis_0_3_3" = callPackage @@ -26101,24 +25490,6 @@ self: { }) {}; "amazonka-kinesis" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-kinesis"; - version = "1.3.5"; - sha256 = "0a25ca25d4e598d2135367a030cc541f4fefe263dc0ab480518dbbe4e1732b89"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Kinesis SDK"; - license = "unknown"; - }) {}; - - "amazonka-kinesis_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -26131,32 +25502,12 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis-firehose" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-kinesis-firehose"; - version = "1.3.5"; - sha256 = "b7aa0244668978d34dd810262127112c7b74de51208a0df24677d77d3c36c3c8"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Kinesis Firehose SDK"; - license = "unknown"; - }) {}; - - "amazonka-kinesis-firehose_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -26169,11 +25520,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis Firehose SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kms_0_3_3" = callPackage @@ -26219,24 +25568,6 @@ self: { }) {}; "amazonka-kms" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-kms"; - version = "1.3.5"; - sha256 = "183bb82076688c1a5f49cc7984a08918bf154dcfbc26c2f6f05445d265026475"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Key Management Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-kms_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -26249,11 +25580,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-lambda_0_3_3" = callPackage @@ -26299,24 +25628,6 @@ self: { }) {}; "amazonka-lambda" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-lambda"; - version = "1.3.5"; - sha256 = "985cd7c7534a170c35e088eecff8ec207d56547a5d07cbb1b65b335698d09485"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Lambda SDK"; - license = "unknown"; - }) {}; - - "amazonka-lambda_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -26329,32 +25640,12 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-marketplace-analytics" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-marketplace-analytics"; - version = "1.3.5"; - sha256 = "1c619d6983eb690fb40cf4ea93fd41c1d837efa487394e586181098a12de13c2"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Marketplace Commerce Analytics SDK"; - license = "unknown"; - }) {}; - - "amazonka-marketplace-analytics_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -26367,11 +25658,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Marketplace Commerce Analytics SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ml_0_3_6" = callPackage @@ -26389,24 +25678,6 @@ self: { }) {}; "amazonka-ml" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ml"; - version = "1.3.5"; - sha256 = "023de596b18762c6d26f9bdd35fa2311a35d6c556872cec7705506c4cb117e5e"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Machine Learning SDK"; - license = "unknown"; - }) {}; - - "amazonka-ml_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -26419,11 +25690,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Machine Learning SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-opsworks_0_3_3" = callPackage @@ -26469,24 +25738,6 @@ self: { }) {}; "amazonka-opsworks" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-opsworks"; - version = "1.3.5"; - sha256 = "23b381594282c319a4125cb79a95a82b75fdeecc15541b89ff12bbdb47c27ee8"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon OpsWorks SDK"; - license = "unknown"; - }) {}; - - "amazonka-opsworks_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -26499,11 +25750,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-rds_0_3_3" = callPackage @@ -26554,8 +25803,8 @@ self: { }: mkDerivation { pname = "amazonka-rds"; - version = "1.3.5"; - sha256 = "4866dfe6d701f1b8bf01d93073afbdf9ff6d002cc3acc082a7772c8a0c2333df"; + version = "1.3.6"; + sha256 = "7a70db7b6482b4836a7606c7026e9cb93c55763f414330ebfaf20967665f1a97"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -26567,26 +25816,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "amazonka-rds_1_3_6" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-rds"; - version = "1.3.6"; - sha256 = "7a70db7b6482b4836a7606c7026e9cb93c55763f414330ebfaf20967665f1a97"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Relational Database Service SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "amazonka-redshift_0_3_3" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { @@ -26630,24 +25859,6 @@ self: { }) {}; "amazonka-redshift" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-redshift"; - version = "1.3.5"; - sha256 = "f169e0a5f860fbbef9723409c2166b396026b5a2bb444e4ddd508a33a800572c"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Redshift SDK"; - license = "unknown"; - }) {}; - - "amazonka-redshift_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -26660,11 +25871,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53_0_3_3" = callPackage @@ -26724,24 +25933,6 @@ self: { }) {}; "amazonka-route53" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-route53"; - version = "1.3.5"; - sha256 = "b35f412b860f8c6935858e243aab4e89b21db534acb38236e3eaa14b9c77a24d"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Route 53 SDK"; - license = "unknown"; - }) {}; - - "amazonka-route53_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -26754,11 +25945,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53-domains_0_3_3" = callPackage @@ -26804,24 +25993,6 @@ self: { }) {}; "amazonka-route53-domains" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-route53-domains"; - version = "1.3.5"; - sha256 = "a3728cb802aff477e72bc7161f8095e6e1dba77bd7465bc186c68adc936606f2"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Route 53 Domains SDK"; - license = "unknown"; - }) {}; - - "amazonka-route53-domains_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -26834,11 +26005,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-s3_0_3_3" = callPackage @@ -26889,8 +26058,8 @@ self: { }: mkDerivation { pname = "amazonka-s3"; - version = "1.3.5"; - sha256 = "efed9d42854651d71b12ce3e7b756af38225329c4b36062b49a663303e7983c4"; + version = "1.3.6"; + sha256 = "4867f20e331f1c5197b212d1ba6051887631419bc92cbc74dd26f0eed1987087"; libraryHaskellDepends = [ amazonka-core base lens text ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -26903,26 +26072,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "amazonka-s3_1_3_6" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-s3"; - version = "1.3.6"; - sha256 = "4867f20e331f1c5197b212d1ba6051887631419bc92cbc74dd26f0eed1987087"; - libraryHaskellDepends = [ amazonka-core base lens text ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Storage Service SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "amazonka-sdb_0_3_3" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { @@ -26966,24 +26115,6 @@ self: { }) {}; "amazonka-sdb" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sdb"; - version = "1.3.5"; - sha256 = "281fc05e956aabf86f6098cdf96f2bc96c1ca63c8bcaa61aaf72fc03a6db03f9"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon SimpleDB SDK"; - license = "unknown"; - }) {}; - - "amazonka-sdb_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -26996,11 +26127,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ses_0_3_3" = callPackage @@ -27046,24 +26175,6 @@ self: { }) {}; "amazonka-ses" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ses"; - version = "1.3.5"; - sha256 = "2dadeed2ba2380fde4569b0d8783905c3c24f64e1995c459982f198382c99a07"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Email Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ses_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -27076,11 +26187,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sns_0_3_3" = callPackage @@ -27126,24 +26235,6 @@ self: { }) {}; "amazonka-sns" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sns"; - version = "1.3.5"; - sha256 = "a452c8cce975a2cb1fc712479b1c87406c6945466c23fa8d474bc12dbf6f0738"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Notification Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-sns_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -27156,11 +26247,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sqs_0_3_3" = callPackage @@ -27211,8 +26300,8 @@ self: { }: mkDerivation { pname = "amazonka-sqs"; - version = "1.3.5"; - sha256 = "bb45cff93bbfd66d20290508c926d4013c8e48218c3b4f3ca6cba118e8b962bc"; + version = "1.3.6"; + sha256 = "5cfa83a58c52d1272c09c08743bf68c6c5d1789573c4ac50f8fa871361224c3a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -27224,26 +26313,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "amazonka-sqs_1_3_6" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sqs"; - version = "1.3.6"; - sha256 = "5cfa83a58c52d1272c09c08743bf68c6c5d1789573c4ac50f8fa871361224c3a"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Queue Service SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "amazonka-ssm_0_3_3" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { @@ -27287,24 +26356,6 @@ self: { }) {}; "amazonka-ssm" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ssm"; - version = "1.3.5"; - sha256 = "e1441e977f05d03f5313eae4c0a00cbc6a46e49af1a6e95f2ca2f05a6f1995be"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Systems Management Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ssm_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -27317,11 +26368,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Management Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-storagegateway_0_3_3" = callPackage @@ -27367,24 +26416,6 @@ self: { }) {}; "amazonka-storagegateway" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-storagegateway"; - version = "1.3.5"; - sha256 = "b8f90b1cd0f4447b054032aec2c06803bd036eb5fc48ab0855c07045cb77efe4"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Storage Gateway SDK"; - license = "unknown"; - }) {}; - - "amazonka-storagegateway_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -27397,11 +26428,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sts_0_3_3" = callPackage @@ -27447,24 +26476,6 @@ self: { }) {}; "amazonka-sts" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sts"; - version = "1.3.5"; - sha256 = "509806ed8cf9b79c9ce67b52ea78e05ba1621d1a364ea70a0fd5df0636ba533a"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Security Token Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-sts_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -27477,11 +26488,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-support_0_3_3" = callPackage @@ -27527,24 +26536,6 @@ self: { }) {}; "amazonka-support" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-support"; - version = "1.3.5"; - sha256 = "6ca32d2b4792593b49e8a843076a7f6e83508faa5f352377f40ff55d0c8029c4"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Support SDK"; - license = "unknown"; - }) {}; - - "amazonka-support_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -27557,11 +26548,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-swf_0_3_3" = callPackage @@ -27612,8 +26601,8 @@ self: { }: mkDerivation { pname = "amazonka-swf"; - version = "1.3.5"; - sha256 = "8eb47ed0c929062908f58a6b384b83478c2509206276ead171c0bc9a1c736310"; + version = "1.3.6"; + sha256 = "0dfda94067f7d2c17a6ffac0252a9340b7b95138721ac40198d03c896329fd16"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -27626,49 +26615,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "amazonka-swf_1_3_6" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-swf"; - version = "1.3.6"; - sha256 = "0dfda94067f7d2c17a6ffac0252a9340b7b95138721ac40198d03c896329fd16"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Workflow Service SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "amazonka-test" = callPackage - ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring - , case-insensitive, conduit, conduit-extra, groom, http-client - , http-types, lens, process, resourcet, tasty, tasty-hunit - , template-haskell, temporary, text, time, unordered-containers - , yaml - }: - mkDerivation { - pname = "amazonka-test"; - version = "1.3.5.1"; - sha256 = "561c74aa892b67610485182f9830811f5ef592e6e907d828ef85ab71d5cd256a"; - libraryHaskellDepends = [ - aeson amazonka-core base bifunctors bytestring case-insensitive - conduit conduit-extra groom http-client http-types lens process - resourcet tasty tasty-hunit template-haskell temporary text time - unordered-containers yaml - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Common functionality for Amazonka library test-suites"; - license = "unknown"; - }) {}; - - "amazonka-test_1_3_6" = callPackage ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring , case-insensitive, conduit, conduit-extra, groom, http-client , http-types, lens, process, resourcet, tasty, tasty-hunit @@ -27685,32 +26632,12 @@ self: { resourcet tasty tasty-hunit template-haskell temporary text time unordered-containers yaml ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Common functionality for Amazonka library test-suites"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-waf" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-waf"; - version = "1.3.5"; - sha256 = "4d0bde6da823db1377577549c745f0ed31b50e1cdc8c5760f2663ae7d831a800"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon WAF SDK"; - license = "unknown"; - }) {}; - - "amazonka-waf_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -27723,11 +26650,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WAF SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-workspaces_0_3_6" = callPackage @@ -27745,24 +26670,6 @@ self: { }) {}; "amazonka-workspaces" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-workspaces"; - version = "1.3.5"; - sha256 = "0791fe563c48acac8fa525931cc83ed1a8beecc779553635f6465f7486636de2"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring lens tasty tasty-hunit - text time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon WorkSpaces SDK"; - license = "unknown"; - }) {}; - - "amazonka-workspaces_1_3_6" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -27775,11 +26682,9 @@ self: { amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WorkSpaces SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ampersand" = callPackage @@ -29300,7 +28205,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "approximate" = callPackage + "approximate_0_2_2_2" = callPackage ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq , directory, doctest, filepath, ghc-prim, hashable, hashable-extras , lens, log-domain, pointed, safecopy, semigroupoids, semigroups @@ -29321,6 +28226,30 @@ self: { homepage = "http://github.com/analytics/approximate/"; description = "Approximate discrete values and numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "approximate" = callPackage + ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq + , directory, doctest, filepath, ghc-prim, hashable, hashable-extras + , lens, log-domain, pointed, safecopy, semigroupoids, semigroups + , simple-reflect, vector + }: + mkDerivation { + pname = "approximate"; + version = "0.2.2.3"; + sha256 = "20fdc16cbd36bd592c6e2c5b6bd38866e8c3eb010e71607e6f609e6355302bac"; + libraryHaskellDepends = [ + base binary bytes cereal comonad deepseq ghc-prim hashable + hashable-extras lens log-domain pointed safecopy semigroupoids + semigroups vector + ]; + testHaskellDepends = [ + base directory doctest filepath semigroups simple-reflect + ]; + homepage = "http://github.com/analytics/approximate/"; + description = "Approximate discrete values and numbers"; + license = stdenv.lib.licenses.bsd3; }) {}; "approximate-equality" = callPackage @@ -29698,6 +28627,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "arghwxhaskell" = callPackage + ({ mkDerivation, base, directory, wx }: + mkDerivation { + pname = "arghwxhaskell"; + version = "0.8.2.0"; + sha256 = "6b88ad21393cde84f137f280826de31f121f35cf99c6c3472e423611723cdd5b"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base directory wx ]; + homepage = "https://wiki.haskell.org/Argh!"; + description = "An interpreter for the Argh! programming language in wxHaskell"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "argon" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , containers, directory, docopt, filepath, ghc, ghc-paths @@ -30665,6 +29608,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-dejafu" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit, hunit-dejafu }: + mkDerivation { + pname = "async-dejafu"; + version = "0.1.0.0"; + sha256 = "e926c16affb72d552066367a52bc53b02c1d59ac741ede1e80248149668d53bf"; + libraryHaskellDepends = [ base dejafu exceptions ]; + testHaskellDepends = [ base dejafu HUnit hunit-dejafu ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Run MonadConc operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "async-extras" = callPackage ({ mkDerivation, async, base, lifted-async, lifted-base , monad-control, SafeSemaphore, stm, transformers-base @@ -32140,7 +31096,6 @@ self: { homepage = "http://github.com/iconnect/aws-cloudfront-signer"; description = "For signing AWS CloudFront HTTP URL requests"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-configuration-tools" = callPackage @@ -32233,7 +31188,6 @@ self: { homepage = "https://github.com/zalora/aws-ec2"; description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-elastic-transcoder" = callPackage @@ -32497,7 +31451,6 @@ self: { homepage = "https://github.com/yunomu/aws-sdk-text-converter"; description = "The text converter for aws-sdk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-sdk-xml-unordered" = callPackage @@ -32519,7 +31472,6 @@ self: { homepage = "https://github.com/worksap-ate/aws-sdk-xml-unordered"; description = "The xml parser for aws-sdk package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-sign4" = callPackage @@ -33786,8 +32738,8 @@ self: { ({ mkDerivation, base, network, pureMD5, utf8-string }: mkDerivation { pname = "basex-client"; - version = "0.1.0.0"; - sha256 = "16954927f7a178fbb673bd66a836fad19072562d0cdac39397b4ba74c8ae2ba1"; + version = "0.2.0.0"; + sha256 = "90f165babb781cb9a38107c32bd9c0d2cbee836f2120c7c2bf39b1e1a5ef1d0d"; libraryHaskellDepends = [ base network pureMD5 utf8-string ]; description = "A BaseX client for Haskell"; license = stdenv.lib.licenses.mit; @@ -34066,6 +33018,21 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "bbi" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers, mtl + , zlib + }: + mkDerivation { + pname = "bbi"; + version = "0.1.0"; + sha256 = "4fd495f092457cca89e8e4562f735022507085b0c928b7d8fe92ea020fa32878"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers mtl zlib + ]; + description = "Tools for reading Big Binary Indexed files, e.g., bigBed, bigWig"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bcrypt_0_0_6" = callPackage ({ mkDerivation, base, bytestring, entropy }: mkDerivation { @@ -35051,8 +34018,8 @@ self: { }: mkDerivation { pname = "binary-parser"; - version = "0.5"; - sha256 = "75535438c172ce17ee8eb837a9c87c9b0c27d3b4e1abf0e3cbb88babeaea0925"; + version = "0.5.0.1"; + sha256 = "df8c5eae56a2f80e0e52d6d9ec820d2206495edd8183bf98f57070608f3f7f32"; libraryHaskellDepends = [ base-prelude bytestring success text transformers ]; @@ -36265,6 +35232,38 @@ self: { license = "LGPL"; }) {}; + "bioinformatics-toolkit" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bbi, binary, bytestring + , bytestring-lexing, clustering, colour, conduit, containers + , data-default-class, double-conversion, hexpat, http-conduit + , IntervalMap, matrices, mtl, palette, parallel, primitive, random + , samtools, shelly, split, statistics, tasty, tasty-golden + , tasty-hunit, text, transformers, unordered-containers, vector + , vector-algorithms, word8 + }: + mkDerivation { + pname = "bioinformatics-toolkit"; + version = "0.1.0"; + sha256 = "0ce36b2dc686a77804158d70658cc0600056ae62e7d465663b75e784b52950a9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bbi binary bytestring bytestring-lexing + clustering colour conduit containers data-default-class + double-conversion hexpat http-conduit IntervalMap matrices mtl + palette parallel primitive samtools split statistics text + transformers unordered-containers vector vector-algorithms word8 + ]; + executableHaskellDepends = [ base bytestring shelly text ]; + testHaskellDepends = [ + base bytestring conduit data-default-class mtl random tasty + tasty-golden tasty-hunit unordered-containers vector + ]; + description = "A collection of bioinformatics tools"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "biophd" = callPackage ({ mkDerivation, base, binary, biocore, bytestring, parsec, text }: mkDerivation { @@ -37040,7 +36039,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "blank-canvas" = callPackage + "blank-canvas_0_5" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, colour , containers, data-default-class, http-types, kansas-comet, scotty , stm, text, transformers, vector, wai, wai-extra, warp @@ -37063,6 +36062,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blank-canvas" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, colour, containers, data-default-class, directory + , http-types, kansas-comet, mime-types, process, scotty, shake, stm + , text, text-show, time, transformers, unix, vector, wai, wai-extra + , warp + }: + mkDerivation { + pname = "blank-canvas"; + version = "0.6"; + sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring colour + containers data-default-class http-types kansas-comet mime-types + scotty stm text text-show transformers vector wai wai-extra warp + ]; + testHaskellDepends = [ + base containers directory process shake stm text time unix vector + ]; + homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; + description = "HTML5 Canvas Graphics Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blas" = callPackage ({ mkDerivation, base, ieee, QuickCheck, storable-complex }: mkDerivation { @@ -37969,7 +36993,6 @@ self: { jailbreak = true; description = "Utilities for Bluetile"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blunt" = callPackage @@ -38420,7 +37443,6 @@ self: { libraryHaskellDepends = [ base directory process ]; description = "BrainFuck monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brainfuck-tut" = callPackage @@ -39135,7 +38157,6 @@ self: { homepage = "http://www.freedesktop.org/wiki/Software/Bustle/"; description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bv" = callPackage @@ -39289,7 +38310,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bytes" = callPackage + "bytes_0_15_0_1" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, containers , directory, doctest, filepath, mtl, text, time, transformers , transformers-compat, void @@ -39308,6 +38329,28 @@ self: { homepage = "https://github.com/ekmett/bytes"; description = "Sharing code for serialization between binary and cereal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "bytes" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, containers + , directory, doctest, filepath, hashable, mtl, scientific, text + , time, transformers, transformers-compat, unordered-containers + , void + }: + mkDerivation { + pname = "bytes"; + version = "0.15.1"; + sha256 = "ce74d4e1dfbee76652964281a9a6a0f0ef922efe4b9612deda42bc65f5efc4bf"; + libraryHaskellDepends = [ + base binary bytestring cereal containers hashable mtl scientific + text time transformers transformers-compat unordered-containers + void + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "https://github.com/ekmett/bytes"; + description = "Sharing code for serialization between binary and cereal"; + license = stdenv.lib.licenses.bsd3; }) {}; "byteset" = callPackage @@ -39347,11 +38390,10 @@ self: { ({ mkDerivation, base, bytestring, cryptohash, QuickCheck }: mkDerivation { pname = "bytestring-arbitrary"; - version = "0.0.3"; - sha256 = "272e2b9115dce0bdc70930350a33f938cf6355726e4141ff3e9f0f32557bbdd7"; + version = "0.0.4"; + sha256 = "005fca02b5917a5f844db8cc5fdd603073e5e6c1fefaad5568a87df414e15abb"; libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ]; testHaskellDepends = [ base bytestring cryptohash QuickCheck ]; - jailbreak = true; homepage = "https://github.com/tsuraan/bytestring-arbitrary"; description = "Arbitrary instances for ByteStrings"; license = stdenv.lib.licenses.bsd3; @@ -39364,6 +38406,8 @@ self: { pname = "bytestring-builder"; version = "0.10.4.0.1"; sha256 = "2079e5f8b269b4b90095d69f864dcbddfac2499ef985086af8e5d0ddcc341047"; + revision = "1"; + editedCabalFile = "2184b845a3059f681324e4c71d041ec0ee5268208149877a06a5c93618c28e9b"; libraryHaskellDepends = [ base bytestring deepseq ]; doHaddock = false; jailbreak = true; @@ -39378,6 +38422,8 @@ self: { pname = "bytestring-builder"; version = "0.10.4.1.0"; sha256 = "bf728099333a09ba28b8c48b28db52eac86d5e48421f7318e13e825a61ab197e"; + revision = "1"; + editedCabalFile = "44ec650d19703746349ce9f3b78ab2deb3f796836cd7120d796f2720e74fdb86"; libraryHaskellDepends = [ base bytestring deepseq ]; doHaddock = false; jailbreak = true; @@ -39733,6 +38779,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytestring-tree-builder" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "bytestring-tree-builder"; + version = "0.2.2"; + sha256 = "ba0177ecfd71e7370b2c57fb23de72b8bc65c7e0533599fbd5791af29ea79260"; + libraryHaskellDepends = [ base base-prelude bytestring ]; + testHaskellDepends = [ + base-prelude bytestring QuickCheck quickcheck-instances tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/nikita-volkov/bytestring-tree-builder"; + description = "A very efficient ByteString builder implementation based on the binary tree"; + license = stdenv.lib.licenses.mit; + }) {}; + "bytestring-trie_0_2_4" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -39974,8 +39039,8 @@ self: { }: mkDerivation { pname = "c2hs"; - version = "0.26.2"; - sha256 = "d15d17a9dc69310fc0b350fec6290e3ec75a8c4cd7d004aaeb03374e43d244bd"; + version = "0.27.1"; + sha256 = "668af07f261c7c6c2537921ba58870cfb1114b33670f2c182e6f9a8794ffe41f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41542,7 +40607,6 @@ self: { executableHaskellDepends = [ base cairo glib gtk ]; description = "A template for building new GUI applications using GTK and Cairo"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cake" = callPackage @@ -41691,7 +40755,6 @@ self: { homepage = "https://github.com/sumitsahrawat/calculator"; description = "A calculator repl, with variables, functions & Mathematica like dynamic plots"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "caldims" = callPackage @@ -42032,7 +41095,6 @@ self: { homepage = "https://github.com/master-q/carettah"; description = "A presentation tool written with Haskell"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "carray" = callPackage @@ -42882,8 +41944,8 @@ self: { ({ mkDerivation, base, random }: mkDerivation { pname = "cayley-dickson"; - version = "0.2.1.0"; - sha256 = "7e3ae6f5e21f0d41b81721db9b90fc606c29d0d24286449da13e494a2df77916"; + version = "0.3.1.0"; + sha256 = "bcba575db8a9ed81d1c9d8e048642577bfb28b9e3b761334a187ad2fabb404c3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base random ]; homepage = "https://github.com/lmj/cayley-dickson"; @@ -43036,7 +42098,6 @@ self: { jailbreak = true; description = "Cairo-based CellRenderer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; "cereal_0_4_1_0" = callPackage @@ -43087,7 +42148,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cereal-conduit" = callPackage + "cereal-conduit_0_7_2_3" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, HUnit, mtl , resourcet, transformers }: @@ -43104,6 +42165,26 @@ self: { homepage = "https://github.com/snoyberg/conduit"; description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cereal-conduit" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, HUnit, mtl + , resourcet, transformers + }: + mkDerivation { + pname = "cereal-conduit"; + version = "0.7.2.5"; + sha256 = "414407daafbe39e4a49623f32e7a96f3c844dec93d890ba6420b0554ba9a0491"; + libraryHaskellDepends = [ + base bytestring cereal conduit resourcet transformers + ]; + testHaskellDepends = [ + base bytestring cereal conduit HUnit mtl resourcet transformers + ]; + homepage = "https://github.com/snoyberg/conduit"; + description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits"; + license = stdenv.lib.licenses.bsd3; }) {}; "cereal-derive" = callPackage @@ -44559,7 +43640,6 @@ self: { jailbreak = true; description = "Simple CLI RPN calculator"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clafer" = callPackage @@ -46051,8 +45131,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.23.11"; - sha256 = "65868751cc51e409a000edc5fb26e25f3c151f8a792ca80006ae87813cc9ea6e"; + version = "0.23.12"; + sha256 = "89515b6706f548b4af30b07111864e0e917de86d39e6d53ceb2ff1c431d8341d"; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -46076,8 +45156,8 @@ self: { }: mkDerivation { pname = "clckwrks-cli"; - version = "0.2.15"; - sha256 = "8a7fad8590c6c1297b7076a7e4cc03689f37cd9371171748f351967cbb91b7f2"; + version = "0.2.16"; + sha256 = "424fcaa1f1b6b39be1d727073b9b9ab37c9a201f6c2eca5a8c30d469919c12e7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -46156,6 +45236,7 @@ self: { safecopy text web-plugins web-routes web-routes-th ]; libraryToolDepends = [ hsx2hs ]; + jailbreak = true; homepage = "http://clckwrks.com/"; description = "ircbot plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -46170,8 +45251,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.14"; - sha256 = "6a6928e0e768c8c23061de9046250a699bbc7870804d9c9cbff9044f32870bd6"; + version = "0.6.15"; + sha256 = "8718187ddc8017bb875645eb2032dbbb71cd72ee7541e30c0e7281dc49ca5b85"; libraryHaskellDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers directory filepath gd happstack-server hsp ixset magic mtl reform @@ -46194,8 +45275,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.1"; - sha256 = "1fb68c812f3ce260d92df7a6b614c80bea443347ad95612edb8c73160099fbc0"; + version = "0.4.2"; + sha256 = "b082b6bb6ae8ca730a5f72d246c1af7ac3c3fcf3b51787731c3519854d1d49a0"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -46638,7 +45719,6 @@ self: { homepage = "http://github.com/haskell-distributed/cloud-haskell"; description = "The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cloudfront-signer" = callPackage @@ -47049,7 +46129,6 @@ self: { homepage = "https://github.com/Lemmih/cndict"; description = "Chinese/Mandarin <-> English dictionary, Chinese lexer"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "code-builder" = callPackage @@ -48243,7 +47322,6 @@ self: { homepage = "http://github.com/analytics/compensated/"; description = "Compensated floating-point arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "competition" = callPackage @@ -48321,6 +47399,7 @@ self: { sha256 = "9d4bd35d7d5b5cfcc530281a9d55d508d719414d50dcb835b3c9097d51854123"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; + jailbreak = true; description = "More intuitive, left-to-right function composition"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -48405,7 +47484,6 @@ self: { homepage = "https://github.com/liamoc/composition-tree"; description = "Composition trees for arbitrary monoids"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compressed" = callPackage @@ -49082,7 +48160,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "conduit" = callPackage + "conduit_1_2_5_1" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, mtl, QuickCheck, resourcet, safe, transformers , transformers-base @@ -49104,6 +48182,29 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "conduit" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, lifted-base + , mmorph, mtl, QuickCheck, resourcet, safe, transformers + , transformers-base + }: + mkDerivation { + pname = "conduit"; + version = "1.2.6"; + sha256 = "6533d47843209659ea0158f7a091eb9fae466bfe3af818e404a17c0e3bcb83bb"; + libraryHaskellDepends = [ + base exceptions lifted-base mmorph mtl resourcet transformers + transformers-base + ]; + testHaskellDepends = [ + base containers exceptions hspec mtl QuickCheck resourcet safe + transformers + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Streaming data processing library"; + license = stdenv.lib.licenses.mit; }) {}; "conduit-audio" = callPackage @@ -49173,7 +48274,6 @@ self: { homepage = "http://github.com/mtolly/conduit-audio"; description = "conduit-audio interface to the libsndfile audio file library"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-combinators_0_3_0_4" = callPackage @@ -49617,7 +48717,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "conduit-extra" = callPackage + "conduit-extra_1_1_9_1" = callPackage ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring , bytestring-builder, conduit, directory, exceptions, filepath , hspec, monad-control, network, primitive, process, resourcet, stm @@ -49640,6 +48740,32 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Batteries included conduit: adapters for common libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "conduit-extra" = callPackage + ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring + , bytestring-builder, conduit, directory, exceptions, filepath + , hspec, monad-control, network, primitive, process, resourcet, stm + , streaming-commons, text, transformers, transformers-base + }: + mkDerivation { + pname = "conduit-extra"; + version = "1.1.9.2"; + sha256 = "9a7b3f44990014082f589dd91f70d8b5faef66e720677888a54fb2e463940a9f"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring conduit directory filepath + monad-control network primitive process resourcet stm + streaming-commons text transformers transformers-base + ]; + testHaskellDepends = [ + async attoparsec base blaze-builder bytestring bytestring-builder + conduit exceptions hspec process resourcet stm streaming-commons + text transformers transformers-base + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Batteries included conduit: adapters for common libraries"; + license = stdenv.lib.licenses.mit; }) {}; "conduit-iconv" = callPackage @@ -49648,8 +48774,8 @@ self: { }: mkDerivation { pname = "conduit-iconv"; - version = "0.1.1.0"; - sha256 = "90a008befeaf1c51412f646c11c9c66ce595725d397061e2f2af3d7c5b99ca2e"; + version = "0.1.1.1"; + sha256 = "54a25274f4f3590a6b35ac86a3753dc867a505867cae5d363f775781f4b6ac05"; libraryHaskellDepends = [ base bytestring conduit ]; testHaskellDepends = [ base bytestring conduit mtl QuickCheck test-framework @@ -49658,7 +48784,6 @@ self: { homepage = "https://github.com/sdroege/conduit-iconv"; description = "Conduit for character encoding conversion"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-network-stream" = callPackage @@ -50502,7 +49627,6 @@ self: { base bytestring cereal containers mtl nanomsg-haskell time ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "contravariant_1_2" = callPackage @@ -51207,7 +50331,6 @@ self: { ]; description = "A compiler for Copilot targeting C99"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot-cbmc" = callPackage @@ -51240,7 +50363,6 @@ self: { ]; description = "An intermediate representation for Copilot"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot-language" = callPackage @@ -51259,7 +50381,6 @@ self: { ]; description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot-libraries" = callPackage @@ -51276,7 +50397,6 @@ self: { homepage = "https://github.com/leepike/copilot-libraries"; description = "Libraries for the Copilot language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "copilot-sbv" = callPackage @@ -53460,7 +52580,6 @@ self: { homepage = "https://github.com/anton-k/csound-expression"; description = "library to make electronic music"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression-dynamic" = callPackage @@ -53524,7 +52643,6 @@ self: { homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csp" = callPackage @@ -53830,6 +52948,7 @@ self: { homepage = "https://github.com/simhu/cubical"; description = "Implementation of Univalence in Cubical Sets"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cubicbezier" = callPackage @@ -53912,16 +53031,17 @@ self: { }) {}; "cuda" = callPackage - ({ mkDerivation, base, bytestring, c2hs, Cabal, pretty }: + ({ mkDerivation, base, bytestring, c2hs, pretty, template-haskell + }: mkDerivation { pname = "cuda"; - version = "0.6.7.0"; - sha256 = "7fa1929e4b7a8f3c24c163781788f2e3a8b893c72efc87af886e0b16f5bdbbbb"; + version = "0.7.0.0"; + sha256 = "b51b6da7f1aad9c1c2abacb6c45cc5efbd7fc7ddb4c1245de12bf7b0b0777ba6"; revision = "1"; - editedCabalFile = "835d4e423da92826bb241196b10a56016091623e04df181ddb0eaecf1be7fc41"; + editedCabalFile = "1ff19bb4645ce9ba77b84189c8b6e44fb635d1c8b3a5c7560c8633ee2005f37e"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring Cabal ]; + libraryHaskellDepends = [ base bytestring template-haskell ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ base pretty ]; homepage = "https://github.com/tmcdonell/cuda"; @@ -54080,7 +53200,6 @@ self: { ]; description = "Terminal tool for viewing tabular data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "curve25519" = callPackage @@ -54116,7 +53235,6 @@ self: { ]; description = "Library for drawing curve based images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "custom-prelude" = callPackage @@ -55357,7 +54475,6 @@ self: { homepage = "https://github.com/wdanilo/layer"; description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead."; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-layout" = callPackage @@ -55639,11 +54756,10 @@ self: { ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "data-ref"; - version = "0.0"; - sha256 = "f644aab0d8e1f67110fc354130517bcd365701899a189fcfbc0e86681cfb912d"; + version = "0.0.1"; + sha256 = "6669a8b1351f826829a85d9b360bfc5328b316272dacb22f7186ef76824687ed"; libraryHaskellDepends = [ base stm transformers ]; - jailbreak = true; - homepage = "http://www.haskell.org/haskellwiki/Mutable_variable"; + homepage = "http://wiki.haskell.org/Mutable_variable"; description = "Unify STRef and IORef in plain Haskell 98"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -56109,12 +55225,11 @@ self: { ({ mkDerivation, base, base-unicode-symbols, parsec, syb, time }: mkDerivation { pname = "dates"; - version = "0.2.2.0"; - sha256 = "0a10c9070d230b966942e08862d379ddcb11942c937008bbabbb5a10a303a921"; + version = "0.2.2.1"; + sha256 = "6dbd2a18aa21435341ab4f537899b60eac38de384597efd2e9eb8c95030c8c09"; libraryHaskellDepends = [ base base-unicode-symbols parsec syb time ]; - jailbreak = true; homepage = "http://redmine.iportnov.ru/projects/dates/"; description = "Small library for parsing different dates formats"; license = stdenv.lib.licenses.bsd3; @@ -56158,6 +55273,21 @@ self: { license = "GPL"; }) {}; + "dawdle" = callPackage + ({ mkDerivation, base, filepath, parsec, pretty, text, time }: + mkDerivation { + pname = "dawdle"; + version = "0.1.0.2"; + sha256 = "6228a3bd300d3577936cea83bd25cad3b015977eeb4b7ba7c18b0665da941856"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base parsec pretty text time ]; + executableHaskellDepends = [ base filepath parsec pretty text ]; + homepage = "https://github.com/arnons1/dawdle"; + description = "Generates DDL suggestions based on a CSV file"; + license = stdenv.lib.licenses.mit; + }) {}; + "dawg" = callPackage ({ mkDerivation, base, binary, containers, mtl, transformers , vector, vector-binary @@ -57272,19 +56402,18 @@ self: { }) {}; "dejafu" = callPackage - ({ mkDerivation, base, containers, deepseq, exceptions, monad-loops - , mtl, random, stm, transformers + ({ mkDerivation, atomic-primops, base, containers, deepseq + , exceptions, monad-loops, mtl, random, stm, transformers }: mkDerivation { pname = "dejafu"; - version = "0.1.0.0"; - sha256 = "469c2f0690ede4ad83483d5ae82601471a7c737daddd116ad423d5b9202ee2b4"; + version = "0.2.0.0"; + sha256 = "a90d2695d2429b2d00e7a8e60edcc65f2c9d509ccf9a3744838dc2b122928e95"; libraryHaskellDepends = [ - base containers deepseq exceptions monad-loops mtl random stm - transformers + atomic-primops base containers deepseq exceptions monad-loops mtl + random stm transformers ]; - testHaskellDepends = [ base ]; - doCheck = false; + doHaddock = false; homepage = "https://github.com/barrucadu/dejafu"; description = "Overloadable primitives for testable, potentially non-deterministic, concurrency"; license = stdenv.lib.licenses.mit; @@ -57943,8 +57072,8 @@ self: { ({ mkDerivation, base, random }: mkDerivation { pname = "despair"; - version = "0.0.2"; - sha256 = "d2de83e26ce5a0fb919c7c5667af7c3b858209b51b6af31d0e72cff863b890b7"; + version = "0.0.6"; + sha256 = "6ca60cf6b0539ea70f4712144f1778c5464d3b369408c99f54e5bdbed7d3815a"; libraryHaskellDepends = [ base random ]; description = "Despair"; license = stdenv.lib.licenses.bsd3; @@ -58240,7 +57369,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-builder" = callPackage + "diagrams-builder_0_7_2_0" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript , diagrams-rasterific, diagrams-svg, directory, exceptions @@ -58266,6 +57395,35 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "diagrams-builder" = callPackage + ({ mkDerivation, base, base-orphans, bytestring, cmdargs + , diagrams-cairo, diagrams-lib, diagrams-postscript + , diagrams-rasterific, diagrams-svg, directory, exceptions + , filepath, hashable, haskell-src-exts, hint, JuicyPixels, lens + , lucid-svg, mtl, split, transformers + }: + mkDerivation { + pname = "diagrams-builder"; + version = "0.7.2.1"; + sha256 = "85f889d8ecc484c6ed6f364a37697f7cc410f2ef8ec33c9d7f8d83e6eb31201f"; + configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-orphans cmdargs diagrams-lib directory exceptions + filepath hashable haskell-src-exts hint lens mtl split transformers + ]; + executableHaskellDepends = [ + base bytestring cmdargs diagrams-cairo diagrams-lib + diagrams-postscript diagrams-rasterific diagrams-svg directory + filepath JuicyPixels lens lucid-svg + ]; + homepage = "http://projects.haskell.org/diagrams"; + description = "hint-based build service for the diagrams graphics EDSL"; + license = stdenv.lib.licenses.bsd3; }) {}; "diagrams-cairo_1_2_0_4" = callPackage @@ -58868,7 +58026,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Backend for rendering diagrams directly to GTK windows"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-haddock_0_2_2_12" = callPackage @@ -59019,8 +58176,10 @@ self: { }: mkDerivation { pname = "diagrams-haddock"; - version = "0.3.0.9"; - sha256 = "e23fea4218e1b141bbce79b7a873aca61855a3d3fc2bce3d711f10f254f7c183"; + version = "0.3.0.10"; + sha256 = "49ed17c49c1aae075892e9992b691867e418944a37141f028a7a2e6220d6f0af"; + revision = "1"; + editedCabalFile = "c77d5d5a908d03ba9fc545f977ced5d393a22e6de5b9d00deb4fb7fddd4a366d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59442,7 +58601,6 @@ self: { homepage = "https://github.com/prowdsponsor/diagrams-qrcode"; description = "Draw QR codes to SVG, PNG, PDF or PS files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-rasterific_0_1_0_7" = callPackage @@ -60415,6 +59573,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dimensional-codata" = callPackage + ({ mkDerivation, base, dimensional, numtype-dk }: + mkDerivation { + pname = "dimensional-codata"; + version = "2014.0.0.0"; + sha256 = "45a4eac9e27997493f2bcb2977098ede8443c6eda263a447125446e203a7cae3"; + libraryHaskellDepends = [ base dimensional numtype-dk ]; + homepage = "https://github.com/dmcclean/dimensional-codata"; + description = "CODATA Recommended Physical Constants with Dimensional Types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dimensional-tf" = callPackage ({ mkDerivation, base, numtype-tf, time }: mkDerivation { @@ -60902,8 +60072,8 @@ self: { pname = "disk-free-space"; version = "0.1.0.1"; sha256 = "f17a4f9c3b41083ccbb6c11b2debdbc705f86097b7459ff0f46cc01d2692381f"; - revision = "2"; - editedCabalFile = "60ab6de6ad0e36274c675338a37c8985972a5a64db69dee7b4f88b797c9b401b"; + revision = "3"; + editedCabalFile = "71ac4e0b1a2917e1c5d9dc43c84fdfac1ec7d0d7648582d94e1ce69199971c74"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/redneb/disk-free-space"; description = "Retrieve information about disk space usage"; @@ -61076,7 +60246,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-async"; description = "Cloud Haskell Async API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-azure" = callPackage @@ -61166,7 +60335,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-client-server"; description = "The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-execution_0_1_1" = callPackage @@ -61238,7 +60406,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-execution"; description = "Execution Framework for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-extras_0_2_0" = callPackage @@ -61303,7 +60470,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-extras"; description = "Cloud Haskell Extras"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-monad-control" = callPackage @@ -61408,7 +60574,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-registry"; description = "Cloud Haskell Extended Process Registry"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-simplelocalnet_0_2_2_0" = callPackage @@ -61542,7 +60707,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-supervisor"; description = "Supervisors for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-task_0_1_1" = callPackage @@ -61616,7 +60780,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-task"; description = "Task Framework for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-tests" = callPackage @@ -61640,7 +60803,6 @@ self: { homepage = "http://github.com/haskell-distributed/distributed-process-tests"; description = "Tests and test support tools for distributed-process"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-zookeeper" = callPackage @@ -61809,8 +60971,8 @@ self: { }: mkDerivation { pname = "dixi"; - version = "0.6.0.1"; - sha256 = "eb8ba7bc3b13b03db747750a444f84a8d09af2ed5f0472a4188107540b8ec87c"; + version = "0.6.0.2"; + sha256 = "01734a92055e31e4c52fd1d31f7e30977fd1a7c8274b6b8ff69b338f0f675675"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62973,6 +62135,7 @@ self: { testHaskellDepends = [ base drifter either postgresql-simple tasty tasty-hunit text ]; + jailbreak = true; description = "PostgreSQL support for the drifter schema migration tool"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -63142,7 +62305,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/DSP"; description = "Haskell Digital Signal Processing"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dstring" = callPackage @@ -63260,7 +62422,6 @@ self: { jailbreak = true; description = "(Fast) Dynamic Time Warping"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dual-tree_0_2_0_5" = callPackage @@ -63555,7 +62716,7 @@ self: { homepage = "https://github.com/adamwalker/dynamic-graph"; description = "Draw and update graphs in real time with OpenGL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynamic-linker-template" = callPackage @@ -63626,8 +62787,8 @@ self: { }: mkDerivation { pname = "dynamic-plot"; - version = "0.1.1.1"; - sha256 = "9742e52dae0b13482a996aeb5da6f7982ffef8eccbc26ba1f1d3178a759b93aa"; + version = "0.1.1.2"; + sha256 = "f991e349360af3a03723c373a3480764a0280e5ff5bd1037e3711e6c1776d60c"; libraryHaskellDepends = [ async base colour constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib @@ -65202,21 +64363,24 @@ self: { }) {}; "elm-init" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , directory, file-embed, filepath, text, time + ({ mkDerivation, aeson, aeson-pretty, base, base-unicode-symbols + , bytestring, containers, directory, file-embed, filepath, process + , text, time }: mkDerivation { pname = "elm-init"; - version = "1.0.1.0"; - sha256 = "9d6774b318446df940b092906e4e09310372c2dec16b3f86a75dc38682a56d4b"; + version = "1.0.1.1"; + sha256 = "6e5d8b45552e4629040efa8026d8c756db4e105a25a2f71e6d61a484b4f6e2aa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson aeson-pretty base bytestring containers directory file-embed - filepath text time + aeson aeson-pretty base base-unicode-symbols bytestring containers + directory file-embed filepath process text time ]; + jailbreak = true; description = "Set up basic structure for an elm project"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-make" = callPackage @@ -66313,7 +65477,6 @@ self: { libraryHaskellDepends = [ base singletons template-haskell void ]; description = "Proof assistant for Haskell using DataKinds & PolyKinds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "equivalence" = callPackage @@ -66394,7 +65557,6 @@ self: { homepage = "http://github.com/gombocarti/erlang-ffi"; description = "FFI interface to Erlang"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eros" = callPackage @@ -66538,6 +65700,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "error-util" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "error-util"; + version = "0.0.1.1"; + sha256 = "68d133f2211d9be2f66f7529d1d2251ec13f12f9ccdd5f1c96be53f09cf3e193"; + libraryHaskellDepends = [ base transformers ]; + homepage = "http://github.com/pmlodawski/error-util"; + description = "Set of utils and operators for error handling"; + license = stdenv.lib.licenses.mit; + }) {}; + "errorcall-eq-instance_0_1_0" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { @@ -67341,11 +66515,11 @@ self: { testHaskellDepends = [ aeson base stm tasty tasty-hunit text time ]; + doCheck = false; homepage = "http://github.com/YoEight/eventstore"; description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "every-bit-counts" = callPackage @@ -67439,7 +66613,6 @@ self: { homepage = "http://github.com/expipiplus1/exact-real"; description = "Exact real arithmetic"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exception-hierarchy" = callPackage @@ -68246,7 +67419,6 @@ self: { ]; description = "Sort large arrays on your hard drive. Kind of like the unix util sort."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extra_1_0" = callPackage @@ -69053,6 +68225,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fay_0_23_1_10" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , data-default, data-lens-light, directory, filepath, ghc-paths + , haskell-src-exts, language-ecmascript, mtl, mtl-compat + , optparse-applicative, process, safe, sourcemap, split, spoon, syb + , text, time, transformers, transformers-compat + , traverse-with-class, type-eq, uniplate, unordered-containers + , utf8-string, vector + }: + mkDerivation { + pname = "fay"; + version = "0.23.1.10"; + sha256 = "600005bf694f64a394934a7dc539b292d928af27f70169a0ac9af0cd8ee0dc76"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers data-default + data-lens-light directory filepath ghc-paths haskell-src-exts + language-ecmascript mtl mtl-compat process safe sourcemap split + spoon syb text time transformers transformers-compat + traverse-with-class type-eq uniplate unordered-containers + utf8-string vector + ]; + executableHaskellDepends = [ base mtl optparse-applicative split ]; + jailbreak = true; + homepage = "https://github.com/faylang/fay/wiki"; + description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fay-base_0_19_4_1" = callPackage ({ mkDerivation, base, fay }: mkDerivation { @@ -71498,7 +70701,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Uniplate-style generic traversals for optionally annotated fixed-point types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixpoint" = callPackage @@ -72032,7 +71234,6 @@ self: { homepage = "http://github.com/deech/fltkhs"; description = "FLTK bindings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fltkhs-fluid-examples" = callPackage @@ -72141,8 +71342,8 @@ self: { }: mkDerivation { pname = "fn"; - version = "0.2.0.0"; - sha256 = "56ce8492016a576e3cb15283984756a00c1a4c3784ee9861fd75f3ddfe290841"; + version = "0.2.0.1"; + sha256 = "8f39132f14a82c280f74b799f39367d9fc7566c9827bb1d4cc10e837ce37e95c"; libraryHaskellDepends = [ base blaze-builder bytestring directory filepath http-types text unordered-containers wai wai-extra @@ -72151,7 +71352,7 @@ self: { base directory filepath hspec http-types text unordered-containers wai wai-extra ]; - homepage = "http://github.cxom/dbp/fn#readme"; + homepage = "http://github.com/dbp/fn#readme"; description = "A functional web framework"; license = stdenv.lib.licenses.isc; }) {}; @@ -72427,24 +71628,25 @@ self: { }) {}; "folds" = callPackage - ({ mkDerivation, base, bytestring, comonad, contravariant, deepseq - , directory, doctest, filepath, lens, mtl, pointed, profunctors - , reflection, semigroupoids, semigroups, tagged, transformers - , vector + ({ mkDerivation, adjunctions, base, bifunctors, bytestring, comonad + , constraints, contravariant, data-reify, deepseq, directory + , distributive, doctest, filepath, lens, mtl, pointed, profunctors + , reflection, semigroupoids, semigroups, transformers + , unordered-containers, vector }: mkDerivation { pname = "folds"; - version = "0.6.3"; - sha256 = "a4fd905c5b74222632eafae826ca8b4ae9addd817cfc5c2481c07ebcc3c91bdd"; + version = "0.7"; + sha256 = "ec5090f3a11aa18973a239fd8285041e0766df73630864abf5ee3e14ee2ee762"; configureFlags = [ "-f-test-hlint" ]; libraryHaskellDepends = [ - base comonad contravariant lens pointed profunctors reflection - semigroupoids tagged transformers vector + adjunctions base bifunctors comonad constraints contravariant + data-reify distributive lens mtl pointed profunctors reflection + semigroupoids semigroups transformers unordered-containers vector ]; testHaskellDepends = [ base bytestring deepseq directory doctest filepath mtl semigroups ]; - jailbreak = true; homepage = "http://github.com/ekmett/folds"; description = "Beautiful Folding"; license = stdenv.lib.licenses.bsd3; @@ -73007,6 +72209,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "formura" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, either, lattices + , lens, mmorph, mtl, parsers, QuickCheck, text, trifecta, vector + }: + mkDerivation { + pname = "formura"; + version = "1.0"; + sha256 = "85f87237328c583f9178a37223def73ac394be919cbb91896c54340a69cadc8c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base containers either lattices lens mmorph mtl + parsers QuickCheck text trifecta vector + ]; + executableHaskellDepends = [ + ansi-wl-pprint base containers lens text trifecta + ]; + homepage = "http://nushio3.github.io"; + description = "Formura is a simple language to describe stencil computation"; + license = stdenv.lib.licenses.mit; + }) {}; + "forth-hll" = callPackage ({ mkDerivation, array-forth, base, free, mtl }: mkDerivation { @@ -73027,8 +72251,8 @@ self: { }: mkDerivation { pname = "foscam-directory"; - version = "0.0.4"; - sha256 = "5c68d8ecf428cccc31fe048bfea19d4c68aefdadafea0dd7752b5f9a1baeceb6"; + version = "0.0.7"; + sha256 = "ae30ec2b2a5f737436d4438ed1071a549a0d37bbf8871014aabe702046382312"; libraryHaskellDepends = [ base directory foscam-filename lens pretty trifecta utf8-string ]; @@ -73060,6 +72284,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foscam-sort" = callPackage + ({ mkDerivation, base, digit, directory, doctest, filepath + , foscam-directory, foscam-filename, lens, QuickCheck + , template-haskell, unix + }: + mkDerivation { + pname = "foscam-sort"; + version = "0.0.2"; + sha256 = "a1f76b3c3772098a7d843e955e84e4e6d41d23c197522eed23baa402de724145"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base digit directory filepath foscam-directory foscam-filename lens + unix + ]; + executableHaskellDepends = [ + base digit directory filepath foscam-directory foscam-filename lens + unix + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/tonymorris/foscam-sort"; + description = "Foscam File format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fountain" = callPackage ({ mkDerivation, base, containers, random }: mkDerivation { @@ -73327,7 +72579,6 @@ self: { jailbreak = true; description = "A markdown to Frame GUI writer for Pandoc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "franchise" = callPackage @@ -73450,6 +72701,7 @@ self: { homepage = "https://github.com/sjoerdvisscher/free-functors"; description = "Provides free functors that are adjoint to functors that forget class constraints"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-game" = callPackage @@ -73816,6 +73068,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "friday-scale-dct" = callPackage + ({ mkDerivation, base, base-compat, carray, fft, friday, vector }: + mkDerivation { + pname = "friday-scale-dct"; + version = "1.0.0.1"; + sha256 = "0a40db255149c553169d8c2cc8f7ae11b511061b45a3e5c810f9be3390951b48"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat carray fft friday vector + ]; + jailbreak = true; + homepage = "https://github.com/axman6/friday-scale-dct#readme"; + description = "Scale Friday images with DCT"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "friendly-time" = callPackage ({ mkDerivation, base, hspec, old-locale, time }: mkDerivation { @@ -73895,7 +73164,6 @@ self: { homepage = "https://github.com/atzeus/FRPNow"; description = "Program GUIs with GTK and frpnow!"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "frquotes" = callPackage @@ -74228,7 +73496,6 @@ self: { homepage = "https://notabug.org/fr33domlover/funbot/"; description = "IRC bot for fun, learning, creativity and collaboration"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "funbot-client" = callPackage @@ -74594,7 +73861,6 @@ self: { homepage = "https://github.com/tlaitinen/fuzzy-timings"; description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fuzzytime" = callPackage @@ -74712,7 +73978,6 @@ self: { homepage = "http://github.com/marcusbuffett/game-of-life"; description = "Conway's Game of Life"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "game-probability" = callPackage @@ -75896,7 +75161,6 @@ self: { homepage = "https://github.com/PaulJohnson/geodetics"; description = "Terrestrial coordinate systems and geodetic calculations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geohash" = callPackage @@ -75947,7 +75211,6 @@ self: { homepage = "https://github.com/domdere/hs-geojson"; description = "A thin GeoJSON Layer above the aeson library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geom2d" = callPackage @@ -76040,6 +75303,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "getopt-generics_0_13" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, filepath + , generics-sop, hspec, QuickCheck, safe, silently, tagged + }: + mkDerivation { + pname = "getopt-generics"; + version = "0.13"; + sha256 = "d193384dca0c9fdd8492ee888b1b8954b247f83ead6e4f3f81ded94377aaa34a"; + libraryHaskellDepends = [ + base base-compat base-orphans generics-sop tagged + ]; + testHaskellDepends = [ + base base-compat base-orphans filepath generics-sop hspec + QuickCheck safe silently tagged + ]; + homepage = "https://github.com/soenkehahn/getopt-generics#readme"; + description = "Create command line interfaces with ease"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "getopt-simple" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -76205,7 +75489,6 @@ self: { jailbreak = true; description = "Analyze and visualize event logs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-events-parallel" = callPackage @@ -76599,7 +75882,6 @@ self: { homepage = "https://github.com/JPMoresmau/ghc-pkg-lib"; description = "Provide library support for ghc-pkg information"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-prim_0_4_0_0" = callPackage @@ -76815,7 +76097,6 @@ self: { homepage = "http://felsin9.de/nnis/ghc-vis"; description = "Live visualization of data structures in GHCi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghci-diagrams" = callPackage @@ -76885,7 +76166,6 @@ self: { homepage = "https://github.com/chrisdone/ghci-ng"; description = "Next generation GHCi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghci-pretty" = callPackage @@ -77046,7 +76326,6 @@ self: { ]; description = "DOM library that supports both GHCJS and WebKitGTK"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-dom-hello" = callPackage @@ -77061,7 +76340,6 @@ self: { homepage = "https://github.com/ghcjs/ghcjs-dom-hello"; description = "GHCJS DOM Hello World, an example package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-websockets" = callPackage @@ -77162,7 +76440,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Atk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage @@ -77219,7 +76496,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkPixbuf bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk_pixbuf;}; "gi-gio" = callPackage @@ -77238,7 +76514,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gio bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-glib" = callPackage @@ -77256,7 +76531,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gobject" = callPackage @@ -77275,7 +76549,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gtk" = callPackage @@ -77334,7 +76607,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Notify bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk_pixbuf;}; "gi-pango" = callPackage @@ -77353,7 +76625,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome) pango;}; "gi-soup" = callPackage @@ -77372,7 +76643,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Soup bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome) libsoup;}; "gi-vte" = callPackage @@ -77531,7 +76801,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GIO"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gipeda_0_1_0_2" = callPackage @@ -77796,6 +77065,72 @@ self: { inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) which;}; + "git-annex_5_20151208" = callPackage + ({ mkDerivation, aeson, async, aws, base, blaze-builder + , bloomfilter, bup, byteable, bytestring, case-insensitive + , clientsession, concurrent-output, conduit, conduit-extra + , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus + , directory, dlist, dns, edit-distance, esqueleto, exceptions + , fdo-notify, feed, filepath, git, gnupg, gnutls, hinotify + , hslogger, http-client, http-conduit, http-types, IfElse, json + , lsof, MissingH, monad-control, monad-logger, mtl, network + , network-info, network-multicast, network-protocol-xmpp + , network-uri, old-locale, openssh, optparse-applicative + , path-pieces, perl, persistent, persistent-sqlite + , persistent-template, process, QuickCheck, random, regex-tdfa + , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare + , stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun + , template-haskell, text, time, torrent, transformers, unix + , unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls + , wget, which, xml-types, yesod, yesod-core, yesod-default + , yesod-form, yesod-static + }: + mkDerivation { + pname = "git-annex"; + version = "5.20151208"; + sha256 = "1513ecf944a174c7b0e7a68ec6722544c8b85c74d8ff89fc8d9ea8c177c4fce9"; + configureFlags = [ + "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" + "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" + "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp" + "-fwebapp-secure" "-fwebdav" "-fxmpp" + ]; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async aws base blaze-builder bloomfilter byteable bytestring + case-insensitive clientsession concurrent-output conduit + conduit-extra containers crypto-api cryptonite data-default DAV + dbus directory dlist dns edit-distance esqueleto exceptions + fdo-notify feed filepath gnutls hinotify hslogger http-client + http-conduit http-types IfElse json MissingH monad-control + monad-logger mtl network network-info network-multicast + network-protocol-xmpp network-uri old-locale optparse-applicative + path-pieces persistent persistent-sqlite persistent-template + process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi + securemem shakespeare stm tasty tasty-hunit tasty-quickcheck + tasty-rerun template-haskell text time torrent transformers unix + unix-compat utf8-string uuid wai wai-extra warp warp-tls xml-types + yesod yesod-core yesod-default yesod-form yesod-static + ]; + executableSystemDepends = [ + bup curl git gnupg lsof openssh perl rsync wget which + ]; + preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; + postBuild = "ln -sf dist/build/git-annex/git-annex git-annex"; + installPhase = "make PREFIX=$out CABAL=./Setup install"; + checkPhase = "./git-annex test"; + enableSharedExecutables = false; + homepage = "http://git-annex.branchable.com/"; + description = "manage files with git, without checking their contents into git"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; + inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; + inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; + inherit (pkgs) which;}; + "git-checklist" = callPackage ({ mkDerivation, base, directory, filepath, optparse-applicative , parsec, pretty, process @@ -77859,8 +77194,8 @@ self: { }: mkDerivation { pname = "git-fmt"; - version = "0.3.0.2"; - sha256 = "acfad93d49bc3a964bda95907e5b3302b4ecaccd7c4b5f8c835866551654d6c0"; + version = "0.3.1.1"; + sha256 = "aebf8a47e92e0a3a9210d45f9abcdf4e9c54eadb1e1422586df6f226dd1b55e2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77875,29 +77210,23 @@ self: { homepage = "https://github.com/hjwylde/git-fmt"; description = "Custom git command for formatting code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "git-fmt_0_3_1_0" = callPackage - ({ mkDerivation, aeson, base, exceptions, extra, fast-logger - , filepath, monad-logger, monad-parallel, mtl, optparse-applicative + "git-fmt_0_4_0_0" = callPackage + ({ mkDerivation, base, exceptions, extra, fast-logger, filepath + , monad-logger, monad-parallel, mtl, omnifmt, optparse-applicative , pipes, pipes-concurrency, temporary, text, time - , unordered-containers, yaml }: mkDerivation { pname = "git-fmt"; - version = "0.3.1.0"; - sha256 = "9342baf14ec7e0b4dbeb919fdf33588860ecf9ca706297e9601a055483e54ae2"; - isLibrary = true; + version = "0.4.0.0"; + sha256 = "13f5792fd2006f56a916f4767acef37816b513ec88d4f0aa61b62f35ae725952"; + isLibrary = false; isExecutable = true; - libraryHaskellDepends = [ - aeson base extra filepath monad-logger mtl pipes text - unordered-containers yaml - ]; executableHaskellDepends = [ base exceptions extra fast-logger filepath monad-logger - monad-parallel mtl optparse-applicative pipes pipes-concurrency - temporary text time + monad-parallel mtl omnifmt optparse-applicative pipes + pipes-concurrency temporary text time ]; homepage = "https://github.com/hjwylde/git-fmt"; description = "Custom git command for formatting code"; @@ -78051,34 +77380,29 @@ self: { "git-vogue" = callPackage ({ mkDerivation, base, bifunctors, Cabal, containers, cpphs, Diff , directory, filepath, formatting, ghc-mod, haskell-src-exts, hlint - , hscolour, hspec, mtl, optparse-applicative, process, split - , strict, stylish-haskell, temporary, text, transformers, unix + , hscolour, hspec, optparse-applicative, process, split, strict + , stylish-haskell, temporary, text, transformers, unix }: mkDerivation { pname = "git-vogue"; - version = "0.2.0.1"; - sha256 = "2c99b2cdd585c00d819ea492516ce3075f20bdf3187c6472ffb7453779f034d0"; + version = "0.2.1.0"; + sha256 = "cb42012a44e2b106963c3f4ee94dfbd5efba05715eda6753f9b4485e9a45bcd9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory filepath formatting ghc-mod hlint mtl - optparse-applicative process split stylish-haskell text - transformers unix + base containers directory filepath formatting optparse-applicative + process split text transformers unix ]; executableHaskellDepends = [ - base bifunctors Cabal containers cpphs Diff directory filepath - ghc-mod haskell-src-exts hlint hscolour optparse-applicative - process split strict stylish-haskell text + base bifunctors Cabal cpphs Diff directory ghc-mod haskell-src-exts + hlint hscolour optparse-applicative strict stylish-haskell text ]; testHaskellDepends = [ base containers directory filepath hspec process temporary - transformers unix ]; - jailbreak = true; - homepage = "https://github.com/anchor/git-vogue"; + homepage = "https://github.com/oswynb/git-vogue"; description = "A framework for pre-commit checks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitcache" = callPackage @@ -81702,8 +81026,8 @@ self: { }: mkDerivation { pname = "graphmod"; - version = "1.2.7"; - sha256 = "4929cfb35bee8f9562122248a216cb365f9fd307077fce6ec8ec0380348880ce"; + version = "1.2.8"; + sha256 = "e4fe1c418f8c975581cbfaf2ada04ad69d6f70cc0ded8c3603e2179d03d3c2fc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -82242,6 +81566,8 @@ self: { pname = "groundhog-postgresql"; version = "0.7.0.2"; sha256 = "312045c39c973596e8e92b8001776bb86898e3c8766e0a42c71e63b343918da3"; + revision = "1"; + editedCabalFile = "014cf49927d870d99d906064fc27ee219f7145e71a409cc69ae3ed0cdc0699ca"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers groundhog monad-control monad-logger postgresql-libpq postgresql-simple @@ -82701,7 +82027,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; "gtk-helpers" = callPackage @@ -82718,7 +82043,6 @@ self: { homepage = "http://keera.es/blog/community"; description = "A collection of auxiliary operations and widgets related to Gtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-jsinput" = callPackage @@ -82731,7 +82055,6 @@ self: { homepage = "http://github.com/timthelion/gtk-jsinput"; description = "A simple custom form widget for gtk which allows inputing of JSON values"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-largeTreeStore" = callPackage @@ -82748,7 +82071,6 @@ self: { testHaskellDepends = [ base containers gtk3 hspec ]; description = "Large TreeStore support for gtk2hs"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-mac-integration" = callPackage @@ -82797,7 +82119,6 @@ self: { homepage = "http://github.com/timthelion/gtk-simple-list-view"; description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-toggle-button-list" = callPackage @@ -82810,7 +82131,6 @@ self: { homepage = "http://github.com/timthelion/gtk-toggle-button-list"; description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-toy" = callPackage @@ -82837,7 +82157,6 @@ self: { homepage = "http://github.com/travitch/gtk-traymanager"; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs) x11;}; "gtk2hs-buildtools_0_13_0_3" = callPackage @@ -82991,7 +82310,6 @@ self: { ]; description = "A type class for cast functions of Gtk2hs: gtksourceview2 package"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk2hs-cast-th" = callPackage @@ -83018,7 +82336,6 @@ self: { homepage = "http://www.haskell.org/hello/"; description = "Gtk2Hs Hello World, an example package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk2hs-rpn" = callPackage @@ -83214,7 +82531,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gtk3;}; "gtk3-mac-integration" = callPackage @@ -83307,7 +82623,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome) gtksourceview;}; "gtksourceview3" = callPackage @@ -83326,7 +82641,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome) gtksourceview;}; "guarded-rewriting" = callPackage @@ -83367,7 +82681,6 @@ self: { homepage = "http://code.mathr.co.uk/gulcii"; description = "graphical untyped lambda calculus interactive interpreter"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gutenberg-fibonaccis" = callPackage @@ -84044,7 +83357,6 @@ self: { homepage = "http://perception.inf.um.es/tensor"; description = "Multidimensional arrays and simple tensor computations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hVOIDP" = callPackage @@ -84078,7 +83390,6 @@ self: { ]; description = "A Gtk mixer GUI application for FreeBSD"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haar" = callPackage @@ -84567,7 +83878,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hackage-mirror" = callPackage + "hackage-mirror_0_1_0_0" = callPackage ({ mkDerivation, aws, base, bytestring, cereal, conduit , conduit-extra, cryptohash, data-default, directory, exceptions , fast-logger, filepath, http-conduit, lifted-async, lifted-base @@ -84594,6 +83905,38 @@ self: { executableHaskellDepends = [ base monad-logger optparse-applicative ]; + jailbreak = true; + homepage = "http://fpcomplete.com"; + description = "Simple mirroring utility for Hackage"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hackage-mirror" = callPackage + ({ mkDerivation, aws, base, bytestring, cereal, conduit + , conduit-extra, cryptohash, data-default, directory, exceptions + , fast-logger, filepath, http-conduit, lifted-async, lifted-base + , mmorph, monad-control, monad-logger, old-locale + , optparse-applicative, resourcet, retry, shakespeare, stm, tar + , template-haskell, temporary, text, thyme, transformers + , unordered-containers + }: + mkDerivation { + pname = "hackage-mirror"; + version = "0.1.1.1"; + sha256 = "d710bae7061d831ae6c018691011344dd8cf93b08b950944aed7c119fbee8eae"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aws base bytestring cereal conduit conduit-extra cryptohash + data-default directory exceptions fast-logger filepath http-conduit + lifted-async lifted-base mmorph monad-control monad-logger + old-locale resourcet retry shakespeare stm tar template-haskell + temporary text thyme transformers unordered-containers + ]; + executableHaskellDepends = [ + base monad-logger optparse-applicative + ]; homepage = "http://fpcomplete.com"; description = "Simple mirroring utility for Hackage"; license = stdenv.lib.licenses.mit; @@ -85181,23 +84524,23 @@ self: { }) {}; "haggis" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers - , convertible, directory, filemanip, filepath, HDBC, HDBC-sqlite3 - , hquery, MissingH, network, old-locale, optparse-applicative - , pandoc, pandoc-types, parsec, rss, split, text, time, unix - , xmlhtml + ({ mkDerivation, base, blaze-builder, blaze-html, bytestring + , containers, convertible, directory, filemanip, filepath, HDBC + , HDBC-sqlite3, hquery, MissingH, network-uri, old-locale + , optparse-applicative, pandoc, pandoc-types, parsec, rss, split + , text, time, unix, xmlhtml }: mkDerivation { pname = "haggis"; - version = "0.1.2.1"; - sha256 = "4fbeb799154eae6550532468f56cbb3d0c026bda37ef97c421ee70233cd1b826"; + version = "0.1.3.0"; + sha256 = "68f91cffb7c2078b5c33daba0d88c46e97f3c245d811d507fa42f06567c0cf38"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-builder bytestring containers convertible directory - filemanip filepath HDBC HDBC-sqlite3 hquery MissingH network - old-locale pandoc pandoc-types parsec rss split text time unix - xmlhtml + base blaze-builder blaze-html bytestring containers convertible + directory filemanip filepath HDBC HDBC-sqlite3 hquery MissingH + network-uri old-locale pandoc pandoc-types parsec rss split text + time unix xmlhtml ]; executableHaskellDepends = [ base directory filemanip filepath optparse-applicative @@ -85297,7 +84640,6 @@ self: { jailbreak = true; description = "Multi-app web platform framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {quickcheck-lio-instances = null;}; @@ -85318,7 +84660,6 @@ self: { jailbreak = true; description = "Dynamic launcher of Hails applications"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hairy" = callPackage @@ -85895,7 +85236,6 @@ self: { homepage = "https://github.com/maxsnew/hakyll-elm"; description = "Hakyll wrapper for the Elm compiler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-sass" = callPackage @@ -86059,7 +85399,6 @@ self: { homepage = "https://github.com/timjb/halma"; description = "Library implementing Halma rules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haltavista" = callPackage @@ -86251,6 +85590,7 @@ self: { homepage = "https://github.com/utdemir/handsy"; description = "A DSL to describe common shell operations and interpeters for running them locally and remotely"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hangman" = callPackage @@ -86520,8 +85860,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.3.0"; - sha256 = "d459a80c7c54a05e31a803f200233bb491350099e04f2fb27567735fe0dfe9c2"; + version = "2.3.1"; + sha256 = "c194c82adb432854b5de13021c6e2a4557944aefd92f2c97d3691a7807109b30"; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang bytestring containers data-default email-validate filepath @@ -86542,8 +85882,8 @@ self: { }: mkDerivation { pname = "happstack-clientsession"; - version = "7.3.0"; - sha256 = "4f28d73da670517f14eb3c06e1abba3d1ffd425718649a864fd7345745a106b6"; + version = "7.3.1"; + sha256 = "5b83ea0dae41857ec9ba6de68842633e85297660565e15c739d238f51b3f86ea"; libraryHaskellDepends = [ base bytestring cereal clientsession happstack-server monad-control mtl safecopy transformers-base @@ -86703,14 +86043,13 @@ self: { }: mkDerivation { pname = "happstack-foundation"; - version = "0.5.8"; - sha256 = "700d3e55175db1c10f40efbe5bb60d7c40fa2368be96616dce85d957d1b978e9"; + version = "0.5.9"; + sha256 = "b6f06231981f1bcb8357925cd5638c01e01a4fdd9b43c9b05b5bf262aa39c176"; libraryHaskellDepends = [ acid-state base happstack-hsp happstack-server hsp lifted-base monad-control mtl reform reform-happstack reform-hsp safecopy text web-routes web-routes-happstack web-routes-hsp web-routes-th ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP"; license = stdenv.lib.licenses.bsd3; @@ -86780,8 +86119,8 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.6"; - sha256 = "e3f41aca20991e0bc5bbc00977ff97971d09b77ef293665a138efa7b74467631"; + version = "7.3.7"; + sha256 = "fe82bc53c2738a9f502f6c42500e690d04dbf3dd9811ba4140b3d8cdf6adb1f7"; libraryHaskellDepends = [ base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string @@ -86836,8 +86175,8 @@ self: { }: mkDerivation { pname = "happstack-jmacro"; - version = "7.0.10"; - sha256 = "c81c8479e31e4c333e761971b4e23c7cc51fe0ee96d381f94a2d63e15d1bf74f"; + version = "7.0.11"; + sha256 = "29c6b844d91fb7288c5264312c0cd203d964cfb0a13f98a5551699350fdbdf1c"; libraryHaskellDepends = [ base base64-bytestring bytestring cereal digest happstack-server jmacro text utf8-string wl-pprint-text @@ -87328,6 +86667,7 @@ self: { ]; description = "A web service specification compiler that generates implementation and tests"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haroonga" = callPackage @@ -87772,6 +87112,7 @@ self: { homepage = "http://hashids.org/"; description = "Hashids generates short, unique, non-sequential ids from numbers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashmap" = callPackage @@ -88305,7 +87646,6 @@ self: { homepage = "http://github.com/chrisdone/haskell-docs"; description = "A program to find and display the docs and type of a name"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-exp-parser" = callPackage @@ -88319,7 +87659,6 @@ self: { homepage = "https://github.com/emilaxelsson/haskell-exp-parser"; description = "Simple parser parser from Haskell to TemplateHaskell expressions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-formatter" = callPackage @@ -88399,15 +87738,15 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, base, bytestring, c2hs, containers, directory + ({ mkDerivation, base, bytestring, containers, directory , file-embed, filepath, free, glib, gobjectIntrospection , haskell-gi-base, mtl, pretty-show, process, safe, text , transformers, xdg-basedir, xml-conduit }: mkDerivation { pname = "haskell-gi"; - version = "0.10.1"; - sha256 = "dc62929c8018eed13acb99be501298b172345bd4f7d93024cbc59c4fc84fa86a"; + version = "0.10.2"; + sha256 = "d6e6808615a03b69b0653f10f6634315ccc8e3e57b108175a043b708e3608163"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88416,11 +87755,9 @@ self: { xdg-basedir xml-conduit ]; executablePkgconfigDepends = [ glib gobjectIntrospection ]; - executableToolDepends = [ c2hs ]; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; "haskell-gi-base" = callPackage @@ -88429,8 +87766,8 @@ self: { }: mkDerivation { pname = "haskell-gi-base"; - version = "0.10"; - sha256 = "54631b2ae430ded0eee1542fc73f3468b228058e35fbc3432db54a9f9a4c88ad"; + version = "0.10.1"; + sha256 = "04457204453324cb8cea89d86159153bc9c141d8371212c49fa379aa06f7cde0"; libraryHaskellDepends = [ base bytestring containers text transformers ]; @@ -88438,7 +87775,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi-base"; description = "Foundation for libraries generated by haskell-gi"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "haskell-import-graph" = callPackage @@ -88520,7 +87856,6 @@ self: { homepage = "http://github.com/bjpop/haskell-mpi"; description = "Distributed parallel programming in Haskell using MPI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;}; "haskell-names_0_4_1" = callPackage @@ -88958,17 +88293,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-src-exts_1_17_0" = callPackage + "haskell-src-exts_1_17_1" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck , syb, tasty, tasty-golden, tasty-smallcheck }: mkDerivation { pname = "haskell-src-exts"; - version = "1.17.0"; - sha256 = "398f668f690a7a766c7338b82d241581ff6dfbd9aa166712911535ebd3f03122"; + version = "1.17.1"; + sha256 = "ba5c547720514515ad0b94eb8a3d7e22a0e2ad2d85b5e1d178e62c61615528bd"; revision = "1"; - editedCabalFile = "ca48ccd93dd2abf02c84a35eefb88402442c45eaa45524dce1f7396ec334e31c"; + editedCabalFile = "c07248f2a7b4bee1c7777dc6e441e8d1f32a02fb596ea49f47074c68b3c9ea0b"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ @@ -89082,6 +88417,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-meta_0_6_0_13" = callPackage + ({ mkDerivation, base, haskell-src-exts, pretty, syb + , template-haskell, th-orphans + }: + mkDerivation { + pname = "haskell-src-meta"; + version = "0.6.0.13"; + sha256 = "3f33d39d5451f3a44d348981ae5923da65cb26356d962dc9f2cb0fc64670ceb6"; + libraryHaskellDepends = [ + base haskell-src-exts pretty syb template-haskell th-orphans + ]; + description = "Parse source to template-haskell abstract syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-meta-mwotton" = callPackage ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts , pretty, syb, template-haskell @@ -89136,8 +88487,8 @@ self: { }: mkDerivation { pname = "haskell-tor"; - version = "0.1.1"; - sha256 = "7d6a46a46c04d6c2fcfbaaf8fc080edff2b51c719ad0882c467c787b9f392774"; + version = "0.1.2"; + sha256 = "643fb2b1064482fbb636b1cac76721bec73e52257e3a88f98039d0d7d1d2d84b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89155,7 +88506,6 @@ self: { pretty-hex QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 time x509 ]; - jailbreak = true; homepage = "http://github.com/GaloisInc/haskell-tor"; description = "A Haskell Tor Node"; license = stdenv.lib.licenses.bsd3; @@ -89676,17 +89026,17 @@ self: { "haskellscrabble" = callPackage ({ mkDerivation, array, arrows, base, containers, directory, errors - , filepath, HUnit, mtl, parsec, QuickCheck, random, safe + , filepath, HUnit, listsafe, mtl, parsec, QuickCheck, random, safe , semigroups, split, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers, unordered-containers }: mkDerivation { pname = "haskellscrabble"; - version = "1.1"; - sha256 = "90140a7947d7df47c2a405c819f5a73c6e526aff0fc1fad0e49b29fd2fb369f1"; + version = "1.2"; + sha256 = "2ac73cbcb6327fe989dbc1293e7d58184958d7f7455a9521a353d2d5742ea8cd"; libraryHaskellDepends = [ - array arrows base containers errors mtl parsec QuickCheck random - safe semigroups split transformers unordered-containers + array arrows base containers errors listsafe mtl parsec QuickCheck + random safe semigroups split transformers unordered-containers ]; testHaskellDepends = [ base containers directory filepath HUnit QuickCheck random @@ -89749,7 +89099,6 @@ self: { homepage = "http://github.com/JoeyEremondi/haskelm"; description = "Elm to Haskell translation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskgame" = callPackage @@ -90287,7 +89636,6 @@ self: { homepage = "http://haskell.org/haskore/"; description = "The February 2000 version of Haskore"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasktags" = callPackage @@ -90587,7 +89935,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hasql_0_14_0_2" = callPackage + "hasql_0_15_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , contravariant, contravariant-extras, data-default-class, dlist , either, hashable, hashtables, loch-th, placeholders @@ -90598,8 +89946,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "0.14.0.2"; - sha256 = "b07aa754eb948c56b99f0cee5c360a3bf5566bba3cc2d429f329d6ad52184193"; + version = "0.15.0.2"; + sha256 = "1264ebf39cd39977175f96f00c4330bbecd96882ac7463dd627b1e7cff3c9f52"; libraryHaskellDepends = [ aeson attoparsec base base-prelude bytestring contravariant contravariant-extras data-default-class dlist either hashable @@ -90734,6 +90082,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-pool" = callPackage + ({ mkDerivation, base-prelude, hasql, resource-pool, time }: + mkDerivation { + pname = "hasql-pool"; + version = "0.1"; + sha256 = "be1db9c80ebdaf6f1ef0e75970e28286d435141a515ea6f83742373ffb51e330"; + libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; + jailbreak = true; + homepage = "https://github.com/nikita-volkov/hasql-pool"; + description = "A pool of connections for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-postgres_0_7_3" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bytestring, either , hashable, hashtables, hasql, hasql-backend, HTF, list-t, loch-th @@ -91070,6 +90432,46 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-th" = callPackage + ({ mkDerivation, attoparsec, base-prelude, bytestring, hasql + , hasql-transaction, template-haskell, text + }: + mkDerivation { + pname = "hasql-th"; + version = "0.1.0.1"; + sha256 = "170b6128b06e57675778de8b8ffe29ea0082cb8d2047d67f1fce0a5d0e45c2bf"; + libraryHaskellDepends = [ + attoparsec base-prelude bytestring hasql hasql-transaction + template-haskell text + ]; + jailbreak = true; + homepage = "https://github.com/nikita-volkov/hasql-th"; + description = "Template Haskell utilities for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hasql-transaction" = callPackage + ({ mkDerivation, base-prelude, bytestring, bytestring-tree-builder + , contravariant, contravariant-extras, either, hasql + , postgresql-error-codes, transformers + }: + mkDerivation { + pname = "hasql-transaction"; + version = "0.3.1"; + sha256 = "dec9cbb6be2ca68da83af8a512293f6b41ebfc7747cc38105d5aed11625c9037"; + libraryHaskellDepends = [ + base-prelude bytestring bytestring-tree-builder contravariant + contravariant-extras either hasql postgresql-error-codes + transformers + ]; + jailbreak = true; + homepage = "https://github.com/nikita-volkov/hasql-transaction"; + description = "A composable abstraction over the retryable transactions for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hastache_0_6_0" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , directory, filepath, HUnit, ieee754, mtl, syb, text, transformers @@ -93165,7 +92567,6 @@ self: { homepage = "https://github.com/nh2/hemokit"; description = "Haskell port of the Emokit EEG project"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hen" = callPackage @@ -94165,8 +93566,8 @@ self: { }: mkDerivation { pname = "hgrev"; - version = "0.1.4"; - sha256 = "27b11ffd928e4b6bbb7436e15a15ef7632170d90111e3309c37241493795bf9c"; + version = "0.1.5"; + sha256 = "e23dbba95f6f1cf9becb165c4233d5d744c8af0b57c049d4d9986d4e504658f6"; libraryHaskellDepends = [ aeson base bytestring directory filepath process template-haskell ]; @@ -94201,8 +93602,8 @@ self: { ({ mkDerivation, base, harp }: mkDerivation { pname = "hharp"; - version = "0.1.1.0"; - sha256 = "da3847a04062d7c6320c41d60636c7d653c0ed008666c36af79d59c1a80cf3b8"; + version = "0.1.1.1"; + sha256 = "f5868e6f1f34f5448c4865f286ba06b186a47fc61894d20707dedb2b9214b65e"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ harp ]; jailbreak = true; @@ -95750,7 +95151,6 @@ self: { ]; description = "A library to build valid LaTeX files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hlbfgsb" = callPackage @@ -96209,8 +95609,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "0.27"; - sha256 = "691f842116178037a338db298dc179b304b10349d98d3df1a4981ca57b57df4b"; + version = "0.27.1"; + sha256 = "98721c60eb3d30005f51fc1468c6d8a95d87088a2bfa0c95c734569820fd9c4b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96218,7 +95618,6 @@ self: { hledger hledger-lib HUnit lens pretty-show safe split time transformers vector vty ]; - jailbreak = true; homepage = "http://hledger.org"; description = "Curses-style user interface for the hledger accounting tool"; license = "GPL"; @@ -96927,7 +96326,6 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Linear Programming based on GLPK"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glpk;}; "hmatrix-gsl_0_16_0_2" = callPackage @@ -97039,7 +96437,6 @@ self: { homepage = "http://code.haskell.org/hmatrix-gsl-stats"; description = "GSL Statistics interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gsl;}; "hmatrix-mmap" = callPackage @@ -97177,7 +96574,6 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Tests for hmatrix"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmeap" = callPackage @@ -99079,7 +98475,6 @@ self: { homepage = "https://github.com/mikeplus64/hotswap"; description = "Simple code hotswapping"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hourglass_0_2_6" = callPackage @@ -99434,6 +98829,7 @@ self: { directory-tree hpc process pureMD5 regex-posix retry safe split ]; testHaskellDepends = [ base HUnit ]; + jailbreak = true; homepage = "https://github.com/guillaume-nargeot/hpc-coveralls"; description = "Coveralls.io support for Haskell."; license = stdenv.lib.licenses.bsd3; @@ -99688,7 +99084,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hprotoc" = callPackage + "hprotoc_2_1_7" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , directory, filepath, haskell-src-exts, mtl, parsec , protocol-buffers, protocol-buffers-descriptor, utf8-string @@ -99711,6 +99107,36 @@ self: { protocol-buffers-descriptor utf8-string ]; executableToolDepends = [ alex ]; + jailbreak = true; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hprotoc" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , directory, filepath, haskell-src-exts, mtl, parsec + , protocol-buffers, protocol-buffers-descriptor, utf8-string + }: + mkDerivation { + pname = "hprotoc"; + version = "2.1.9"; + sha256 = "70961b74f932e7f6a4615eb5ae39e9d72db1b53ec33998dc66b053f2c09a6bf5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath + haskell-src-exts mtl parsec protocol-buffers + protocol-buffers-descriptor utf8-string + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ + array base binary bytestring containers directory filepath + haskell-src-exts mtl parsec protocol-buffers + protocol-buffers-descriptor utf8-string + ]; + executableToolDepends = [ alex ]; homepage = "https://github.com/k-bx/protocol-buffers"; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; @@ -100762,7 +100188,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-auditor"; description = "Haskell SuperCollider Auditor"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-cairo" = callPackage @@ -101041,7 +100466,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-sf-hsndfile"; description = "Haskell SuperCollider SoundFile"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-unsafe" = callPackage @@ -101264,7 +100688,6 @@ self: { homepage = "https://github.com/skogsbaer/hscurses"; description = "NCurses bindings for Haskell"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hscurses-fish-ex" = callPackage @@ -101279,7 +100702,6 @@ self: { homepage = "http://ui3.info/darcs/hscurses-fish-ex/"; description = "hscurses swimming fish example"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsdev_0_1_3_4" = callPackage @@ -101524,8 +100946,8 @@ self: { }: mkDerivation { pname = "hsexif"; - version = "0.6.0.6"; - sha256 = "19e0a298d799c72b4bff13a0c08620cd4d49fe47dc4a06b07d8fa2ce310b01d6"; + version = "0.6.0.7"; + sha256 = "35b68bd3c956143760a149479a2debe4ccc1f63acf13e592c741b1f5cb63b3ce"; libraryHaskellDepends = [ base binary bytestring containers iconv text time ]; @@ -101891,27 +101313,23 @@ self: { }) {}; "hslogger-reader" = callPackage - ({ mkDerivation, attoparsec, base, hslogger, old-locale - , optparse-applicative, text, text-icu, time + ({ mkDerivation, attoparsec, base, hslogger, optparse-applicative + , text, text-icu, time }: mkDerivation { pname = "hslogger-reader"; - version = "1.0.0"; - sha256 = "dec424816d6b1acdff3efdf1151e97c420b0e7522376e3cafb52930c22005dad"; + version = "1.0.1"; + sha256 = "61d0b5f870ef3b5a436ad7e89a2f97ecd4c2bdd3b65998ffe4c71480313dc148"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - attoparsec base hslogger old-locale text time - ]; + libraryHaskellDepends = [ attoparsec base hslogger text time ]; executableHaskellDepends = [ - attoparsec base hslogger old-locale optparse-applicative text - text-icu time + attoparsec base hslogger optparse-applicative text text-icu time ]; jailbreak = true; homepage = "http://github.com/prophet-on-that/hslogger-reader"; description = "Parsing hslogger-produced logs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslogger-template" = callPackage @@ -101963,7 +101381,6 @@ self: { homepage = "https://github.com/bartavelle/hslogstash"; description = "A library to work with, or as, a logstash server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslua_0_3_13" = callPackage @@ -102091,7 +101508,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Hsndfile"; description = "Haskell bindings for libsndfile"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libsndfile;}; "hsndfile-storablevector" = callPackage @@ -102117,7 +101533,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Hsndfile"; description = "Haskell bindings for libsndfile (Data.Vector interface)"; license = stdenv.lib.licenses.lgpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsnock" = callPackage @@ -102479,8 +101894,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.2.0"; - sha256 = "0e733942f2b0c87b62ea43627ca3c90c7e638adb390efff48e5f2f6a7fd7117f"; + version = "2.2.1"; + sha256 = "c27fdf9181c182a0f1829f1217c9455b157526e0d50bc6bd4823e1464839f17a"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -102735,8 +102150,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.2.0"; - sha256 = "44e9c15cca1639ccc24fcd925cd53f92f96322f691ed6903724a8a626629edf1"; + version = "2.2.1"; + sha256 = "af50b465accc865bdbce450f04b1ba69348cae71523a5212c2aa50a995ad4e75"; libraryHaskellDepends = [ ansi-terminal async base deepseq hspec-expectations HUnit QuickCheck quickcheck-io random setenv tf-random time transformers @@ -102875,8 +102290,8 @@ self: { ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; - version = "2.2.0"; - sha256 = "fd5f7535f31b202cfe0bc4e00a97488f32e66850b867993bc4903849d7e76a70"; + version = "2.2.1"; + sha256 = "112ea28befc8e5b441fe99029bbbb83ad5dde2a994908facc610667ad0fb76c5"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ base directory filepath ]; @@ -103311,7 +102726,6 @@ self: { testHaskellDepends = [ base hspec test-sandbox ]; description = "Hspec convenience functions for use with test-sandbox"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-wai_0_6_2" = callPackage @@ -103841,7 +103255,6 @@ self: { homepage = "http://code.haskell.org/hstatistics"; description = "Statistics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hstats" = callPackage @@ -106489,11 +105902,10 @@ self: { ({ mkDerivation, base, bytestring, HUnit, mtl, serialport }: mkDerivation { pname = "huckleberry"; - version = "0.9.0.1"; - sha256 = "14cc07a372980fbd9a04fb20c24aab4098619b9555dfec40e9a00eced31e7578"; + version = "0.9.0.2"; + sha256 = "70fd7cbe9e41d28f2d8882364646007745ce6b2a64d6369b25fd5a3222eda32d"; libraryHaskellDepends = [ base bytestring mtl serialport ]; testHaskellDepends = [ base HUnit ]; - jailbreak = true; description = "IchigoJam BASIC expressed in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -106615,6 +106027,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hunit-dejafu" = callPackage + ({ mkDerivation, base, dejafu, HUnit }: + mkDerivation { + pname = "hunit-dejafu"; + version = "0.2.0.0"; + sha256 = "c81eb0cd3e6c53509c056b0f37dcdb5f7fac6e7766abf36fb68c44e3dd997db0"; + libraryHaskellDepends = [ base dejafu HUnit ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Deja Fu support for the HUnit test framework"; + license = stdenv.lib.licenses.mit; + }) {}; + "hunit-gui" = callPackage ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }: mkDerivation { @@ -106801,7 +106225,6 @@ self: { homepage = "http://justinethier.github.com/husk-scheme"; description = "R5RS Scheme interpreter, compiler, and library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "husk-scheme-libs" = callPackage @@ -106818,7 +106241,6 @@ self: { homepage = "http://justinethier.github.com/husk-scheme"; description = "Extra libraries for the husk Scheme platform"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "husky" = callPackage @@ -106973,7 +106395,6 @@ self: { homepage = "http://github.com/dbp/hworker"; description = "A reliable at-least-once job queue built on top of redis"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hworker-ses" = callPackage @@ -106992,7 +106413,6 @@ self: { homepage = "http://github.com/dbp/hworker-ses"; description = "Library for sending email with Amazon's SES and hworker"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hws" = callPackage @@ -108057,8 +107477,8 @@ self: { }: mkDerivation { pname = "hyperloglog"; - version = "0.4.0.3"; - sha256 = "a1d54ced920779ca32197d7f7f1db235fd2f41af500f935ef7bd0c76a3b94241"; + version = "0.4.0.4"; + sha256 = "34d7a2db30d680bc38ab7fa3488e9182adacee65a751b75cc5e99eb9f39b9847"; libraryHaskellDepends = [ approximate base binary bits bytes cereal cereal-vector comonad deepseq distributive hashable hashable-extras lens reflection @@ -108378,7 +107798,6 @@ self: { homepage = "https://github.com/ibotty/iban"; description = "Validate and generate IBANs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ical" = callPackage @@ -109432,6 +108851,50 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ihaskell_0_8_3_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bin-package-db + , bytestring, cereal, cmdargs, containers, directory, filepath, ghc + , ghc-parser, ghc-paths, haskeline, haskell-src-exts, hlint, hspec + , http-client, http-client-tls, HUnit, ipython-kernel, mtl, parsec + , process, random, setenv, shelly, split, stm, strict, system-argv0 + , text, transformers, unix, unordered-containers, utf8-string, uuid + , vector + }: + mkDerivation { + pname = "ihaskell"; + version = "0.8.3.0"; + sha256 = "c486e0b6342fa6261c671ad6a891f5763f7979bc225781329fe9f913a3833107"; + revision = "1"; + editedCabalFile = "4079263fe3b633e589775753fe7e3bbab21c800fd7d54c2aa6761478c5019654"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bin-package-db bytestring cereal + cmdargs containers directory filepath ghc ghc-parser ghc-paths + haskeline haskell-src-exts hlint http-client http-client-tls + ipython-kernel mtl parsec process random shelly split stm strict + system-argv0 text transformers unix unordered-containers + utf8-string uuid vector + ]; + executableHaskellDepends = [ + aeson base bin-package-db bytestring containers directory ghc + ipython-kernel process strict text transformers unix + ]; + testHaskellDepends = [ + aeson base base64-bytestring bin-package-db bytestring cereal + cmdargs containers directory filepath ghc ghc-parser ghc-paths + haskeline haskell-src-exts hlint hspec http-client http-client-tls + HUnit ipython-kernel mtl parsec process random setenv shelly split + stm strict system-argv0 text transformers unix unordered-containers + utf8-string uuid vector + ]; + jailbreak = true; + homepage = "http://github.com/gibiansky/IHaskell"; + description = "A Haskell backend kernel for the IPython project"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ihaskell-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here , ihaskell, text @@ -110151,7 +109614,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "incremental-parser" = callPackage + "incremental-parser_0_2_4" = callPackage ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck , tasty, tasty-quickcheck }: @@ -110166,6 +109629,24 @@ self: { homepage = "http://patch-tag.com/r/blamario/incremental-parser/wiki/"; description = "Generic parser library capable of providing partial results from partial input"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "incremental-parser" = callPackage + ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.2.4.1"; + sha256 = "1630a763db0808cfa4c1439365e21a53a378b38c2c02957539a9f75bb482b054"; + libraryHaskellDepends = [ base monoid-subclasses ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + homepage = "https://github.com/blamario/incremental-parser"; + description = "Generic parser library capable of providing partial results from partial input"; + license = "GPL"; }) {}; "incremental-sat-solver" = callPackage @@ -110319,7 +109800,6 @@ self: { libraryHaskellDepends = [ base gtk HDBC HDBC-sqlite3 ]; description = "Indian Language Font Converter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "indices" = callPackage @@ -110515,9 +109995,11 @@ self: { base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck tasty-th text vector ]; + jailbreak = true; homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -110725,8 +110207,8 @@ self: { }: mkDerivation { pname = "inline-r"; - version = "0.7.2.0"; - sha256 = "2cd4cd0cbf47c1a6a40a9803a34f5f913520eb3e61b95a26a65bfab0e083dc34"; + version = "0.7.3.0"; + sha256 = "4de9508426ad48159502d7e2b3c241367643c8a2645f62b61d896e7b7535e329"; libraryHaskellDepends = [ aeson base bytestring data-default-class deepseq exceptions mtl pretty primitive process setenv singletons template-haskell text @@ -111258,7 +110740,6 @@ self: { homepage = "http://mbays.freeshell.org/intricacy"; description = "A game of competitive puzzle-design"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intset" = callPackage @@ -111432,7 +110913,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "io-streams" = callPackage + "io-streams_1_3_2_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , deepseq, directory, filepath, HUnit, mtl, network, primitive , process, QuickCheck, test-framework, test-framework-hunit @@ -111456,6 +110937,33 @@ self: { ]; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "io-streams" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , deepseq, directory, filepath, HUnit, mtl, network, primitive + , process, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers, vector + , zlib, zlib-bindings + }: + mkDerivation { + pname = "io-streams"; + version = "1.3.3.1"; + sha256 = "9a0849eb2efaf72312bbba672c2a589763c15dde50e93a53c64d2b594b80f544"; + configureFlags = [ "-fnointeractivetests" ]; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-builder network primitive + process text time transformers vector zlib-bindings + ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder deepseq directory + filepath HUnit mtl network primitive process QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + time transformers vector zlib zlib-bindings + ]; + description = "Simple, composable, and easy-to-use stream I/O"; + license = stdenv.lib.licenses.bsd3; }) {}; "io-streams-http" = callPackage @@ -111855,6 +111363,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ipython-kernel_0_8_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, containers + , directory, filepath, mtl, parsec, process, SHA, temporary, text + , transformers, unordered-containers, uuid, zeromq4-haskell + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.8.3.0"; + sha256 = "e865322381ddc4271fc2b0650aeee70d04036e2114e1a77921878c150af5a60c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cereal containers directory filepath mtl + process SHA temporary text transformers unordered-containers uuid + zeromq4-haskell + ]; + executableHaskellDepends = [ + base filepath mtl parsec text transformers + ]; + homepage = "http://github.com/gibiansky/IHaskell"; + description = "A library for creating kernels for IPython frontends"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -111990,7 +111523,6 @@ self: { homepage = "http://rel4tion.org/projects/irc-fun-bot/"; description = "Library for writing fun IRC bots"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-fun-client" = callPackage @@ -112074,7 +111606,6 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; description = "Real numbers and intervals with relatively efficient exact arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iron-mq" = callPackage @@ -112167,7 +111698,6 @@ self: { executableHaskellDepends = [ base gtk3 ]; description = "A program to show the size of image and whether suitable for wallpaper"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "islink" = callPackage @@ -113582,7 +113112,6 @@ self: { jailbreak = true; description = "High level interface for webkit-javascriptcore"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-hello" = callPackage @@ -113598,7 +113127,6 @@ self: { homepage = "https://github.com/ghcjs/jsaddle-hello"; description = "JSaddle Hello World, an example package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsc" = callPackage @@ -114877,7 +114405,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "kansas-comet" = callPackage + "kansas-comet_0_3_1" = callPackage ({ mkDerivation, aeson, base, containers, data-default, scotty, stm , text, time, transformers, unordered-containers }: @@ -114896,6 +114424,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "kansas-comet" = callPackage + ({ mkDerivation, aeson, base, containers, data-default-class + , scotty, stm, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "kansas-comet"; + version = "0.4"; + sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1"; + libraryHaskellDepends = [ + aeson base containers data-default-class scotty stm text time + transformers unordered-containers + ]; + homepage = "https://github.com/ku-fpg/kansas-comet/"; + description = "A JavaScript push mechanism based on the comet idiom"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "kansas-lava" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers , data-default, data-reify, directory, dotgen, filepath, netlist @@ -115266,7 +114811,6 @@ self: { homepage = "http://www.keera.es/blog/community/"; description = "Haskell on Gtk rails - Gtk-based View for MVC applications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keera-hails-reactive-fs" = callPackage @@ -115347,7 +114891,7 @@ self: { homepage = "http://www.keera.es/blog/community/"; description = "Haskell on Rails - Reactive Fields for WX widgets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keera-hails-reactive-yampa" = callPackage @@ -116721,7 +116265,6 @@ self: { homepage = "https://github.com/xkollar/lambda2js"; description = "Untyped Lambda calculus to JavaScript compiler"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdaBase" = callPackage @@ -119024,7 +118567,6 @@ self: { ]; description = "Haskell code for learning physics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "learn-physics-examples" = callPackage @@ -119116,7 +118658,6 @@ self: { homepage = "http://www.leksah.org"; description = "Haskell IDE written in Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leksah-server" = callPackage @@ -119154,7 +118695,6 @@ self: { homepage = "http://leksah.org"; description = "Metadata collection for leksah"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lendingclub" = callPackage @@ -120166,8 +119706,8 @@ self: { }: mkDerivation { pname = "libgraph"; - version = "1.7"; - sha256 = "5dfcfcba1005a4ac411192f2a8138100534ec7c2e576f46e4acb6367e89dbc33"; + version = "1.9"; + sha256 = "621f0dbd1bfc57d7fbd593698ed31af9b1943ba65fc9ece31514d6caab58748a"; libraryHaskellDepends = [ array base containers monads-tf process union-find ]; @@ -120338,7 +119878,6 @@ self: { librarySystemDepends = [ libnotify ]; description = "Bindings to libnotify library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libnotify;}; "libnvvm" = callPackage @@ -120445,10 +119984,8 @@ self: { }: mkDerivation { pname = "libravatar"; - version = "0.1.0.1"; - sha256 = "a58713664cab79ddc03c4faa92175a81fe179b51b852ce46570486cb3bb42d03"; - revision = "1"; - editedCabalFile = "decdd92e332caef49c016d1779e401dc3288b753e73317d639e279a8048a766d"; + version = "0.2.0.0"; + sha256 = "a195549f60f88966732141a7bcab3fdfedb70bdbbb686ad3e2651518317082d5"; libraryHaskellDepends = [ base bytestring crypto-api dns network-uri pureMD5 random SHA url utf8-string @@ -120475,7 +120012,6 @@ self: { homepage = "https://github.com/portnov/libssh2-hs"; description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libssh2; ssh2 = null;}; "libssh2-conduit" = callPackage @@ -121349,12 +120885,11 @@ self: { }: mkDerivation { pname = "linear-opengl"; - version = "0.2.0.9"; - sha256 = "d07378f189641577cb6229dd3812ba9786394c35a16bf21ab3d01b3b5640178d"; + version = "0.2.0.10"; + sha256 = "9dc10dc309a2b6eb64da004106fa6a4c50beabc6c06e5fbb917e46ce5133217d"; libraryHaskellDepends = [ base distributive lens linear OpenGL OpenGLRaw tagged ]; - jailbreak = true; homepage = "http://www.github.com/bgamari/linear-opengl"; description = "Isomorphisms between linear and OpenGL types"; license = stdenv.lib.licenses.bsd3; @@ -121398,7 +120933,6 @@ self: { homepage = "http://github.com/jwiegley/linearscan"; description = "Linear scan register allocator, formally verified in Coq"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linearscan-hoopl" = callPackage @@ -121536,9 +121070,11 @@ self: { aeson base bytestring containers tasty tasty-hunit tasty-quickcheck text ]; + jailbreak = true; homepage = "http://github.com/Helkafen/haskell-linode#readme"; description = "Bindings to the Linode API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linux-blkid" = callPackage @@ -122150,7 +121686,6 @@ self: { homepage = "https://github.com/nikita-volkov/list-t-attoparsec"; description = "An \"attoparsec\" adapter for \"list-t\""; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-t-html-parser" = callPackage @@ -122248,6 +121783,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "list-zip-def" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "list-zip-def"; + version = "0.1.0.1"; + sha256 = "d0447f7e5347eb2b8e6d27ddcc647677b5e33a44c3e61995c2faa99deed3ca1d"; + libraryHaskellDepends = [ base ]; + description = "Provides zips where the combining doesn't stop premature, but instead uses default values"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "listlike-instances" = callPackage ({ mkDerivation, base, bytestring, ListLike, text, vector }: mkDerivation { @@ -122567,7 +122113,6 @@ self: { ]; description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {llvm-config = null;}; "llvm-general-pure" = callPackage @@ -123081,7 +122626,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "log-domain" = callPackage + "log-domain_0_10_3" = callPackage ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq , directory, distributive, doctest, filepath, generic-deriving , hashable, hashable-extras, safecopy, semigroupoids, semigroups @@ -123102,6 +122647,30 @@ self: { homepage = "http://github.com/ekmett/log-domain/"; description = "Log-domain arithmetic"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "log-domain" = callPackage + ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq + , directory, distributive, doctest, filepath, generic-deriving + , hashable, hashable-extras, safecopy, semigroupoids, semigroups + , simple-reflect, vector + }: + mkDerivation { + pname = "log-domain"; + version = "0.10.3.1"; + sha256 = "36f427506218358b20a2066d5fb38406816fabac18ca26c807a416a795643815"; + libraryHaskellDepends = [ + base binary bytes cereal comonad deepseq distributive hashable + hashable-extras safecopy semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base directory doctest filepath generic-deriving semigroups + simple-reflect + ]; + homepage = "http://github.com/ekmett/log-domain/"; + description = "Log-domain arithmetic"; + license = stdenv.lib.licenses.bsd3; }) {}; "log-effect" = callPackage @@ -123404,6 +122973,8 @@ self: { pname = "lol"; version = "0.1.0.0"; sha256 = "be1a72e80ca1f3471b1b630f0407fa6e152ce6410ea7aee86fabda002dff12d0"; + revision = "1"; + editedCabalFile = "f70d927711c82b11f9d38d398bf8d450788482693cdbde540331ca50674b8e68"; libraryHaskellDepends = [ arithmoi base constraints containers data-default deepseq MonadRandom mtl numeric-prelude QuickCheck random reflection repa @@ -123800,7 +123371,6 @@ self: { homepage = "http://www.leksah.org"; description = "Leksah tool kit"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ltl" = callPackage @@ -124103,8 +123673,8 @@ self: { }: mkDerivation { pname = "luminance"; - version = "0.7.1"; - sha256 = "36aabb520ede1cd9dfe6e6c5dc6a45d21c06500e1fdf66ce497e3081d27d56a0"; + version = "0.7.2"; + sha256 = "0ae406e8958c1e6f2520a01d74a55b70d158198ef0d08bbaf30452dc54e9deab"; libraryHaskellDepends = [ base containers contravariant dlist gl linear mtl resourcet semigroups transformers vector void @@ -124114,6 +123684,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "luminance_0_8_2" = callPackage + ({ mkDerivation, base, containers, contravariant, dlist, gl, linear + , mtl, resourcet, semigroups, transformers, vector, void + }: + mkDerivation { + pname = "luminance"; + version = "0.8.2"; + sha256 = "e7ec4cb6b688077c51de48ebe4ad552e8943ad0f4a7aabfda608652c0ccfdaba"; + libraryHaskellDepends = [ + base containers contravariant dlist gl linear mtl resourcet + semigroups transformers vector void + ]; + homepage = "https://github.com/phaazon/luminance"; + description = "Type-safe, type-level and stateless graphics framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "luminance-samples" = callPackage ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear , luminance, mtl, resourcet, transformers @@ -124134,6 +123722,27 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "luminance-samples_0_8" = callPackage + ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear + , luminance, mtl, resourcet, transformers + }: + mkDerivation { + pname = "luminance-samples"; + version = "0.8"; + sha256 = "35580954897bcb2fdbd7eecc14982b44f5026e64be08d7398f8cc7fa0925a962"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base contravariant GLFW-b JuicyPixels linear luminance mtl + resourcet transformers + ]; + jailbreak = true; + homepage = "https://github.com/phaazon/luminance-samples"; + description = "Luminance samples"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lushtags" = callPackage ({ mkDerivation, base, haskell-src-exts, text, vector }: mkDerivation { @@ -124459,7 +124068,6 @@ self: { ]; description = "Monadic Abstracting Abstract Machines (MAAM) built on Galois Transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mac" = callPackage @@ -125733,7 +125341,6 @@ self: { homepage = "https://github.com/leftaroundabout/manifolds"; description = "Sampling random points on general manifolds"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manifolds" = callPackage @@ -125743,8 +125350,8 @@ self: { }: mkDerivation { pname = "manifolds"; - version = "0.1.5.2"; - sha256 = "388d3711ac1f6ff15264c34d5920ce899efd2834363a9028c18facea01e0c1e2"; + version = "0.1.6.2"; + sha256 = "d074a16877f078da4794b7f26b7edea7eec1df7a41527a5005a3b4d6f2abef02"; libraryHaskellDepends = [ base comonad constrained-categories containers deepseq hmatrix MemoTrie semigroups tagged transformers vector vector-space void @@ -125752,7 +125359,6 @@ self: { homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "map-syntax" = callPackage @@ -126282,7 +125888,6 @@ self: { ]; description = "Discover your (academic) ancestors!"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mathista" = callPackage @@ -126566,8 +126171,8 @@ self: { }: mkDerivation { pname = "maxsharing"; - version = "1.0.2"; - sha256 = "9d93467d369bd5061a29fffc59a38f9076524b82482e148e85b550d9ea1a3fa9"; + version = "1.0.3"; + sha256 = "4b9ae7230c590b7d9e6060d791e01d9bda953ae41d47c6e88912325b30e8a284"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -127857,7 +127462,6 @@ self: { homepage = "https://github.com/mrkkrp/mida"; description = "Language for algorithmic generation of MIDI files"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi" = callPackage @@ -128024,6 +127628,7 @@ self: { homepage = "http://www.mew.org/~kazu/proj/mighttpd/"; description = "High performance web server on WAI/warp"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mighty-metropolis" = callPackage @@ -128469,8 +128074,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, transformers }: mkDerivation { pname = "minilens"; - version = "0.1.0.1"; - sha256 = "b259c6a9b7c799e2fea350d41f0c4d7aa19fcef74fae9bc2db70ac81d454e285"; + version = "0.1.1.1"; + sha256 = "99586ecf220ec1a16c71b03df6da0439b4c711e4ae6b8510cea85473aa12da80"; libraryHaskellDepends = [ array base containers mtl transformers ]; jailbreak = true; homepage = "https://github.com/RaminHAL9001/minilens"; @@ -128482,16 +128087,13 @@ self: { ({ mkDerivation, base, containers, directory, filepath, tconfig }: mkDerivation { pname = "minimal-configuration"; - version = "0.1.1"; - sha256 = "83b4efb30c599c0262e63f5cad7583fa1b065dfa869029be52c54d302808271b"; - revision = "1"; - editedCabalFile = "12049d8491610c2789c61e4736586d3fa8b1122c5c7657647c3de8d21073ef80"; + version = "0.1.2"; + sha256 = "7debae44339df6a1c35e99be9807df430fac30d6c27b606f36fe23deed4d928e"; libraryHaskellDepends = [ base containers directory filepath tconfig ]; - jailbreak = true; description = "Minimal ini like configuration library with a few extras"; - license = stdenv.lib.licenses.bsd3; + license = "unknown"; }) {}; "minimorph" = callPackage @@ -130050,7 +129652,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monad-skeleton" = callPackage + "monad-skeleton_0_1_2_1" = callPackage ({ mkDerivation, base, containers, ghc-prim }: mkDerivation { pname = "monad-skeleton"; @@ -130060,6 +129662,19 @@ self: { homepage = "https://github.com/fumieval/monad-skeleton"; description = "An undead monad"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "monad-skeleton" = callPackage + ({ mkDerivation, base, containers, ghc-prim }: + mkDerivation { + pname = "monad-skeleton"; + version = "0.1.2.2"; + sha256 = "b1cc4f0b9e308374c76902942b8381e0af869b0915735d380f792bb11e362de3"; + libraryHaskellDepends = [ base containers ghc-prim ]; + homepage = "https://github.com/fumieval/monad-skeleton"; + description = "An undead monad"; + license = stdenv.lib.licenses.bsd3; }) {}; "monad-st" = callPackage @@ -131330,22 +130945,22 @@ self: { "morte" = callPackage ({ mkDerivation, alex, array, base, binary, containers, deepseq - , happy, http-client, http-client-tls, managed, microlens + , Earley, http-client, http-client-tls, managed, microlens , microlens-mtl, optparse-applicative, pipes, system-fileio , system-filepath, text, text-format, transformers }: mkDerivation { pname = "morte"; - version = "1.3.1"; - sha256 = "8f97f9e6d23845c6879ebdc26c317520ba1608c5d4143a80f2cc44442af8bd97"; + version = "1.4.1"; + sha256 = "3018b6a951b19d0c1bb9109e7e5d11059fe8f78743cb13b33a3be2c1da5e78d6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base binary containers deepseq http-client http-client-tls - managed microlens microlens-mtl pipes system-fileio system-filepath - text text-format transformers + array base binary containers deepseq Earley http-client + http-client-tls managed microlens microlens-mtl pipes system-fileio + system-filepath text text-format transformers ]; - libraryToolDepends = [ alex happy ]; + libraryToolDepends = [ alex ]; executableHaskellDepends = [ base optparse-applicative text ]; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; @@ -133453,8 +133068,8 @@ self: { ({ mkDerivation, base, containers, template-haskell }: mkDerivation { pname = "names-th"; - version = "0.2.0.0"; - sha256 = "369b871a2a41195d5c3e6349690cbc62bbaf39d4467d8db6ec3a5f17f52839da"; + version = "0.2.0.1"; + sha256 = "704a06e72c4bd3a15a8dc58f47d9b4e61728d7117ff6e3b905494344a3251821"; libraryHaskellDepends = [ base containers template-haskell ]; homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Manipulate name strings for TH"; @@ -133566,7 +133181,6 @@ self: { homepage = "https://github.com/ivarnymoen/nanomsg-haskell"; description = "Bindings to the nanomsg library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) nanomsg;}; "nanoparsec" = callPackage @@ -133904,7 +133518,6 @@ self: { homepage = "https://github.com/nilcons/nc-indicators"; description = "CPU load and memory usage indicators for i3bar"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ncurses" = callPackage @@ -134370,7 +133983,6 @@ self: { homepage = "http://netlink-hs.googlecode.com/"; description = "Netlink communication for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netlist" = callPackage @@ -136239,7 +135851,6 @@ self: { homepage = "http://chriswarbo.net/git/nix-eval"; description = "Evaluate Haskell expressions using Nix to get packages"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nix-paths" = callPackage @@ -136427,6 +136038,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nofib-analyse" = callPackage + ({ mkDerivation, array, base, containers, regex-compat }: + mkDerivation { + pname = "nofib-analyse"; + version = "7.12.0.20151208"; + sha256 = "d0ba0f82bbd0d1324e6331d75f43a0b5c1c207a3ad7df16668b730bb336725ad"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ array base containers regex-compat ]; + homepage = "https://ghc.haskell.org/trac/ghc/wiki/Building/RunningNoFib"; + description = "Parse and compare nofib runs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nofib-analyze" = callPackage ({ mkDerivation, array, base, containers, regex-compat }: mkDerivation { @@ -136519,7 +136144,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "A monad and monad transformer for nondeterministic computations"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonfree" = callPackage @@ -137541,7 +137165,6 @@ self: { homepage = "http://www.github.com/massysett/ofx"; description = "Parser for OFX data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ohloh-hs" = callPackage @@ -137741,6 +137364,59 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "omnifmt" = callPackage + ({ mkDerivation, aeson, base, exceptions, extra, fast-logger + , filepath, monad-logger, monad-parallel, mtl, optparse-applicative + , pipes, pipes-concurrency, temporary, text, time + , unordered-containers, yaml + }: + mkDerivation { + pname = "omnifmt"; + version = "0.2.0.0"; + sha256 = "72c9e0d84550b3b7a406186f951e148cb9f4a954f5ac8f5ef1512f28335af7c9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base exceptions extra filepath monad-logger mtl pipes text + unordered-containers yaml + ]; + executableHaskellDepends = [ + base exceptions extra fast-logger filepath monad-logger + monad-parallel mtl optparse-applicative pipes pipes-concurrency + temporary text time + ]; + homepage = "https://github.com/hjwylde/omnifmt"; + description = "A pretty-printer wrapper to faciliate ease of formatting during development"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "omnifmt_0_2_1_1" = callPackage + ({ mkDerivation, aeson, base, exceptions, extra, fast-logger + , filepath, monad-logger, monad-parallel, mtl, optparse-applicative + , pipes, pipes-concurrency, temporary, text, time + , unordered-containers, yaml + }: + mkDerivation { + pname = "omnifmt"; + version = "0.2.1.1"; + sha256 = "1964789180234ea2ae72fa397beab99985392dac86f527ec7866463288341731"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base exceptions extra filepath monad-logger mtl pipes text + unordered-containers yaml + ]; + executableHaskellDepends = [ + base exceptions extra fast-logger filepath monad-logger + monad-parallel mtl optparse-applicative pipes pipes-concurrency + temporary text time + ]; + homepage = "https://github.com/hjwylde/omnifmt"; + description = "A pretty-printer wrapper to faciliate ease of formatting during development"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "on-a-horse" = callPackage ({ mkDerivation, arrows, base, bytestring, case-insensitive , containers, cookie, http-types, mtl, random, safe, split, text @@ -138063,6 +137739,7 @@ self: { base bytestring lens mtl opaleye postgresql-simple product-profunctors transformers ]; + jailbreak = true; homepage = "https://github.com/benkolera/opaleye-classy/tree/master"; description = "Opaleye wrapped up in classy MTL attire"; license = stdenv.lib.licenses.mit; @@ -138111,6 +137788,7 @@ self: { executableHaskellDepends = [ base opaleye postgresql-simple product-profunctors ]; + jailbreak = true; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "A monad transformer for Opaleye"; license = stdenv.lib.licenses.bsd3; @@ -138220,6 +137898,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "opencog-atomspace" = callPackage + ({ mkDerivation, atomspace-cwrapper, base, containers, directory + , filepath, mtl, template-haskell, transformers + }: + mkDerivation { + pname = "opencog-atomspace"; + version = "0.1.0.2"; + sha256 = "fc7d96645ef0c14e56ffdbcad9537f0ea766616ac3f1dc105e817a53990a30d1"; + libraryHaskellDepends = [ + base containers directory filepath mtl template-haskell + transformers + ]; + librarySystemDepends = [ atomspace-cwrapper ]; + homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell"; + description = "Haskell Bindings for the AtomSpace"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {atomspace-cwrapper = null;}; + "opencv-raw" = callPackage ({ mkDerivation, base, bindings-DSL, Cabal, opencv, vector }: mkDerivation { @@ -139328,7 +139025,6 @@ self: { homepage = "http://github.com/nedervold/origami"; description = "An un-SYB framework for transforming heterogenous data through folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "os-release" = callPackage @@ -139383,7 +139079,6 @@ self: { executableHaskellDepends = [ base process ]; description = "Show keys pressed with an on-screen display (Linux only)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "osm-download" = callPackage @@ -139630,6 +139325,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "packman" = callPackage + ({ mkDerivation, array, base, binary, bytestring, Cabal, directory + , ghc-prim, primitive, QuickCheck + }: + mkDerivation { + pname = "packman"; + version = "0.3.0"; + sha256 = "98110c7c428f898f2f309202097c6ce00cf497701f6b6507abe2efe430562a1f"; + libraryHaskellDepends = [ + array base binary bytestring ghc-prim primitive + ]; + testHaskellDepends = [ + array base binary bytestring Cabal directory ghc-prim primitive + QuickCheck + ]; + description = "Serialization library for GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "packunused" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, haskell-src-exts , optparse-applicative, split @@ -140548,8 +140263,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.1.5.6"; - sha256 = "0164dcfa4d23c9e5b41172ab4e14e3f6a2aad4067c9cc3e151828baeb5d5164d"; + version = "0.1.6.0"; + sha256 = "c77a309552b54bb03b7e2624dc45fdf6452dd63756f8955b5db5480df45cedf0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140583,6 +140298,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pandoc-include" = callPackage + ({ mkDerivation, base, directory, pandoc, pandoc-types, text }: + mkDerivation { + pname = "pandoc-include"; + version = "0.0.1"; + sha256 = "cdb6516356fbbd4b9ff619da0ec8f0216e01356309f75037349d56af0c9768c3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory pandoc pandoc-types text + ]; + executableHaskellDepends = [ + base directory pandoc pandoc-types text + ]; + doHaddock = false; + homepage = "https://github.com/steindani/pandoc-include"; + description = "Include other Markdown files"; + license = stdenv.lib.licenses.mit; + }) {}; + "pandoc-lens" = callPackage ({ mkDerivation, base, containers, lens, pandoc-types }: mkDerivation { @@ -141301,7 +141036,6 @@ self: { homepage = "https://github.com/aslatter/parsec2"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsec3" = callPackage @@ -141774,7 +141508,6 @@ self: { homepage = "https://github.com/liamoc/patches-vector"; description = "Patches (diffs) on vectors: composable, mergeable, and invertible"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path_0_5_2" = callPackage @@ -142405,7 +142138,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "Simple pdf viewer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf2line" = callPackage @@ -142888,8 +142620,8 @@ self: { }: mkDerivation { pname = "persistable-record"; - version = "0.1.0.1"; - sha256 = "ba04f5af4a988e6f4758f32ff8ff767b71680bea5bede391200aba431d0c530d"; + version = "0.2.0.0"; + sha256 = "5b8549ec3ed38b92a724c6a5c2fb75749d4faad31784d63354fd3f90e9877859"; libraryHaskellDepends = [ array base containers dlist names-th template-haskell transformers ]; @@ -143323,7 +143055,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent" = callPackage + "persistent_2_2_2_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers , exceptions, fast-logger, hspec, http-api-data, lifted-base @@ -143354,6 +143086,41 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, multi-backend data serialization"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + + "persistent" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, blaze-markup, bytestring, conduit, containers + , exceptions, fast-logger, hspec, http-api-data, lifted-base + , monad-control, monad-logger, mtl, old-locale, path-pieces + , resource-pool, resourcet, scientific, silently, tagged + , template-haskell, text, time, transformers, transformers-base + , unordered-containers, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.2.3"; + sha256 = "93f3cb4201e58dfe8566ac9577a467c122ffa98e05c9566d836c4db5ff25d2d4"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html blaze-markup + bytestring conduit containers exceptions fast-logger http-api-data + lifted-base monad-control monad-logger mtl old-locale path-pieces + resource-pool resourcet scientific silently tagged template-haskell + text time transformers transformers-base unordered-containers + vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger hspec http-api-data lifted-base + monad-control monad-logger mtl old-locale path-pieces resource-pool + resourcet scientific tagged template-haskell text time transformers + unordered-containers vector + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Type-safe, multi-backend data serialization"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -143410,6 +143177,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistent-iproute" = callPackage + ({ mkDerivation, aeson, aeson-iproute, base, bytestring + , http-api-data, iproute, path-pieces, persistent, text + }: + mkDerivation { + pname = "persistent-iproute"; + version = "0.2.1"; + sha256 = "6788ed3e45195a58af71338f1fddecfbe44e079d0a164afac8bf15934199db33"; + libraryHaskellDepends = [ + aeson aeson-iproute base bytestring http-api-data iproute + path-pieces persistent text + ]; + homepage = "https://github.com/greydot/persistent-iproute"; + description = "Persistent instances for types in iproute"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "persistent-map" = callPackage ({ mkDerivation, base, binary, containers, directory, EdisonAPI , EdisonCore, filepath, LRU, mtl, stm-io-hooks @@ -143675,6 +143459,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143697,6 +143482,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143719,6 +143505,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143741,6 +143528,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143763,6 +143551,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143785,6 +143574,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143807,6 +143597,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143829,6 +143620,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143851,6 +143643,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143873,6 +143666,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143895,6 +143689,30 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using postgresql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + + "persistent-postgresql_2_2_1_1" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, monad-control, monad-logger, persistent + , postgresql-libpq, postgresql-simple, resourcet, text, time + , transformers + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.2.1.1"; + sha256 = "b7f45537194d11e0efb9648d721cc6836df8730acd225bd090e7c740034812a8"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers + monad-control monad-logger persistent postgresql-libpq + postgresql-simple resourcet text time transformers + ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143910,8 +143728,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.2.1.1"; - sha256 = "b7f45537194d11e0efb9648d721cc6836df8730acd225bd090e7c740034812a8"; + version = "2.2.1.2"; + sha256 = "475523d2ac2c9719bf7e4034f97aed79e96c63001ef735b8148b657049e7e83a"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -144681,20 +144499,18 @@ self: { "pgdl" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, configurator - , directory, filepath, HTTP, network-uri, process, tagsoup, text - , vty, vty-ui + , directory, filepath, HTTP, http-conduit, network-uri, process + , tagsoup, text, vty, vty-ui }: mkDerivation { pname = "pgdl"; - version = "8.3"; - sha256 = "052bf67bff13ffca6ca40ee4eb581c1d4d8aedcdf44a7dd963fb265f5f4b7d4d"; - revision = "2"; - editedCabalFile = "9d6e976e130869b6761d870380b867c2501c43a1318a5f385687608c13a0ef72"; + version = "8.5"; + sha256 = "9c577d2d149ed3645edb4e3a9fcbe1fbe6072cf2124b6ee76c45724b390d63a2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base bytestring Cabal configurator directory filepath HTTP - network-uri process tagsoup text vty vty-ui + http-conduit network-uri process tagsoup text vty vty-ui ]; description = "simply download a video (or a file) from a webpage and xdg-open it"; license = stdenv.lib.licenses.publicDomain; @@ -145064,7 +144880,6 @@ self: { homepage = "https://github.com/sdiehl/picologic"; description = "Utilities for symbolic predicate logic expressions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "picoparsec_0_1_2_1" = callPackage @@ -145190,8 +145005,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.9.1"; - sha256 = "79cdb71726b3da449a07c3e734716837ad9f852cca15bc7ee78a5045f2101f81"; + version = "0.9.2"; + sha256 = "a009de2327af08a929503482ffe60700348422807df3e22f2a7e6f98ac0aabda"; libraryHaskellDepends = [ aeson base bytestring containers either http-client http-client-tls http-types mtl network old-locale random text time transformers @@ -145227,6 +145042,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pinchot" = callPackage + ({ mkDerivation, base, containers, Earley, template-haskell + , transformers + }: + mkDerivation { + pname = "pinchot"; + version = "0.2.0.0"; + sha256 = "292bf5416f7fee0573aec8ca989704b422f50957afebd3098b1f2f953e4d3805"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers Earley template-haskell transformers + ]; + homepage = "http://www.github.com/massysett/pinchot"; + description = "Build parsers and ASTs for context-free grammars"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipe-enumerator" = callPackage ({ mkDerivation, base, enumerator, pipes, transformers }: mkDerivation { @@ -146544,7 +146377,6 @@ self: { homepage = "http://code.haskell.org/plot"; description = "GTK plots and interaction with GHCi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plot-gtk-ui" = callPackage @@ -146561,7 +146393,6 @@ self: { homepage = "https://github.com/sumitsahrawat/plot-gtk-ui"; description = "A quick way to use Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plot-gtk3_0_1" = callPackage @@ -146607,7 +146438,6 @@ self: { homepage = "http://code.haskell.org/plot"; description = "GTK3 plots and interaction with GHCi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plot-lab" = callPackage @@ -146625,7 +146455,6 @@ self: { homepage = "https://github.com/sumitsahrawat/plot-lab"; description = "A plotting tool with Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plotfont" = callPackage @@ -146666,7 +146495,6 @@ self: { homepage = "http://hub.darcs.net/stepcut/plugins"; description = "Dynamic linking for Haskell and C objects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plugins-auto" = callPackage @@ -147267,7 +147095,6 @@ self: { libraryHaskellDepends = [ base vector ]; description = "A solver for systems of polynomial equations in bernstein form"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polyparse_1_9" = callPackage @@ -147577,7 +147404,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs"; description = "Binding to the Poppler"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {gdk2 = null; inherit (pkgs) gdk_pixbuf; inherit (pkgs.gnome) pango; inherit (pkgs) poppler;}; @@ -147950,7 +147776,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "postgresql-binary_0_7_4" = callPackage + "postgresql-binary_0_7_4_1" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, conversion, conversion-bytestring, conversion-text , either, foldl, loch-th, placeholders, postgresql-libpq @@ -147960,8 +147786,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.7.4"; - sha256 = "12dde34bc686374b3c96dffd37e579e5fd3edd12bc7e1c9f7fa626225607ece8"; + version = "0.7.4.1"; + sha256 = "77651101348f02653e4bccc02374c2aa33d850322458aa54e0ae8766da318673"; libraryHaskellDepends = [ aeson base base-prelude binary-parser bytestring foldl loch-th placeholders scientific text time transformers uuid vector @@ -148099,8 +147925,8 @@ self: { }: mkDerivation { pname = "postgresql-orm"; - version = "0.4.0"; - sha256 = "06ad6a6dc84eaf7cda7c9dc1973e9ed9e1f16d78926d9cf029e0c3a8e3dbf5ef"; + version = "0.4.1"; + sha256 = "649d995c7eb7890b2826cda2d930651a0906e9ce0173342180d83e5527dc7b5a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148167,6 +147993,28 @@ self: { homepage = "https://github.com/mfine/postgresql-schema"; description = "PostgreSQL Schema Management"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "postgresql-schema_0_1_9" = callPackage + ({ mkDerivation, base, basic-prelude, optparse-applicative + , postgresql-simple, shelly, text, time, time-locale-compat + }: + mkDerivation { + pname = "postgresql-schema"; + version = "0.1.9"; + sha256 = "18d0262e69b6d02beaf016fd1ee6c25533a59e688bd21f1acc5b07c6a787d7ec"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base basic-prelude postgresql-simple shelly text + ]; + executableHaskellDepends = [ + base basic-prelude optparse-applicative shelly text time + time-locale-compat + ]; + homepage = "https://github.com/mfine/postgresql-schema"; + description = "PostgreSQL Schema Management"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -148223,7 +148071,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "postgresql-simple" = callPackage + "postgresql-simple_0_4_10_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , blaze-builder, blaze-textual, bytestring, case-insensitive , containers, cryptohash, hashable, HUnit, postgresql-libpq @@ -148246,9 +148094,10 @@ self: { doCheck = false; description = "Mid-Level PostgreSQL client library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "postgresql-simple_0_5_1_0" = callPackage + "postgresql-simple" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, bytestring-builder, case-insensitive, containers , cryptohash, hashable, HUnit, postgresql-libpq, scientific @@ -148256,8 +148105,8 @@ self: { }: mkDerivation { pname = "postgresql-simple"; - version = "0.5.1.0"; - sha256 = "1073887f5e6efa61a64968aca1241442d1b60a01d461f7b419cf5767e9d4975c"; + version = "0.5.1.1"; + sha256 = "e80bb4655745d5802b70c9276cee1a3772892451ea985047dd77fd1c242a43be"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable postgresql-libpq scientific @@ -148267,9 +148116,9 @@ self: { aeson base base16-bytestring bytestring containers cryptohash HUnit text time vector ]; + doCheck = false; description = "Mid-Level PostgreSQL client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-migration" = callPackage @@ -148911,8 +148760,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "prelude-edsl"; - version = "0.1.2"; - sha256 = "97e884220ca2c37e913b8b73f148f0cb3e822a3b6cf89d88e25b7d4d9e1cd934"; + version = "0.3"; + sha256 = "8250585549ad9c64c2b0407157cacb8a4a2dd0dcf77c8de4b005adddf2b98008"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/emilaxelsson/prelude-edsl"; description = "An EDSL-motivated subset of the Prelude"; @@ -150022,7 +149871,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "profunctors" = callPackage + "profunctors_5_1_1" = callPackage ({ mkDerivation, base, comonad, distributive, tagged, transformers }: mkDerivation { @@ -150035,6 +149884,24 @@ self: { homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "profunctors" = callPackage + ({ mkDerivation, base, bifunctors, comonad, contravariant + , distributive, tagged, transformers + }: + mkDerivation { + pname = "profunctors"; + version = "5.1.2"; + sha256 = "e0cc9129a4c1d2027cdada0a4cd26e540666a929ebe4e17ce5e2cec02d589682"; + libraryHaskellDepends = [ + base bifunctors comonad contravariant distributive tagged + transformers + ]; + homepage = "http://github.com/ekmett/profunctors/"; + description = "Profunctors"; + license = stdenv.lib.licenses.bsd3; }) {}; "progress" = callPackage @@ -150245,7 +150112,6 @@ self: { homepage = "https://github.com/wdanilo/prologue"; description = "Better, more general Prelude exporting common utilities"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prometheus-client" = callPackage @@ -150346,8 +150212,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.14.0"; - sha256 = "b8b06a61b3991cb177880de43bf94014492807095f8249fc1389a746c8edeef3"; + version = "2.15.0"; + sha256 = "93899ba66749337382158cbb9c2289341eb8d104d26b47dc05c71fe68ba8f53e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150557,7 +150423,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "protocol-buffers" = callPackage + "protocol-buffers_2_1_7" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, filepath, mtl, parsec, syb, utf8-string }: @@ -150572,6 +150438,24 @@ self: { homepage = "https://github.com/k-bx/protocol-buffers"; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "protocol-buffers" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , directory, filepath, mtl, parsec, syb, utf8-string + }: + mkDerivation { + pname = "protocol-buffers"; + version = "2.1.9"; + sha256 = "bcef7e31d467c92429092b2900411569eb2eb2a9f3799409560b20e53afd0f10"; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath mtl + parsec syb utf8-string + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; }) {}; "protocol-buffers-descriptor_2_1_4" = callPackage @@ -150622,7 +150506,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "protocol-buffers-descriptor" = callPackage + "protocol-buffers-descriptor_2_1_7" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; @@ -150631,6 +150515,22 @@ self: { libraryHaskellDepends = [ base bytestring containers protocol-buffers ]; + jailbreak = true; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "protocol-buffers-descriptor" = callPackage + ({ mkDerivation, base, bytestring, containers, protocol-buffers }: + mkDerivation { + pname = "protocol-buffers-descriptor"; + version = "2.1.9"; + sha256 = "73ce09dc61ce920401cf98d689255d2bbde2cda19c179c3c757c4e1ecc28455a"; + libraryHaskellDepends = [ + base bytestring containers protocol-buffers + ]; homepage = "https://github.com/k-bx/protocol-buffers"; description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; license = stdenv.lib.licenses.bsd3; @@ -150738,24 +150638,26 @@ self: { }) {}; "psc-ide" = callPackage - ({ mkDerivation, aeson, base, containers, directory, either - , filepath, hspec, http-client, lens, lens-aeson, mtl, network - , optparse-applicative, parsec, regex-tdfa, text, wreq + ({ mkDerivation, aeson, base, bytestring, containers, directory + , either, filepath, hspec, http-client, lens, lens-aeson, mtl + , network, optparse-applicative, parsec, purescript, regex-tdfa + , text, wreq }: mkDerivation { pname = "psc-ide"; - version = "0.3.0.0"; - sha256 = "f491fbc678bf6b022642e0ff5a00d543c5ac99dd487b2089a48f1d102aab8200"; + version = "0.5.0"; + sha256 = "083cf4bf7a51aeefc28488813b95243667c3c142dc8e5e3c6f3d8ada3803f87b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base containers directory either filepath http-client lens - lens-aeson mtl parsec regex-tdfa text wreq + aeson base bytestring containers directory either filepath + http-client lens lens-aeson mtl parsec purescript regex-tdfa text + wreq ]; executableHaskellDepends = [ base directory mtl network optparse-applicative text ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base containers hspec mtl ]; homepage = "http://github.com/kRITZCREEK/psc-ide"; description = "Language support for the PureScript programming language"; license = stdenv.lib.licenses.mit; @@ -150868,8 +150770,8 @@ self: { ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20151102"; - sha256 = "7dae06c884fd6348d0ac76382752a5ee72b42d0efe780d0eb611333956e5deda"; + version = "0.20151129"; + sha256 = "a1b6dfca39241f124f2174dbf9368551e9d3bec1e52e9db0fc01ca98f1c2e06c"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -152409,7 +152311,6 @@ self: { homepage = "http://github.com/audreyt/quickcheck-regex/"; description = "Generate regex-constrained strings for QuickCheck"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-relaxng" = callPackage @@ -152426,7 +152327,6 @@ self: { homepage = "http://github.com/audreyt/quickcheck-relaxng/"; description = "Generate RelaxNG-constrained XML documents for QuickCheck"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-rematch" = callPackage @@ -152647,8 +152547,8 @@ self: { ({ mkDerivation, base, mmorph, transformers }: mkDerivation { pname = "quiver"; - version = "1.1.2"; - sha256 = "fc4e05e7514e42ef12dbc58a471825ffc3208d1b073a86940a0c7b8207a8dfa6"; + version = "1.1.3"; + sha256 = "fdf0a4aabc5787e4e9f512485bea9771885dcab0482ef811e68189962d15e0bd"; libraryHaskellDepends = [ base mmorph transformers ]; homepage = "https://github.com/zadarnowski/quiver"; description = "Quiver finite stream processing library"; @@ -153637,7 +153537,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/raven-haskell"; description = "Haskell client for Sentry logging service"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "raven-haskell-scotty" = callPackage @@ -154415,7 +154314,6 @@ self: { homepage = "https://github.com/joeyadams/haskell-recursive-line-count"; description = "Count lines in files and display them hierarchically"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "redHandlers" = callPackage @@ -154665,6 +154563,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reedsolomon" = callPackage + ({ mkDerivation, base, bytestring, bytestring-mmap, clock + , criterion, deepseq, exceptions, filepath, gitrev, loop, mtl + , optparse-applicative, primitive, profunctors, QuickCheck, random + , reedsolomon, statistics, tasty, tasty-ant-xml, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "reedsolomon"; + version = "0.0.2.0"; + sha256 = "f1e61e07374a43ba48d2e8a152a451328ea343432009681c80a87cce8cd85d1c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring exceptions gitrev loop mtl primitive profunctors + vector + ]; + librarySystemDepends = [ reedsolomon ]; + executableHaskellDepends = [ + base bytestring bytestring-mmap clock criterion deepseq filepath + optparse-applicative random statistics vector + ]; + testHaskellDepends = [ + base bytestring exceptions loop mtl primitive profunctors + QuickCheck random tasty tasty-ant-xml tasty-hunit tasty-quickcheck + vector + ]; + homepage = "http://github.com/NicolasT/reedsolomon"; + description = "Reed-Solomon Erasure Coding in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {reedsolomon = null;}; + "reenact" = callPackage ({ mkDerivation, base, hamid, HCodecs, stm, time, vector-space }: mkDerivation { @@ -155342,7 +155273,6 @@ self: { homepage = "https://github.com/audreyt/regex-genex"; description = "From a regex, generate all possible strings it can match"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-parsec" = callPackage @@ -156000,8 +155930,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.6.3.0"; - sha256 = "40a851daf43e816420339783f3f83c52d6de8f6dac15646154784f9481f2ccae"; + version = "0.7.0.1"; + sha256 = "eb186d8bc97fe48e1a4f8933a2a7a13f7e3269eaafa5c3eb6509cfb58cf53e8a"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record sql-words template-haskell text time time-locale-compat @@ -156022,8 +155952,8 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.3.1.0"; - sha256 = "324770a6f967b67e3622ff170ef85d06ebbd4dd59dd59471fc75c18b0c5b75a6"; + version = "0.4.0.0"; + sha256 = "b5ae3dccfb6a32b6f64f350c0349d253a3b5ff8d28f0832f5189cea7974b7650"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record relational-query relational-schemas @@ -156055,8 +155985,8 @@ self: { }: mkDerivation { pname = "relational-record-examples"; - version = "0.2.0.2"; - sha256 = "ae5a5976eca9bb1a8692ec9af2d47c4b3ef2e6fe2c28a9cca73ed09ec6b1ff4a"; + version = "0.2.0.3"; + sha256 = "3c84a71adf6493df47e6a54cd67ed83fd9c095dea8712ed63c0905ad0729f9c1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -156065,7 +155995,6 @@ self: { ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-schemas" = callPackage @@ -156074,8 +156003,8 @@ self: { }: mkDerivation { pname = "relational-schemas"; - version = "0.1.2.0"; - sha256 = "1422e999c89ab1494f938a243bda022c1bf758e08e3377c146263ca974e57849"; + version = "0.1.2.1"; + sha256 = "648373d8931953dcfcbc770e4d9919469535b445581d3dbe03a51ffe8b7110fb"; libraryHaskellDepends = [ base bytestring containers persistable-record relational-query template-haskell time @@ -156614,7 +156543,6 @@ self: { ]; description = "Reading and writing sound files with repa arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-stream" = callPackage @@ -157183,7 +157111,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "resourcet" = callPackage + "resourcet_1_1_6" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, monad-control, mtl, transformers, transformers-base , transformers-compat @@ -157200,6 +157128,26 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "resourcet" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, lifted-base + , mmorph, monad-control, mtl, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "resourcet"; + version = "1.1.7"; + sha256 = "3b79d07199160c966c67a5300a51b7c8790dda7bed6c00e554a0062d03c9ab4d"; + libraryHaskellDepends = [ + base containers exceptions lifted-base mmorph monad-control mtl + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ base hspec lifted-base transformers ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; }) {}; "respond" = callPackage @@ -157554,7 +157502,6 @@ self: { homepage = "http://www.github.com/silkapp/rest"; description = "Example project for rest"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-gen_0_16_1_3" = callPackage @@ -158368,8 +158315,8 @@ self: { }: mkDerivation { pname = "rethinkdb"; - version = "2.1.0.2"; - sha256 = "80689203aafcbf26b555952953012fc1a1272d2e28cd5dcc30fcceb50951fd07"; + version = "2.2.0.0"; + sha256 = "a3e629d72bb63150f764c33e2fe507391ee1e77bd4097114fbca73a5d24ca429"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158553,7 +158500,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "retry" = callPackage + "retry_0_6" = callPackage ({ mkDerivation, base, data-default-class, exceptions, hspec, HUnit , QuickCheck, time, transformers }: @@ -158575,9 +158522,10 @@ self: { homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "retry_0_7_0_1" = callPackage + "retry" = callPackage ({ mkDerivation, base, data-default-class, exceptions, hspec, HUnit , QuickCheck, random, stm, time, transformers }: @@ -158592,10 +158540,10 @@ self: { base data-default-class exceptions hspec HUnit QuickCheck random stm time transformers ]; + doCheck = false; homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "retryer" = callPackage @@ -159166,8 +159114,8 @@ self: { }: mkDerivation { pname = "robots-txt"; - version = "0.4.1.3"; - sha256 = "78ba2581d0ee590a335bc595a01f85d8e88c0ca9803e24a5aaf1520cd75c3114"; + version = "0.4.1.4"; + sha256 = "cc927bf848469fba0e594c5b9e46d822d410a29c978773924bb4b3268882b3a1"; libraryHaskellDepends = [ attoparsec base bytestring old-locale time ]; @@ -159175,7 +159123,6 @@ self: { attoparsec base bytestring directory heredoc hspec QuickCheck transformers ]; - jailbreak = true; homepage = "http://github.com/meanpath/robots"; description = "Parser for robots.txt"; license = stdenv.lib.licenses.bsd3; @@ -159854,6 +159801,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rtcm" = callPackage + ({ mkDerivation, array, base, basic-prelude, binary, binary-bits + , bytestring, lens, tasty, tasty-hunit, template-haskell, word24 + }: + mkDerivation { + pname = "rtcm"; + version = "0.1.3"; + sha256 = "8ee905a36562c93b0bd60d799eb85d59795c775497411120324fa104b13943ab"; + libraryHaskellDepends = [ + array base basic-prelude binary binary-bits bytestring lens + template-haskell word24 + ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + homepage = "http://github.com/swift-nav/librtcm"; + description = "RTCM Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rtld" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -160447,7 +160413,6 @@ self: { ]; description = "overflow-checked Int type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safer-file-handles" = callPackage @@ -161031,8 +160996,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "0.51.6"; - sha256 = "f35ac09599df5aec19f49c24fa3a51b7b2a9268699cdce2438354fd477f9f4b7"; + version = "0.52.0"; + sha256 = "b4c4629044e230c950b5a71c7baf1226bec6ea68415d9e9c82b6c69f8fbddd7e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161104,15 +161069,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sbv_5_5" = callPackage + "sbv_5_6" = callPackage ({ mkDerivation, array, async, base, base-compat, containers , crackNum, data-binary-ieee754, deepseq, directory, filepath, mtl , old-time, pretty, process, QuickCheck, random, syb }: mkDerivation { pname = "sbv"; - version = "5.5"; - sha256 = "ee5f5b81b1e84a85285870a34295a4a40a8ab6203a6be5f8f596921a15c2cd67"; + version = "5.6"; + sha256 = "018c91265799931c434731cfd48e8592e42f399ab5958f4c70ffe48e83fd3fed"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161126,6 +161091,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sbvPlugin" = callPackage + ({ mkDerivation, base, containers, directory, filepath, ghc + , ghc-prim, mtl, process, sbv, tasty, tasty-golden + , template-haskell + }: + mkDerivation { + pname = "sbvPlugin"; + version = "0.1"; + sha256 = "08fc5562e6919ddb8db1fa8b5c16079f9832c3d755d58e987f25945f36903c0b"; + libraryHaskellDepends = [ + base containers ghc ghc-prim mtl sbv template-haskell + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-golden + ]; + jailbreak = true; + homepage = "http://github.com/LeventErkok/sbvPlugin"; + description = "Analyze Haskell expressions using SBV/SMT"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sc3-rdu" = callPackage ({ mkDerivation, base, hsc3, hsc3-db }: mkDerivation { @@ -161282,7 +161269,6 @@ self: { homepage = "https://github.com/redelmann/scat"; description = "Generates unique passwords for various websites from a single password"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scc" = callPackage @@ -161808,7 +161794,6 @@ self: { homepage = "http://github.com/JPMoresmau/scion-class-browser"; description = "Command-line interface for browsing and searching packages documentation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scons2dot" = callPackage @@ -162292,7 +162277,6 @@ self: { homepage = "https://github.com/davnils/sde-solver"; description = "Distributed SDE solver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sdf2p1-parser" = callPackage @@ -162438,7 +162422,6 @@ self: { executableHaskellDepends = [ base sdl2 ]; description = "Binding to libSDL2-ttf"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage @@ -162462,8 +162445,8 @@ self: { }: mkDerivation { pname = "sdr"; - version = "0.1.0.4"; - sha256 = "b0df3045fb8bed0d8a902506524e165cc5e31cd9f05e21ac6d214cc90f42049c"; + version = "0.1.0.5"; + sha256 = "80885f1eb0b8a5d5cce83bc7b819d04beb1f3b865b7fdf1030480aeec1605c1e"; libraryHaskellDepends = [ array base bytestring cairo cereal Chart Chart-cairo colour containers Decimal dynamic-graph either fftwRaw GLFW-b OpenGL @@ -164894,6 +164877,8 @@ self: { pname = "servius"; version = "1.2.0.1"; sha256 = "3839d725b5b01be2baf46bb93a5c3090494a43aefa09e2a300a7e96b826f9a01"; + revision = "1"; + editedCabalFile = "febebdf7c47660c5f61502b7537258d4fad717fd9ef6668c7e5d196450b2fba1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -164903,7 +164888,6 @@ self: { homepage = "http://github.com/snoyberg/servius#readme"; description = "Warp web server with template rendering"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ses-html" = callPackage @@ -165061,6 +165045,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "setgame" = callPackage + ({ mkDerivation, base, random, vty }: + mkDerivation { + pname = "setgame"; + version = "1.1"; + sha256 = "34b0c18e84023bc1785a18386663be136ac3d02f901cf8106942d4d3c89a22c3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base random vty ]; + executableHaskellDepends = [ base ]; + description = "A console interface to the game of Set"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "setlocale" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -165200,14 +165198,12 @@ self: { ({ mkDerivation, base, bytestring, template-haskell, text }: mkDerivation { pname = "sext"; - version = "0.1.0.0"; - sha256 = "fef2cc9767547792aa1f1baee9e415362734abf0ba2b8953f5eed487ea72076f"; + version = "0.1.0.2"; + sha256 = "b5101154373eac70dee9d56854333ea33735a88b7697f2877846c746dd048c3a"; libraryHaskellDepends = [ base bytestring template-haskell text ]; - jailbreak = true; homepage = "http://github.com/dzhus/sext/"; description = "Lists, Texts and ByteStrings with type-encoded length"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sfml-audio" = callPackage @@ -166253,7 +166249,6 @@ self: { ]; description = "Test webhooks locally"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shell-conduit_4_5" = callPackage @@ -166550,7 +166545,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "shelly" = callPackage + "shelly_1_6_4" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async , lifted-base, monad-control, mtl, process, system-fileio @@ -166579,6 +166574,38 @@ self: { homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "shelly" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async + , lifted-base, monad-control, mtl, process, system-fileio + , system-filepath, text, time, transformers, transformers-base + , unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.6.4.1"; + sha256 = "99548d6a33ea7a8ed2c12f625c923ee14d9c2d04ecb9b46bef2c1e6c8ff567ab"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions lifted-async lifted-base monad-control mtl process + system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + testHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions hspec HUnit lifted-async lifted-base monad-control mtl + process system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + doCheck = false; + homepage = "https://github.com/yesodweb/Shelly.hs"; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "shelly-extra" = callPackage @@ -168059,7 +168086,6 @@ self: { homepage = "https://github.com/konn/sized-vector"; description = "Size-parameterized vector types and functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sizes" = callPackage @@ -168221,6 +168247,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skemmtun" = callPackage + ({ mkDerivation, base, bytestring, data-default, http-client + , http-types, lens, text, time, wreq, xml-conduit + }: + mkDerivation { + pname = "skemmtun"; + version = "0.1.0.0"; + sha256 = "9602063e569741878f18dc1820a7281a3387ff6fdfdc394e32511f2abaab6c11"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring data-default http-client http-types lens text time + wreq xml-conduit + ]; + homepage = "https://github.com/nyorem/skemmtun"; + description = "A MyAnimeList.net client."; + license = stdenv.lib.licenses.mit; + }) {}; + "skype4hs" = callPackage ({ mkDerivation, attoparsec, base, bytestring, lifted-base , monad-control, mtl, stm, text, time, transformers-base, word8 @@ -168840,7 +168885,6 @@ self: { ]; description = "A type-safe interface to communicate with an SMT solver"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smtp-mail" = callPackage @@ -169422,7 +169466,6 @@ self: { ]; description = "Serve Elm files through the Snap web framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-error-collector" = callPackage @@ -169473,6 +169516,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "snap-language" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , snap-core + }: + mkDerivation { + pname = "snap-language"; + version = "0.1.0.0"; + sha256 = "a8b4de97769afd815ebde10ad778ad20d9ba81883680e1a2514a7989bce32a41"; + libraryHaskellDepends = [ + attoparsec base bytestring containers snap-core + ]; + homepage = "https://github.com/jonpetterbergman/snap-accept-language"; + description = "Language handling for Snap"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "snap-loader-dynamic" = callPackage ({ mkDerivation, base, directory, directory-tree, hint, mtl , snap-core, template-haskell, time, unix @@ -170061,6 +170120,7 @@ self: { homepage = "https://github.com/ixmatus/snaplet-influxdb"; description = "Snap framework snaplet for the InfluxDB library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-lss" = callPackage @@ -170079,7 +170139,6 @@ self: { homepage = "https://github.com/dbp/lss"; description = "Lexical Style Sheets - Snap Web Framework adaptor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-mandrill" = callPackage @@ -170634,7 +170693,6 @@ self: { homepage = "http://sneathlane.com"; description = "A compositional web UI library, which draws to a Canvas element"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snippet-extractor" = callPackage @@ -171039,7 +171097,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "GUI functions as used in the book \"The Haskell School of Expression\""; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sonic-visualiser" = callPackage @@ -171228,6 +171285,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sourcemap_0_1_5" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, process, text + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "sourcemap"; + version = "0.1.5"; + sha256 = "cf64d8ff9a38d2feb134814fd0cb5b9f171d650c7d74a8277238bb88d0f562ea"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring process text unordered-containers + utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring process text unordered-containers utf8-string + ]; + description = "Implementation of source maps as proposed by Google and Mozilla"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sousit" = callPackage ({ mkDerivation, base, bytestring, cereal, mtl, QuickCheck , resourcet, stm, test-framework, test-framework-quickcheck2 @@ -172441,8 +172518,8 @@ self: { }: mkDerivation { pname = "sscgi"; - version = "0.3.0"; - sha256 = "f90432d5f11e1f5c411e4478180d8882d573bdacc250cfac27800408bb99705e"; + version = "0.3.1"; + sha256 = "0925d1a384fae39255bd927f2ffa787e84d270fbd747e703f32ae41af06fcf3b"; libraryHaskellDepends = [ attoparsec base bytestring case-insensitive containers Glob MonadCatchIO-mtl mtl transformers utf8-string @@ -172450,7 +172527,6 @@ self: { homepage = "https://github.com/jekor/haskell-sscgi"; description = "Simple SCGI Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ssh" = callPackage @@ -172614,6 +172690,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stable-marriage" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "stable-marriage"; + version = "0.1.0.0"; + sha256 = "951898bb20439d75282147ba2c17a16f13ea411cb8280564b38e4e6cd3f936fc"; + libraryHaskellDepends = [ base ghc-prim ]; + homepage = "http://github.com/cutsea110/stable-marriage"; + description = "algorithms around stable marriage"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stable-memo" = callPackage ({ mkDerivation, base, ghc-prim, hashtables }: mkDerivation { @@ -172673,6 +172761,8 @@ self: { pname = "stack"; version = "0.1.3.0"; sha256 = "e1f5c6cf00d69c15cea76106ab632a4d8edecbce5cee46ebe002a278a672ad10"; + revision = "1"; + editedCabalFile = "a60b5f3f45a807b1d72f2852c078e064f1c80c0f30a8f43148f08b8dd9023e9d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172704,6 +172794,7 @@ self: { monad-logger optparse-applicative path process QuickCheck resourcet retry temporary text transformers unix-compat ]; + jailbreak = true; doCheck = false; enableSharedExecutables = false; postInstall = '' @@ -172739,6 +172830,8 @@ self: { pname = "stack"; version = "0.1.3.1"; sha256 = "af5542c838fa33bd633cad5b9cbd411748a259a06bd0b437094c9d79b0e01e6a"; + revision = "1"; + editedCabalFile = "ef43d6148b72148ef97930582deeb0bf990751c94b6924d1a4763572ed166eaa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172770,6 +172863,7 @@ self: { monad-logger optparse-applicative path process QuickCheck resourcet retry temporary text transformers unix-compat ]; + jailbreak = true; doCheck = false; enableSharedExecutables = false; postInstall = '' @@ -172806,6 +172900,8 @@ self: { pname = "stack"; version = "0.1.4.1"; sha256 = "09a076537d546b005788326fb734b47a203ae9507303a9ce554566179dfdfd24"; + revision = "1"; + editedCabalFile = "96a7234623eab6fffc9c719d272a7569220c16e6b3f6dfac43f8e0a474f35d7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172837,6 +172933,7 @@ self: { monad-logger optparse-applicative path process QuickCheck resourcet retry temporary text transformers unix-compat ]; + jailbreak = true; doCheck = false; enableSharedExecutables = false; postInstall = '' @@ -172873,6 +172970,8 @@ self: { pname = "stack"; version = "0.1.5.0"; sha256 = "40a26de423f070fc6c742a77c76e90ffd25d6ff08c6a651b3683f16f63a03e25"; + revision = "1"; + editedCabalFile = "958cbffa4ac1f5ee2c647de9a55c8d3f11dc4ba84fd3f619a962280ed0dee0db"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172904,6 +173003,7 @@ self: { monad-logger optparse-applicative path process QuickCheck resourcet retry temporary text transformers unix-compat ]; + jailbreak = true; doCheck = false; enableSharedExecutables = false; postInstall = '' @@ -172940,8 +173040,8 @@ self: { pname = "stack"; version = "0.1.6.0"; sha256 = "a47ffc204b9caef8281d1e5daebc21bc9d4d2414ed695dc10d32fcca4d81978d"; - revision = "3"; - editedCabalFile = "5815cd95a1b2e4ee0f80b50dd365a635dfacc77bdacd17b0dad234c9971df49d"; + revision = "6"; + editedCabalFile = "c9021f29f8e46134d9036fb8592edcfd31a0a0942dadcb4860b269f2aa463a34"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172973,6 +173073,7 @@ self: { monad-logger optparse-applicative path process QuickCheck resourcet retry temporary text transformers unix-compat ]; + jailbreak = true; doCheck = false; enableSharedExecutables = false; postInstall = '' @@ -172987,7 +173088,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; - "stack" = callPackage + "stack_0_1_8_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base , base16-bytestring, base64-bytestring, bifunctors, binary , binary-tagged, blaze-builder, byteable, bytestring, Cabal @@ -173009,8 +173110,8 @@ self: { pname = "stack"; version = "0.1.8.0"; sha256 = "89bca19a39f3148daa55dd51bcee28c9f8aa362732c915dd25a85c7a7c664338"; - revision = "1"; - editedCabalFile = "70011c93449e5fbe1ab03d022f8ed62a0513b984e4c10595bc99d573813c72bf"; + revision = "4"; + editedCabalFile = "b44318f1c13bdb7c1a8de14cc7c8707d1f4a215af985f178d19ddd733986a4ab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173052,6 +173153,76 @@ self: { homepage = "https://github.com/commercialhaskell/stack"; description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }) {}; + + "stack" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base + , base16-bytestring, base64-bytestring, bifunctors, binary + , binary-tagged, blaze-builder, byteable, bytestring, Cabal + , conduit, conduit-combinators, conduit-extra, containers + , cryptohash, cryptohash-conduit, deepseq, directory, edit-distance + , either, email-validate, enclosed-exceptions, exceptions, extra + , fast-logger, file-embed, filelock, filepath, fsnotify, gitrev + , hashable, hastache, hpc, hspec, http-client, http-client-tls + , http-conduit, http-types, lifted-base, monad-control + , monad-logger, monad-loops, mtl, old-locale, optparse-applicative + , optparse-simple, path, persistent, persistent-sqlite + , persistent-template, pretty, process, project-template + , QuickCheck, resourcet, retry, safe, semigroups, split, stm + , streaming-commons, tar, template-haskell, temporary, text, time + , transformers, transformers-base, unix, unix-compat + , unordered-containers, uuid, vector, vector-binary-instances, void + , word8, yaml, zlib + }: + mkDerivation { + pname = "stack"; + version = "0.1.10.0"; + sha256 = "9b730c2b4b7bb87fc70ccbf0bab0e2fe6f0775644b36972b4dea9088cbcab979"; + revision = "2"; + editedCabalFile = "7e5e72d10fce3a9fad12241e48098219d381dedfda71327034f1899a3da537e1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async attoparsec base base16-bytestring + base64-bytestring bifunctors binary binary-tagged blaze-builder + byteable bytestring Cabal conduit conduit-combinators conduit-extra + containers cryptohash cryptohash-conduit deepseq directory + edit-distance either email-validate enclosed-exceptions exceptions + extra fast-logger file-embed filelock filepath fsnotify hashable + hastache hpc http-client http-client-tls http-conduit http-types + lifted-base monad-control monad-logger monad-loops mtl old-locale + optparse-applicative path persistent persistent-sqlite + persistent-template pretty process project-template resourcet retry + safe semigroups split stm streaming-commons tar template-haskell + temporary text time transformers transformers-base unix unix-compat + unordered-containers uuid vector vector-binary-instances void word8 + yaml zlib + ]; + executableHaskellDepends = [ + base bytestring Cabal conduit containers directory either + exceptions filelock filepath gitrev hashable http-client + http-conduit lifted-base monad-control monad-logger mtl old-locale + optparse-applicative optparse-simple path process resourcet split + text transformers unordered-containers + ]; + testHaskellDepends = [ + async base bytestring Cabal conduit conduit-extra containers + cryptohash directory exceptions filepath hspec http-conduit + monad-logger optparse-applicative path process QuickCheck resourcet + retry temporary text transformers unix-compat + ]; + doCheck = false; + enableSharedExecutables = false; + postInstall = '' + exe=$out/bin/stack + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack + ''; + homepage = "http://haskellstack.org"; + description = "The Haskell Tool Stack"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; @@ -173063,8 +173234,8 @@ self: { }: mkDerivation { pname = "stack-hpc-coveralls"; - version = "0.0.1.0"; - sha256 = "5135a8c9c76dfb20cebac1d2774a4ecb021002ea48b31267ef78dd340605b6d1"; + version = "0.0.3.0"; + sha256 = "b7e0811516216cb5d20294c9371787e5d08663126c224f7a976e90101fd6eb22"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174567,11 +174738,41 @@ self: { resourcet stm stm-chans test-framework test-framework-hunit test-framework-quickcheck2 transformers ]; + doHaddock = false; + doCheck = false; homepage = "https://github.com/wowus/stm-conduit"; description = "Introduces conduits to channels, and promotes using conduits concurrently"; license = stdenv.lib.licenses.bsd3; }) {}; + "stm-conduit_2_7_0" = callPackage + ({ mkDerivation, async, base, cereal, cereal-conduit, conduit + , conduit-combinators, conduit-extra, directory, doctest, ghc-prim + , HUnit, lifted-async, lifted-base, monad-control, monad-loops + , QuickCheck, resourcet, stm, stm-chans, test-framework + , test-framework-hunit, test-framework-quickcheck2, transformers + , void + }: + mkDerivation { + pname = "stm-conduit"; + version = "2.7.0"; + sha256 = "e3ec32b7b150449f45b55b18dce8a6607177c948824dcffb935c721abba7c5af"; + libraryHaskellDepends = [ + async base cereal cereal-conduit conduit conduit-combinators + conduit-extra directory ghc-prim lifted-async lifted-base + monad-control monad-loops resourcet stm stm-chans transformers void + ]; + testHaskellDepends = [ + base conduit conduit-combinators directory doctest HUnit QuickCheck + resourcet stm stm-chans test-framework test-framework-hunit + test-framework-quickcheck2 transformers + ]; + homepage = "https://github.com/wowus/stm-conduit"; + description = "Introduces conduits to channels, and promotes using conduits concurrently"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stm-containers_0_2_4" = callPackage ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive @@ -174732,6 +174933,25 @@ self: { testHaskellDepends = [ base hspec HUnit stm ]; description = "Conduits and STM operations for fire hoses"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "stm-firehose_0_3_0_2" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, hspec, http-types + , HUnit, resourcet, stm, stm-chans, stm-conduit, transformers, wai + , wai-conduit, warp + }: + mkDerivation { + pname = "stm-firehose"; + version = "0.3.0.2"; + sha256 = "6519b3fa7eba570e0cbd39ebb1b99eedf27212d3a1d3f63be5758e74858ed7f8"; + libraryHaskellDepends = [ + base blaze-builder conduit http-types resourcet stm stm-chans + stm-conduit transformers wai wai-conduit warp + ]; + testHaskellDepends = [ base hspec HUnit stm ]; + homepage = "https://github.com/bartavelle/stm-firehose"; + description = "Conduits and STM operations for fire hoses"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -175182,30 +175402,33 @@ self: { }) {}; "streaming" = callPackage - ({ mkDerivation, base, bytestring, mmorph, mtl, time, transformers + ({ mkDerivation, base, bytestring, containers, exceptions, mmorph + , mtl, resourcet, time, transformers, transformers-base }: mkDerivation { pname = "streaming"; - version = "0.1.2.2"; - sha256 = "1d67401731689b4904fff6fa45ed7257c0c076e4e619714c48443804b6e94beb"; + version = "0.1.3.4"; + sha256 = "1a23959815ca3396521c850df6b90f6d8941eddab67e6512634fead2c9c29c5a"; libraryHaskellDepends = [ - base bytestring mmorph mtl time transformers + base bytestring containers exceptions mmorph mtl resourcet time + transformers transformers-base ]; homepage = "https://github.com/michaelt/streaming"; - description = "an elementary streaming prelude and a general monad transformer for streaming applications"; + description = "an elementary streaming prelude and a general stream type"; license = stdenv.lib.licenses.bsd3; }) {}; "streaming-bytestring" = callPackage - ({ mkDerivation, base, bytestring, deepseq, mmorph, mtl, streaming - , transformers + ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl + , resourcet, streaming, transformers, transformers-base }: mkDerivation { pname = "streaming-bytestring"; - version = "0.1.2.2"; - sha256 = "db5ab6c378458e57c4441f49b8564b9acfb5e64079b2c5c651d116ad0908c48d"; + version = "0.1.3.0"; + sha256 = "6573ebde6c87e608c0b82b02c25ac15094b93f1e99bd57aab275ca68d2630a13"; libraryHaskellDepends = [ - base bytestring deepseq mmorph mtl streaming transformers + base bytestring deepseq exceptions mmorph mtl resourcet streaming + transformers transformers-base ]; homepage = "https://github.com/michaelt/streaming-bytestring"; description = "effectful byte steams, or: bytestring io done right"; @@ -175517,8 +175740,8 @@ self: { }: mkDerivation { pname = "streaming-utils"; - version = "0.1.2.2"; - sha256 = "98aa08e5fb3665b7aa39934f657daf9473553a54946dd3102833e66c7cc65e4e"; + version = "0.1.3.0"; + sha256 = "f591d4e31aada0be4b0b9ac28b23a6b16d3c26db0f37b3ccb9e05239ab81e75b"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-client http-client-tls json-stream mtl pipes streaming streaming-bytestring transformers @@ -175529,6 +175752,22 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "streaming-wai" = callPackage + ({ mkDerivation, base, bytestring, bytestring-builder, http-types + , streaming, wai + }: + mkDerivation { + pname = "streaming-wai"; + version = "0.1.1"; + sha256 = "35b4182386cc1d23731b3eac78dda79a1b7878c0b6bd78fd99907c776dbfaf30"; + libraryHaskellDepends = [ + base bytestring bytestring-builder http-types streaming wai + ]; + homepage = "http://github.com/jb55/streaming-wai"; + description = "Streaming Wai utilities"; + license = stdenv.lib.licenses.mit; + }) {}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -176572,12 +176811,16 @@ self: { }) {}; "success" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, monad-control, mtl, transformers + , transformers-base + }: mkDerivation { pname = "success"; - version = "0.2"; - sha256 = "ed1d8271c71e49250540b4796b7f94bf3fa2094b30eeee210aaa316ddbc7ea59"; - libraryHaskellDepends = [ base ]; + version = "0.2.2"; + sha256 = "0c1d6936db654b732c3eee92090b0454d0e0734308e07b28d52d22b25c54c859"; + libraryHaskellDepends = [ + base monad-control mtl transformers transformers-base + ]; homepage = "https://github.com/nikita-volkov/success"; description = "A version of Either specialised for encoding of success or failure"; license = stdenv.lib.licenses.mit; @@ -176637,6 +176880,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sump" = callPackage + ({ mkDerivation, base, bytestring, data-default, either, lens + , serialport, transformers, vector + }: + mkDerivation { + pname = "sump"; + version = "0.1.0.1"; + sha256 = "b7fa21630a6965fffd913280a7dd08a77a6e3f05b2bf04ad61c41ed601a0d1f7"; + libraryHaskellDepends = [ + base bytestring data-default either lens serialport transformers + vector + ]; + homepage = "http://github.com/bgamari/sump"; + description = "A Haskell interface to SUMP-compatible logic analyzers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sundown" = callPackage ({ mkDerivation, base, bytestring, text }: mkDerivation { @@ -177083,8 +177343,8 @@ self: { }: mkDerivation { pname = "swagger2"; - version = "0.4"; - sha256 = "3cb581abef4166b283cd90f86ca0159cf05573c9b7534470301248678f8d313c"; + version = "0.4.1"; + sha256 = "9db8a5896a2a758edf683be2e9a63a388079b363c6a6f18e3723632010ff39d9"; libraryHaskellDepends = [ aeson base containers hashable http-media lens network scientific template-haskell text time unordered-containers @@ -177093,7 +177353,6 @@ self: { aeson aeson-qq base containers doctest Glob hspec HUnit QuickCheck text unordered-containers vector ]; - doCheck = false; homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; @@ -177462,7 +177721,6 @@ self: { homepage = "https://github.com/ekarayel/sync-mht"; description = "Fast incremental file transfer using Merkle-Hash-Trees"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synchronous-channels" = callPackage @@ -177531,20 +177789,20 @@ self: { }) {Synt = null;}; "syntactic" = callPackage - ({ mkDerivation, base, containers, data-hash, deepseq, mtl - , QuickCheck, tagged, tasty, tasty-golden, tasty-quickcheck + ({ mkDerivation, base, constraints, containers, data-hash, deepseq + , mtl, QuickCheck, tagged, tasty, tasty-golden, tasty-quickcheck , tasty-th, template-haskell, tree-view, utf8-string }: mkDerivation { pname = "syntactic"; - version = "3.0"; - sha256 = "36b4807059d606536fa3210ebaafbc443b2f5b473520a3d038fb18591d04cd4c"; + version = "3.2"; + sha256 = "ed6ec0f95c7d4a63610317fe115a0380d75a39ffa1ef35529c96ca650bd433c4"; libraryHaskellDepends = [ - base containers data-hash deepseq mtl tagged template-haskell + base constraints containers data-hash deepseq mtl template-haskell tree-view ]; testHaskellDepends = [ - base containers QuickCheck tagged tasty tasty-golden + base containers mtl QuickCheck tagged tasty tasty-golden tasty-quickcheck tasty-th utf8-string ]; homepage = "https://github.com/emilaxelsson/syntactic"; @@ -179409,6 +179667,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-dejafu" = callPackage + ({ mkDerivation, base, dejafu, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "0.2.0.0"; + sha256 = "cba0315e6c6b2946ada0e48ea6f443f20bc8421810b0c334d1b095be0d1453ae"; + libraryHaskellDepends = [ base dejafu tasty ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Deja Fu support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + }) {}; + "tasty-expected-failure" = callPackage ({ mkDerivation, base, tagged, tasty }: mkDerivation { @@ -179419,7 +179689,6 @@ self: { homepage = "http://github.com/nomeata/tasty-expected-failure"; description = "Mark tasty tests as failure expected"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-fail-fast" = callPackage @@ -180135,8 +180404,8 @@ self: { }: mkDerivation { pname = "tellbot"; - version = "0.6.0.8"; - sha256 = "69025b8765f5383e8060c709875c5b704edb66508287b33099c8301f1e074104"; + version = "0.6.0.10"; + sha256 = "7b853263a4522ec8839a429c0d2be76ca2c7427f0693ce6a84b7a6067e979373"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -180238,21 +180507,20 @@ self: { "templatepg" = callPackage ({ mkDerivation, base, binary, bytestring, haskell-src-meta, mtl - , network, old-locale, parsec, regex-compat, regex-posix - , template-haskell, time, utf8-string + , network, parsec, regex-compat, regex-posix, template-haskell + , time, utf8-string }: mkDerivation { pname = "templatepg"; - version = "0.2.6"; - sha256 = "67317c39b93db3a74ec7fc39f37cd273c6ee6673e539c1c1c6433d6a8b8eaac4"; + version = "0.2.7"; + sha256 = "d0b35e35bff5ac9d2605c54fa20586d6286376ae1362dad0e069a65dc9e1002f"; libraryHaskellDepends = [ - base binary bytestring haskell-src-meta mtl network old-locale - parsec regex-compat regex-posix template-haskell time utf8-string + base binary bytestring haskell-src-meta mtl network parsec + regex-compat regex-posix template-haskell time utf8-string ]; homepage = "https://github.com/jekor/templatepg"; description = "A PostgreSQL access library with compile-time SQL type inference"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = stdenv.lib.licenses.mit; }) {}; "templater" = callPackage @@ -180654,7 +180922,6 @@ self: { homepage = "http://mbays.freeshell.org/tersmu"; description = "A semantic parser for lojban"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-framework_0_8_0_3" = callPackage @@ -182098,7 +182365,6 @@ self: { libraryHaskellDepends = [ array base ]; description = "Plot functions in text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "textmatetags" = callPackage @@ -182295,7 +182561,6 @@ self: { homepage = "https://github.com/seereason/th-context"; description = "Test instance context"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-desugar_1_4_2" = callPackage @@ -183107,6 +183372,7 @@ self: { ]; description = "Simple, IO-based library for Erlang-style thread supervision"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threadscope" = callPackage @@ -183126,7 +183392,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ThreadScope"; description = "A graphical tool for profiling parallel Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threefish" = callPackage @@ -183186,7 +183451,6 @@ self: { homepage = "http://thrift.apache.org"; description = "Haskell bindings for the Apache Thrift RPC system"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thrist" = callPackage @@ -183310,7 +183574,6 @@ self: { homepage = "https://github.com/koterpillar/tianbar"; description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; "tic-tac-toe" = callPackage @@ -183855,6 +184118,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timemap" = callPackage + ({ mkDerivation, base, containers, hashable, hashtables, QuickCheck + , quickcheck-instances, stm, tasty, tasty-hunit, tasty-quickcheck + , time, unordered-containers + }: + mkDerivation { + pname = "timemap"; + version = "0.0.0"; + sha256 = "f0b85eca4fdea0270897e0b15675f7894b193695968ddb6ac5f7acff73b64cc6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers hashable hashtables stm time unordered-containers + ]; + executableHaskellDepends = [ + base containers hashable hashtables stm time unordered-containers + ]; + testHaskellDepends = [ + base containers hashable hashtables QuickCheck quickcheck-instances + stm tasty tasty-hunit tasty-quickcheck time unordered-containers + ]; + description = "A mutable hashmap, implicitly indexed by UTCTime"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "timeout" = callPackage ({ mkDerivation, base, exceptions, mtl, QuickCheck, tasty , tasty-quickcheck, time @@ -184207,7 +184495,6 @@ self: { homepage = "http://tip-org.github.io"; description = "tons of inductive problems - support library and tools"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "titlecase" = callPackage @@ -185147,6 +185434,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tracy" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "tracy"; + version = "0.1.0.0"; + sha256 = "33e4e073bead5fa93236a23e47ab76ca6b38a74d33ada8af25a84ae446e1c3d9"; + libraryHaskellDepends = [ base ]; + description = "Convenience wrappers for non-intrusive debug tracing"; + license = stdenv.lib.licenses.mit; + }) {}; + "trajectory" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cmdargs , containers, http-enumerator, http-types, regexpr, text @@ -185635,7 +185933,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Treeviz"; description = "Visualization of computation decomposition trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tremulous-query" = callPackage @@ -185704,7 +186001,6 @@ self: { ]; description = "Various trie implementations in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trifecta_1_5_1_3" = callPackage @@ -185777,6 +186073,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tripLL" = callPackage + ({ mkDerivation, base, bytestring, cereal, filepath + , leveldb-haskell + }: + mkDerivation { + pname = "tripLL"; + version = "0.1.0.0"; + sha256 = "228b6112c915aa6fd70605bca9c76f0468a13afe6956e3755d48efc0efaec3ab"; + libraryHaskellDepends = [ + base bytestring cereal filepath leveldb-haskell + ]; + homepage = "https://github.com/aphorisme/tripLL"; + description = "A very simple triple store"; + license = stdenv.lib.licenses.mit; + }) {}; + "trivia" = callPackage ({ mkDerivation, base, comonad, distributive }: mkDerivation { @@ -185826,7 +186138,6 @@ self: { homepage = "https://github.com/liyang/true-name"; description = "Template Haskell hack to violate another module's abstractions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "truelevel" = callPackage @@ -186174,7 +186485,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Homogeneous tuples"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tuple" = callPackage @@ -186796,7 +187106,6 @@ self: { homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-enumerator" = callPackage @@ -186905,7 +187214,6 @@ self: { homepage = "https://github.com/himura/twitter-types"; description = "Twitter JSON parser and types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-types-lens" = callPackage @@ -186922,7 +187230,6 @@ self: { homepage = "https://github.com/himura/twitter-types-lens"; description = "Twitter JSON types (lens powered)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tx" = callPackage @@ -187367,7 +187674,6 @@ self: { homepage = "https://github.com/konn/type-natural"; description = "Type-level natural and proofs of their properties"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-ord" = callPackage @@ -187576,8 +187882,8 @@ self: { }: mkDerivation { pname = "typedquery"; - version = "0.1.0.2"; - sha256 = "c0184941a1a69b579ce710954a8b8f200e92c228fb8eb35e0008e01a20ec0e50"; + version = "0.1.0.3"; + sha256 = "73e928ba315cb3e286b395487c9ee74acd57c86441543be3a614cd1edaff2035"; libraryHaskellDepends = [ aeson base bytestring haskell-src-meta parsec template-haskell text transformers @@ -187727,14 +188033,13 @@ self: { }: mkDerivation { pname = "typography-geometry"; - version = "1.0.0"; - sha256 = "0ec6c98ddd23dec27f6511b917b896f4b7ef3102629d1ceb92d5f376076478ef"; + version = "1.0.0.1"; + sha256 = "edaeafb60126be19f0e4fdda54be89b92317dd03b59e9d8b6f119064c1642ad7"; libraryHaskellDepends = [ base containers parallel polynomials-bernstein vector ]; description = "Drawings for printed text documents"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tz" = callPackage @@ -188529,12 +188834,15 @@ self: { pname = "uniform-io"; version = "1.0.0.0"; sha256 = "758c265cc4838f2536c9adfe0c4e0e3839b4c29c2241ad89ab941925a62ceb1e"; + revision = "1"; + editedCabalFile = "7646b537e81dab11156af68670fd508a81521543536f1fe3e4d45c545616f6be"; libraryHaskellDepends = [ attoparsec base bytestring data-default-class iproute network transformers word8 ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ attoparsec base bytestring Cabal ]; + jailbreak = true; homepage = "https://sealgram.com/git/haskell/uniform-io"; description = "Uniform IO over files, network, anything"; license = stdenv.lib.licenses.mit; @@ -188642,19 +188950,17 @@ self: { }: mkDerivation { pname = "unique-logic-tf"; - version = "0.4.1.1"; - sha256 = "68e3b4877590343cd668ba2a8637b3e008bcfbebac79f99f2380d216210f843d"; + version = "0.4.1.2"; + sha256 = "d00604f3ba2970a714fb656fc79a6481f833356af32ffd2bbb30cf025db9acbd"; libraryHaskellDepends = [ base containers explicit-exception transformers utility-ht ]; testHaskellDepends = [ base non-empty QuickCheck transformers utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/unique-logic-tf/"; description = "Solve simple simultaneous equations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uniqueid" = callPackage @@ -189527,7 +189833,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "uri-bytestring" = callPackage + "uri-bytestring_0_1_9_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , derive, HUnit, lens, QuickCheck, quickcheck-instances, semigroups , tasty, tasty-hunit, tasty-quickcheck @@ -189547,6 +189853,29 @@ self: { homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "uri-bytestring" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , derive, HUnit, lens, QuickCheck, quickcheck-instances, semigroups + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "uri-bytestring"; + version = "0.1.9.2"; + sha256 = "3d51236d957c656f38ebc2f01f256130b8bc48166539d477803295bdffcc5bb0"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring + ]; + testHaskellDepends = [ + attoparsec base blaze-builder bytestring derive HUnit lens + QuickCheck quickcheck-instances semigroups tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/Soostone/uri-bytestring"; + description = "Haskell URI parsing as ByteStrings"; + license = stdenv.lib.licenses.bsd3; }) {}; "uri-conduit" = callPackage @@ -189952,8 +190281,8 @@ self: { }: mkDerivation { pname = "userid"; - version = "0.1.2.1"; - sha256 = "0a1a3756eb3e01ff82c14429331c172e19b54f01d1083a27fa493a6adb929456"; + version = "0.1.2.2"; + sha256 = "21d4ee5ccf8643b41288ffb4bae5180ff1e94fe81ee2b56461fe1f345c9bdffb"; libraryHaskellDepends = [ aeson base boomerang lens safecopy web-routes web-routes-th ]; @@ -190299,7 +190628,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuagc" = callPackage @@ -190949,8 +191277,8 @@ self: { }: mkDerivation { pname = "validation"; - version = "0.5.1"; - sha256 = "0b170b835eb2df60b0b620ac7e64127926f7f7e5e682ee712acd53999422dd25"; + version = "0.5.2"; + sha256 = "dd1a5857ead5b9ceec3839c9b6af7f3096bbc5694e37e34dfd4be7c1d5f35437"; libraryHaskellDepends = [ base bifunctors lens mtl semigroupoids semigroups transformers ]; @@ -190960,7 +191288,6 @@ self: { homepage = "https://github.com/NICTA/validation"; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validations" = callPackage @@ -191121,7 +191448,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "vault" = callPackage + "vault_0_3_0_4" = callPackage ({ mkDerivation, base, containers, hashable, unordered-containers }: mkDerivation { @@ -191134,6 +191461,22 @@ self: { homepage = "https://github.com/HeinrichApfelmus/vault"; description = "a persistent store for values of arbitrary types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "vault" = callPackage + ({ mkDerivation, base, containers, hashable, unordered-containers + }: + mkDerivation { + pname = "vault"; + version = "0.3.0.5"; + sha256 = "c37bf617db6b39333de40540ecbda8ae644ec6cc8e18bbccbe5d976aeb8cdea7"; + libraryHaskellDepends = [ + base containers hashable unordered-containers + ]; + homepage = "https://github.com/HeinrichApfelmus/vault"; + description = "a persistent store for values of arbitrary types"; + license = stdenv.lib.licenses.bsd3; }) {}; "vaultaire-common" = callPackage @@ -191266,7 +191609,6 @@ self: { homepage = "https://github.com/forste/haskellVCSGUI"; description = "GUI library for source code management systems"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vcswrapper" = callPackage @@ -191612,8 +191954,8 @@ self: { ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: mkDerivation { pname = "vector-fftw"; - version = "0.1.3.3"; - sha256 = "131d88fa9ea17e7e46a6d886f37e77282e8e95f2022ccefd2cf11adeca0b9172"; + version = "0.1.3.5"; + sha256 = "f4d88d3122c2ea3a92a5dffd78743e8942f261fd7d00724c6aa317adbc59abfe"; libraryHaskellDepends = [ base primitive storable-complex vector ]; librarySystemDepends = [ fftw ]; homepage = "http://hackage.haskell.org/package/vector-fftw"; @@ -192165,7 +192507,6 @@ self: { ]; description = "An MPD client with vim-like key bindings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ncurses;}; "vintage-basic" = callPackage @@ -192221,7 +192562,7 @@ self: { ]; description = "Utilities for working with OpenGL's GLSL shading language and vinyl records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vinyl-json" = callPackage @@ -192254,6 +192595,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vinyl-vectors" = callPackage + ({ mkDerivation, base, bytestring, constraints, data-default + , primitive, template-haskell, text, vector, vinyl + }: + mkDerivation { + pname = "vinyl-vectors"; + version = "0.2.0"; + sha256 = "6f9b6b8772937c967ad2b51e062cab27cb94fdbfb6d5e35eaae7c396e42362d7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring constraints data-default primitive template-haskell + text vector vinyl + ]; + homepage = "http://github.com/andrewthad/vinyl-vectors"; + description = "Vectors for vinyl vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "virthualenv" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, file-embed , filepath, mtl, process, safe, split @@ -192497,7 +192858,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome) vte;}; "vtegtk3" = callPackage @@ -192739,7 +193099,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai" = callPackage + "wai_3_0_4_0" = callPackage ({ mkDerivation, base, blaze-builder, bytestring , bytestring-builder, hspec, http-types, network, text , transformers, unix-compat, vault @@ -192758,6 +193118,26 @@ self: { homepage = "https://github.com/yesodweb/wai"; description = "Web Application Interface"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring + , bytestring-builder, hspec, http-types, network, text + , transformers, unix-compat, vault + }: + mkDerivation { + pname = "wai"; + version = "3.0.5.0"; + sha256 = "0e417e6e8eff087585c0079917e6141a4e006fcd6cb736d1c6b49c503e9a08f3"; + libraryHaskellDepends = [ + base blaze-builder bytestring bytestring-builder http-types network + text transformers unix-compat vault + ]; + testHaskellDepends = [ base blaze-builder bytestring hspec ]; + homepage = "https://github.com/yesodweb/wai"; + description = "Web Application Interface"; + license = stdenv.lib.licenses.mit; }) {}; "wai-app-file-cgi" = callPackage @@ -194154,20 +194534,36 @@ self: { "wai-middleware-content-type" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring - , clay, containers, exceptions, http-media, http-types, lucid - , mmorph, monad-control, monad-logger, mtl, pandoc, resourcet - , shakespeare, text, transformers, transformers-base, wai - , wai-transformers, wai-util + , clay, containers, exceptions, hspec, hspec-wai, http-media + , http-types, lucid, mmorph, monad-control, monad-logger, mtl + , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec + , text, transformers, transformers-base, urlpath, wai + , wai-transformers, wai-util, warp }: mkDerivation { pname = "wai-middleware-content-type"; - version = "0.0.4"; - sha256 = "9c252bdd3e74043b36a3243d3223659db83a46cdd00e43bf1cae70ef67620623"; + version = "0.1.0.1"; + sha256 = "4c2fe853b078648b2f916da3fd174d5cfa01153edd136e587f4aae54cf1c579e"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base blaze-builder blaze-html bytestring clay containers exceptions http-media http-types lucid mmorph monad-control monad-logger mtl pandoc resourcet shakespeare text transformers - transformers-base wai wai-transformers wai-util + transformers-base urlpath wai wai-transformers wai-util + ]; + executableHaskellDepends = [ + aeson base blaze-builder blaze-html bytestring clay containers + exceptions http-media http-types lucid mmorph monad-control + monad-logger mtl pandoc resourcet shakespeare text transformers + transformers-base urlpath wai wai-transformers wai-util warp + ]; + testHaskellDepends = [ + aeson base blaze-builder blaze-html bytestring clay containers + exceptions hspec hspec-wai http-media http-types lucid mmorph + monad-control monad-logger mtl pandoc pandoc-types resourcet + shakespeare tasty tasty-hspec text transformers transformers-base + urlpath wai wai-transformers wai-util warp ]; description = "Route to different middlewares based on the incoming Accept header"; license = stdenv.lib.licenses.bsd3; @@ -194233,6 +194629,36 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "wai-middleware-crowd_0_1_3" = callPackage + ({ mkDerivation, authenticate, base, base64-bytestring, binary + , blaze-builder, bytestring, case-insensitive, clientsession + , containers, cookie, gitrev, http-client, http-client-tls + , http-reverse-proxy, http-types, optparse-applicative, resourcet + , template-haskell, text, time, transformers, unix-compat, vault + , wai, wai-app-static, wai-extra, warp + }: + mkDerivation { + pname = "wai-middleware-crowd"; + version = "0.1.3"; + sha256 = "ae39aacc5cad59ff26053e8650b8dde3d4432efa6176ef2101501fe8d0008704"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + authenticate base base64-bytestring binary blaze-builder bytestring + case-insensitive clientsession containers cookie http-client + http-client-tls http-types resourcet text time unix-compat vault + wai + ]; + executableHaskellDepends = [ + base bytestring clientsession gitrev http-client http-client-tls + http-reverse-proxy http-types optparse-applicative template-haskell + text transformers wai wai-app-static wai-extra warp + ]; + description = "Middleware and utilities for using Atlassian Crowd authentication"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-etag" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , filepath, http-date, http-types, unix-compat @@ -194249,7 +194675,6 @@ self: { homepage = "https://github.com/ameingast/wai-middleware-etag"; description = "WAI ETag middleware for static files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-gunzip" = callPackage @@ -194457,6 +194882,8 @@ self: { pname = "wai-middleware-static"; version = "0.8.0"; sha256 = "a37aaf452e3816928934d39b4eef3c1f7186c9db618d0b303e5136fc858e5e58"; + revision = "1"; + editedCabalFile = "b365b6463ecd16b5e9782776e365b1441109a2909ff42873b7fd5862b1397eb7"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash directory expiring-cache-map filepath http-types mime-types mtl old-locale @@ -194532,20 +194959,17 @@ self: { }) {}; "wai-middleware-verbs" = callPackage - ({ mkDerivation, base, bifunctors, composition-extra, containers - , errors, exceptions, http-types, monad-logger, mtl, resourcet - , transformers, transformers-base, wai, wai-transformers + ({ mkDerivation, base, containers, errors, exceptions, http-types + , mmorph, monad-logger, mtl, resourcet, transformers + , transformers-base, wai, wai-transformers }: mkDerivation { pname = "wai-middleware-verbs"; - version = "0.0.5"; - sha256 = "fa6d481cba5a080140a940c84fffe7277a1a32a98ef6a139e65e1bf5a7e0600c"; - revision = "1"; - editedCabalFile = "e429338770126fa54b38252f546c9be4f32c7921bb00e53eecf9b7e9e0bf0bad"; + version = "0.1.0"; + sha256 = "af304d24cf761465cae236b4a8d59a05cd8d74870a8c96f76f5b7fcbbab7d88e"; libraryHaskellDepends = [ - base bifunctors composition-extra containers errors exceptions - http-types monad-logger mtl resourcet transformers - transformers-base wai wai-transformers + base containers errors exceptions http-types mmorph monad-logger + mtl resourcet transformers transformers-base wai wai-transformers ]; description = "Route different middleware responses based on the incoming HTTP verb"; license = stdenv.lib.licenses.bsd3; @@ -194770,6 +195194,22 @@ self: { license = "unknown"; }) {}; + "wai-session-alt" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, cookie + , http-types, time, vault, wai-transformers + }: + mkDerivation { + pname = "wai-session-alt"; + version = "0.0.0"; + sha256 = "89408d5ef5371e8e855ad02cdb056fb375bd1dd024bdd34d961b75fc1ce6c337"; + libraryHaskellDepends = [ + base blaze-builder bytestring cookie http-types time vault + wai-transformers + ]; + description = "An alternative session middleware for WAI"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-session-clientsession" = callPackage ({ mkDerivation, base, bytestring, cereal, clientsession, errors , transformers, wai-session @@ -194916,14 +195356,12 @@ self: { }) {}; "wai-transformers" = callPackage - ({ mkDerivation, base, transformers, wai }: + ({ mkDerivation, base, exceptions, transformers, wai }: mkDerivation { pname = "wai-transformers"; - version = "0.0.3"; - sha256 = "fe60300420f8e0c2a5ca09f70cf6f731ba1bc495d40209f74e2084b6e45d8c1a"; - revision = "1"; - editedCabalFile = "d1b4c6bd7aa9d94ecacab4adc52d3190db0ee55f9e08ae5f1b4752bb4c35d1db"; - libraryHaskellDepends = [ base transformers wai ]; + version = "0.0.4"; + sha256 = "dac72f1396431c591303550eebac0e3b94920a1989eb8964c5ea3eb6609861c0"; + libraryHaskellDepends = [ base exceptions transformers wai ]; description = "Simple parameterization of Wai's Application type"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -195053,7 +195491,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-websockets" = callPackage + "wai-websockets_3_0_0_6" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , file-embed, http-types, network, text, transformers, wai , wai-app-static, warp, websockets @@ -195076,9 +195514,10 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "Provide a bridge between WAI and the websockets package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-websockets_3_0_0_7" = callPackage + "wai-websockets" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , file-embed, http-types, network, text, transformers, wai , wai-app-static, warp, websockets @@ -195101,7 +195540,6 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "Provide a bridge between WAI and the websockets package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wait-handle" = callPackage @@ -195862,28 +196300,28 @@ self: { ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, bytestring-builder, case-insensitive, containers , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date - , http-types, http2, HUnit, iproute, lifted-base, network - , old-locale, process, QuickCheck, simple-sendfile, stm - , streaming-commons, text, time, transformers, unix, unix-compat - , vault, wai, word8 + , http-types, http2, HUnit, iproute, lifted-base, network, process + , QuickCheck, simple-sendfile, stm, streaming-commons, text, time + , transformers, unix, unix-compat, unordered-containers, vault, wai + , word8 }: mkDerivation { pname = "warp"; - version = "3.1.9"; - sha256 = "53cd0f79fb164f6c79c31f23ffb8cd0037d47ea3c7cd1448f9cb84fe9150dd82"; + version = "3.1.10"; + sha256 = "c0b60aca4a6c10f7b6f00e2e17e5ba5f04ffefb287123541459436bfd22c4fd5"; libraryHaskellDepends = [ array auto-update base blaze-builder bytestring bytestring-builder case-insensitive containers ghc-prim hashable http-date http-types http2 iproute network simple-sendfile stm streaming-commons text - unix unix-compat vault wai word8 + unix unix-compat unordered-containers vault wai word8 ]; testHaskellDepends = [ array async auto-update base blaze-builder bytestring bytestring-builder case-insensitive containers directory doctest ghc-prim hashable hspec HTTP http-date http-types http2 HUnit - iproute lifted-base network old-locale process QuickCheck - simple-sendfile stm streaming-commons text time transformers unix - unix-compat vault wai word8 + iproute lifted-base network process QuickCheck simple-sendfile stm + streaming-commons text time transformers unix unix-compat + unordered-containers vault wai word8 ]; doCheck = false; homepage = "http://github.com/yesodweb/wai"; @@ -196221,6 +196659,8 @@ self: { pname = "warp-tls"; version = "3.1.4"; sha256 = "7572b8893160a07051a60323e91553b8911d87d58712c64f997ecced1a5febd7"; + revision = "1"; + editedCabalFile = "39cf89625ffec9af354d3e502b6974ca122adf0241c9e1e6815bf4c11fb34535"; libraryHaskellDepends = [ base bytestring cprng-aes data-default-class network streaming-commons tls wai warp @@ -196702,6 +197142,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webapp" = callPackage + ({ mkDerivation, alex, attoparsec, base, base16-bytestring, bcrypt + , blaze-builder, bytestring, cryptohash, css-text, data-default + , directory, filepath, fsnotify, happy, hashtables, hjsmin + , http-types, mime-types, mtl, network, optparse-applicative + , scotty, stm, streaming-commons, text, time, transformers, unix + , unordered-containers, wai, wai-extra, warp, warp-tls, zlib + }: + mkDerivation { + pname = "webapp"; + version = "0.1.0"; + sha256 = "e7c3f6ebbd9f254f8d9323e240a6029bafcbb0c2e86e4d7a8f45e42255704a3f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base base16-bytestring bcrypt blaze-builder bytestring + cryptohash css-text data-default directory filepath fsnotify + hashtables hjsmin http-types mime-types mtl network + optparse-applicative scotty stm streaming-commons text time + transformers unix unordered-containers wai wai-extra warp warp-tls + zlib + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + base bytestring http-types optparse-applicative scotty text + transformers + ]; + homepage = "https://github.com/fhsjaagshs/webapp"; + description = "Haskell web scaffolding using Scotty, WAI, and Warp"; + license = stdenv.lib.licenses.mit; + }) {}; + "webcrank" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , case-insensitive, either, exceptions, http-date, http-media @@ -197099,7 +197571,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) webkit;}; "webkit-javascriptcore" = callPackage @@ -197131,7 +197602,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) webkit;}; "webkitgtk3-javascriptcore" = callPackage @@ -197147,7 +197617,6 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) webkit;}; "webpage_0_0_3_1" = callPackage @@ -198203,33 +198672,35 @@ self: { "wolf" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , amazonka-swf, base, bytestring, conduit, conduit-extra - , exceptions, fast-logger, http-conduit, lens, monad-control - , monad-logger, mtl, mtl-compat, optparse-applicative, resourcet - , safe, shelly, text, transformers, transformers-base - , unordered-containers, uuid, yaml + , amazonka-swf, base, basic-prelude, bytestring, conduit + , conduit-extra, exceptions, fast-logger, formatting, http-conduit + , http-types, lens, monad-control, monad-logger, mtl, mtl-compat + , optparse-applicative, resourcet, safe, shelly, tasty, tasty-hunit + , text, time, transformers, transformers-base, unordered-containers + , uuid, yaml }: mkDerivation { pname = "wolf"; - version = "0.2.0"; - sha256 = "0660d46bd7defb4aebc74a19524da014f3e2b4da6beec8d7b9f4c78c59e5c013"; + version = "0.2.2"; + sha256 = "73a4d33c24eef17da4f09544f478a65ab73935cc720f94d7a62977917b80428b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-swf base - bytestring conduit conduit-extra exceptions fast-logger - http-conduit lens monad-control monad-logger mtl mtl-compat - optparse-applicative resourcet safe text transformers - transformers-base unordered-containers uuid yaml + basic-prelude bytestring conduit conduit-extra exceptions + fast-logger formatting http-conduit http-types lens monad-control + monad-logger mtl mtl-compat optparse-applicative resourcet safe + text time transformers transformers-base unordered-containers uuid + yaml ]; executableHaskellDepends = [ - aeson amazonka-core base bytestring optparse-applicative resourcet - shelly text transformers yaml + aeson amazonka-core base basic-prelude bytestring + optparse-applicative resourcet shelly text transformers yaml ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; homepage = "https://github.com/swift-nav/wolf"; description = "Amazon Simple Workflow Service Wrapper"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "woot" = callPackage @@ -198837,7 +199308,6 @@ self: { homepage = "https://wiki.haskell.org/WxAsteroids"; description = "Try to avoid the asteroids with your space ship"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxFruit" = callPackage @@ -199294,7 +199764,6 @@ self: { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Utility for X509 certificate and chain"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "x509-validation_1_5_1" = callPackage @@ -199552,7 +200021,6 @@ self: { executableHaskellDepends = [ base cairo graphviz gtk text ]; description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xenstore" = callPackage @@ -200561,6 +201029,61 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xml-query" = callPackage + ({ mkDerivation, base-prelude, free, text }: + mkDerivation { + pname = "xml-query"; + version = "0.9.0.2"; + sha256 = "008d596529cffde397c55026c10c8a20951272959e2a6e35cfdfef499719ec7b"; + libraryHaskellDepends = [ base-prelude free text ]; + homepage = "https://github.com/sannsyn/xml-query"; + description = "A parser-agnostic declarative API for querying XML-documents"; + license = stdenv.lib.licenses.mit; + }) {}; + + "xml-query-xml-conduit" = callPackage + ({ mkDerivation, base-prelude, text, xml-conduit, xml-query + , xml-query-xml-types, xml-types + }: + mkDerivation { + pname = "xml-query-xml-conduit"; + version = "0.3"; + sha256 = "daa66b0b16961b090d47278e4ad92b1b776080e1c675e414c65640db13118ecb"; + libraryHaskellDepends = [ + base-prelude text xml-conduit xml-query xml-query-xml-types + xml-types + ]; + homepage = "https://github.com/sannsyn/xml-query-xml-conduit"; + description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "xml-query-xml-types" = callPackage + ({ mkDerivation, base, base-prelude, data-default-class, free + , html-entities, QuickCheck, quickcheck-instances, success, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text + , transformers, xml-conduit, xml-query, xml-types + }: + mkDerivation { + pname = "xml-query-xml-types"; + version = "0.4"; + sha256 = "28291319efbb60d4a2889cf1319d3fd5aa63b71ec9f29562ec1fdfa243ce7b81"; + libraryHaskellDepends = [ + base-prelude free html-entities success text transformers xml-query + xml-types + ]; + testHaskellDepends = [ + base base-prelude data-default-class QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text xml-conduit xml-query xml-types + ]; + homepage = "https://github.com/sannsyn/xml-query-xml-types"; + description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-to-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, curl , hashable, hxt, hxt-curl, hxt-expat, hxt-tagsoup, regex-posix @@ -201011,7 +201534,6 @@ self: { homepage = "https://github.com/supki/xmonad-screenshot"; description = "Workspaces screenshooting utility for XMonad"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmonad-utils" = callPackage @@ -201793,7 +202315,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libyaml;}; - "yaml" = callPackage + "yaml_0_8_15_1" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat , bytestring, conduit, containers, directory, enclosed-exceptions , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific @@ -201820,6 +202342,36 @@ self: { homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libyaml;}; + + "yaml" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat + , bytestring, conduit, containers, directory, enclosed-exceptions + , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.8.15.2"; + sha256 = "ec5e9402e96590842bb77d6b66003a2289b4ab415aeb25362ef8f6c370a32712"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + enclosed-exceptions filepath resourcet scientific text transformers + unordered-containers vector + ]; + libraryPkgconfigDepends = [ libyaml ]; + executableHaskellDepends = [ aeson base bytestring ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring conduit hspec HUnit + mockery resourcet text transformers unordered-containers vector + ]; + homepage = "http://github.com/snoyberg/yaml/"; + description = "Support for parsing and rendering YAML documents"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libyaml;}; "yaml-config" = callPackage @@ -202822,7 +203374,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-auth" = callPackage + "yesod-auth_1_4_8" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, conduit, conduit-extra @@ -202849,6 +203401,36 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-auth" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, conduit, conduit-extra + , containers, cryptohash, data-default, email-validate, file-embed + , http-client, http-conduit, http-types, lifted-base, mime-mail + , network-uri, nonce, persistent, persistent-template, random + , resourcet, safe, shakespeare, template-haskell, text, time + , transformers, unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.4.11"; + sha256 = "2bf08ed837a32e98002d5d16c5cd751a6871950e7bcb2e8b12045f6c60071a77"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup byteable bytestring conduit + conduit-extra containers cryptohash data-default email-validate + file-embed http-client http-conduit http-types lifted-base + mime-mail network-uri nonce persistent persistent-template random + resourcet safe shakespeare template-haskell text time transformers + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-auth-account" = callPackage @@ -202897,7 +203479,6 @@ self: { homepage = "https://github.com/meteficha/yesod-auth-account-fork"; description = "An account authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-basic" = callPackage @@ -203288,7 +203869,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-auth-oauth2" = callPackage + "yesod-auth-oauth2_0_1_4" = callPackage ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 , http-client, http-conduit, http-types, lifted-base, network-uri , random, text, transformers, vector, yesod-auth, yesod-core @@ -203306,6 +203887,27 @@ self: { homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; description = "OAuth 2.0 authentication plugins"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-auth-oauth2" = callPackage + ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 + , http-client, http-conduit, http-types, lifted-base, network-uri + , random, text, transformers, vector, yesod-auth, yesod-core + , yesod-form + }: + mkDerivation { + pname = "yesod-auth-oauth2"; + version = "0.1.5"; + sha256 = "7678dcd4ed18ffb502601cdc069674260ae10019f9619c69a1a7f90aadc88768"; + libraryHaskellDepends = [ + aeson authenticate base bytestring hoauth2 http-client http-conduit + http-types lifted-base network-uri random text transformers vector + yesod-auth yesod-core yesod-form + ]; + homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; + description = "OAuth 2.0 authentication plugins"; + license = stdenv.lib.licenses.bsd3; }) {}; "yesod-auth-pam" = callPackage @@ -204277,7 +204879,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-bin" = callPackage + "yesod-bin_1_4_14" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, bytestring, Cabal, conduit, conduit-extra , containers, data-default-class, deepseq, directory, file-embed @@ -204308,6 +204910,40 @@ self: { homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-bin" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, deepseq, directory, file-embed + , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit + , http-reverse-proxy, http-types, lifted-base, network + , optparse-applicative, parsec, process, project-template + , resourcet, shakespeare, split, streaming-commons, tar + , template-haskell, text, time, transformers, transformers-compat + , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls + , yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.4.16.1"; + sha256 = "def7ebf5f2d9cc0366fc9309603029b59f750b9045ae5ace4352bce5b0027fbd"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async attoparsec base base64-bytestring blaze-builder bytestring + Cabal conduit conduit-extra containers data-default-class deepseq + directory file-embed filepath fsnotify ghc ghc-paths http-client + http-conduit http-reverse-proxy http-types lifted-base network + optparse-applicative parsec process project-template resourcet + shakespeare split streaming-commons tar template-haskell text time + transformers transformers-compat unix-compat unordered-containers + wai wai-extra warp warp-tls yaml zlib + ]; + homepage = "http://www.yesodweb.com/"; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-bootstrap" = callPackage @@ -205086,7 +205722,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-core" = callPackage + "yesod-core_1_4_15_1" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive , cereal, clientsession, conduit, conduit-extra, containers, cookie @@ -205123,6 +205759,46 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-core" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , blaze-html, blaze-markup, byteable, bytestring, case-insensitive + , cereal, clientsession, conduit, conduit-extra, containers, cookie + , data-default, deepseq, directory, exceptions, fast-logger, hspec + , hspec-expectations, http-types, HUnit, lifted-base, monad-control + , monad-logger, mtl, mwc-random, network, old-locale, parsec + , path-pieces, primitive, QuickCheck, random, resourcet, safe + , semigroups, shakespeare, streaming-commons, template-haskell + , text, time, transformers, transformers-base, unix-compat + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.4.17"; + sha256 = "954f0851ec388ef9b9009e087d7b8c214481f7e5bd4c3dff2828030780d0eadf"; + libraryHaskellDepends = [ + aeson auto-update base blaze-builder blaze-html blaze-markup + byteable bytestring case-insensitive cereal clientsession conduit + conduit-extra containers cookie data-default deepseq directory + exceptions fast-logger http-types lifted-base monad-control + monad-logger mtl mwc-random old-locale parsec path-pieces primitive + random resourcet safe semigroups shakespeare template-haskell text + time transformers transformers-base unix-compat + unordered-containers vector wai wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base blaze-builder bytestring clientsession conduit + conduit-extra containers cookie hspec hspec-expectations http-types + HUnit lifted-base mwc-random network path-pieces QuickCheck random + resourcet shakespeare streaming-commons template-haskell text + transformers wai wai-extra + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-crud" = callPackage @@ -205484,7 +206160,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-form" = callPackage + "yesod-form_1_4_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -205506,6 +206182,31 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-form" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , semigroups, shakespeare, template-haskell, text, time + , transformers, wai, xss-sanitize, yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.4.6"; + sha256 = "1a20f58e0f06b92afc5bd31b5ab6b1d5c6645e2f7fd134c4b2e325d818b50e66"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet semigroups shakespeare + template-haskell text time transformers wai xss-sanitize yesod-core + yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + homepage = "http://www.yesodweb.com/"; + description = "Form handling support for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-form-json" = callPackage @@ -205733,7 +206434,6 @@ self: { homepage = "https://github.com/mgsloan/yesod-media-simple"; description = "Simple display of media types, served by yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-newsfeed_1_4_0" = callPackage @@ -205835,7 +206535,6 @@ self: { homepage = "http://github.com/pbrisbin/yesod-paginator"; description = "A pagination approach for yesod"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-persistent_1_4_0_1" = callPackage @@ -207113,7 +207812,6 @@ self: { homepage = "https://yi-editor.github.io"; description = "The Haskell-Scriptable Editor"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-contrib" = callPackage @@ -207165,7 +207863,6 @@ self: { homepage = "https://github.com/yi-editor/yi-fuzzy-open"; description = "Fuzzy open plugin for Yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-gtk" = callPackage @@ -207216,7 +207913,6 @@ self: { homepage = "https://github.com/Fuuzetsu/yi-monokai"; description = "Monokai colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-rope" = callPackage @@ -207250,7 +207946,6 @@ self: { homepage = "https://github.com/yi-editor/yi-snippet"; description = "Snippet support for Yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-solarized" = callPackage @@ -207263,7 +207958,6 @@ self: { homepage = "https://github.com/NorfairKing/yi-solarized"; description = "Solarized colour theme for the Yi text editor"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-spolsky" = callPackage @@ -207277,7 +207971,6 @@ self: { homepage = "https://github.com/melrief/yi-spolsky"; description = "Spolsky colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-vty" = callPackage @@ -207583,7 +208276,7 @@ self: { ]; description = "Utilities for reading and writing Alteryx .yxdb files"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "z3" = callPackage diff --git a/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch b/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch deleted file mode 100644 index 231853fe51a..00000000000 --- a/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/hints/darwin.sh 2013-05-08 11:13:45.000000000 -0600 -+++ b/hints/darwin.sh 2013-05-08 11:15:04.000000000 -0600 -@@ -129,7 +129,7 @@ - - # Avoid Apple's cpp precompiler, better for extensions - if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then -- cppflags="${cppflags} -no-cpp-precomp" -+ #cppflags="${cppflags} -no-cpp-precomp" - - # This is necessary because perl's build system doesn't - # apply cppflags to cc compile lines as it should. diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix deleted file mode 100644 index 989d24950b9..00000000000 --- a/pkgs/development/interpreters/perl/5.16/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib, stdenv, fetchurl, enableThreading ? true }: - -let - - libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; - -in - -stdenv.mkDerivation rec { - name = "perl-5.16.3"; - - src = fetchurl { - url = "mirror://cpan/src/${name}.tar.gz"; - sha256 = "1dpd9lhc4723wmsn4dsn4m320qlqgyw28bvcbhnfqp2nl3f0ikv9"; - }; - - # TODO: Add a "dev" output containing the header files. - outputs = [ "out" "man" ]; - - setOutputFlags = false; - - patches = - [ # Do not look in /usr etc. for dependencies. - ./no-sys-dirs.patch - ./no-impure-config-time.patch - ./fixed-man-page-date.patch - ./no-date-in-perl-binary.patch - ] - ++ lib.optional stdenv.isSunOS ./ld-shared.patch - ++ lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ; - - # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd - # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them - # while at the same time erasing the PATH environment variable so it unconditionally - # fails. The code in question is guarded by a check for Mac OS, but the patch below - # doesn't have any runtime effect on other platforms. - postPatch = '' - pwd="$(type -P pwd)" - substituteInPlace dist/Cwd/Cwd.pm \ - --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'" - ''; - - # Build a thread-safe Perl with a dynamic libperls.o. We need the - # "installstyle" option to ensure that modules are put under - # $out/lib/perl5 - this is the general default, but because $out - # contains the string "perl", Configure would select $out/lib. - # Miniperl needs -lm. perl needs -lrt. - configureFlags = - [ "-de" - "-Uinstallusrbinperl" - "-Dinstallstyle=lib/perl5" - "-Duseshrplib" - "-Dlocincpth=${libc.dev or libc}/include" - "-Dloclibpth=${libc.out or libc}/lib" - ] - ++ lib.optional enableThreading "-Dusethreads"; - - configureScript = "${stdenv.shell} ./Configure"; - - dontAddPrefix = true; - - enableParallelBuilding = true; - - preConfigure = - '' - configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$man/share/man/man1 -Dman3dir=$man/share/man/man3" - - ${lib.optionalString stdenv.isArm '' - configureFlagsArray=(-Dldflags="-lm -lrt") - ''} - - ${lib.optionalString stdenv.isCygwin '' - cp cygwin/cygwin.c{,.bak} - echo "#define PERLIO_NOT_STDIO 0" > tmp - cat tmp cygwin/cygwin.c.bak > cygwin/cygwin.c - ''} - ''; - - preBuild = lib.optionalString (!(stdenv ? cc && stdenv.cc.nativeTools)) - '' - # Make Cwd work on NixOS (where we don't have a /bin/pwd). - substituteInPlace dist/Cwd/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" - ''; - - postInstall = - '' - # Remove dependency between "out" and "man" outputs. - rm $out/lib/perl5/*/*/.packlist - - # Remove dependencies on glibc.dev and coreutils. - substituteInPlace $out/lib/perl5/*/*/Config_heavy.pl \ - --replace ${stdenv.glibc.dev or "/blabla"} /no-such-path \ - --replace $man /no-such-path - ''; # */ - - setupHook = ./setup-hook.sh; - - passthru.libPrefix = "lib/perl5/site_perl"; -} diff --git a/pkgs/development/interpreters/perl/5.16/fixed-man-page-date.patch b/pkgs/development/interpreters/perl/5.16/fixed-man-page-date.patch deleted file mode 100644 index 79f9bc3658e..00000000000 --- a/pkgs/development/interpreters/perl/5.16/fixed-man-page-date.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cpan/podlators/lib/Pod/Man.pm 2014-04-07 06:25:23.730505243 +0200 -+++ b/cpan/podlators/lib/Pod/Man.pm 2014-04-07 06:26:40.816552603 +0200 -@@ -768,7 +768,7 @@ - } else { - ($name, $section) = $self->devise_title; - } -- my $date = $$self{date} || $self->devise_date; -+ my $date = "1970-01-01"; # Fixed date for NixOS, orig: $$self{date} || $self->devise_date; - $self->preamble ($name, $section, $date) - unless $self->bare_output or DEBUG > 9; - diff --git a/pkgs/development/interpreters/perl/5.16/ld-shared.patch b/pkgs/development/interpreters/perl/5.16/ld-shared.patch deleted file mode 100644 index be45230c8a7..00000000000 --- a/pkgs/development/interpreters/perl/5.16/ld-shared.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- perl-5.16.2/hints/solaris_2.sh.orig 2013-02-14 19:29:49.453988140 +0000 -+++ perl-5.16.2/hints/solaris_2.sh 2013-02-14 19:30:31.681631019 +0000 -@@ -568,7 +568,7 @@ - # ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" - # fi - ldflags="$ldflags -m64" -- lddlflags="$lddlflags -G -m64" -+ lddlflags="$lddlflags -shared -m64" - ;; - *) - getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" diff --git a/pkgs/development/interpreters/perl/5.16/no-date-in-perl-binary.patch b/pkgs/development/interpreters/perl/5.16/no-date-in-perl-binary.patch deleted file mode 100644 index 00ea47ae45f..00000000000 --- a/pkgs/development/interpreters/perl/5.16/no-date-in-perl-binary.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/perl.c 2014-04-07 07:58:01.402831615 +0200 -+++ b/perl.c 2014-04-07 07:59:38.556945298 +0200 -@@ -1754,7 +1754,7 @@ - PUSHs(Perl_newSVpvn_flags(aTHX_ non_bincompat_options, - sizeof(non_bincompat_options) - 1, SVs_TEMP)); - --#ifdef __DATE__ -+#if 0 - # ifdef __TIME__ - PUSHs(Perl_newSVpvn_flags(aTHX_ - STR_WITH_LEN("Compiled at " __DATE__ " " __TIME__), diff --git a/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch b/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch deleted file mode 100644 index 1382de70625..00000000000 --- a/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Configure 2014-04-05 20:21:33.714635700 +0200 -+++ b/Configure 2014-04-05 20:23:23.377441026 +0200 -@@ -3609,6 +3609,8 @@ - - : who configured the system - cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1` -+cf_time='Thu Jan 1 00:00:01 UTC 1970' -+ - case "$cf_by" in - "") - cf_by=`(logname) 2>/dev/null` diff --git a/pkgs/development/interpreters/perl/5.16/no-libutil.patch b/pkgs/development/interpreters/perl/5.16/no-libutil.patch deleted file mode 100644 index 9b749bccf32..00000000000 --- a/pkgs/development/interpreters/perl/5.16/no-libutil.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure ---- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200 -+++ perl-5.14.2/Configure 2012-02-16 17:24:50.779839039 +0100 -@@ -1368,7 +1368,7 @@ - : List of libraries we want. - : If anyone needs extra -lxxx, put those in a hint file. - libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun" --libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" -+libswanted="$libswanted m crypt sec c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. - glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` diff --git a/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch deleted file mode 100644 index 883b24889c3..00000000000 --- a/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch +++ /dev/null @@ -1,225 +0,0 @@ -diff --git a/Configure b/Configure -index fdbbf20..ba1fd07 100755 ---- a/Configure -+++ b/Configure -@@ -106,15 +106,7 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' ) 2>&1 >/dev/null ; then - fi - - : Proper PATH setting --paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' --paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" --paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" --paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" --paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" --paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" --paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" --paths="$paths /sbin /usr/sbin /usr/libexec" --paths="$paths /system/gnu_library/bin" -+paths='' - - for p in $paths - do -@@ -1323,8 +1315,7 @@ archobjs='' - archname='' - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. --locincpth="/usr/local/include /opt/local/include /usr/gnu/include" --locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" -+locincpth="" - : - : no include file wanted by default - inclwanted='' -@@ -1335,17 +1326,12 @@ DEBUGGING='' - - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 --xlibpth='/usr/lib/386 /lib/386' -+xlibpth='' - : Possible local library directories to search. --loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" --loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" -+loclibpth="" - - : general looking path for locating libraries --glibpth="/lib /usr/lib $xlibpth" --glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" --test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" --test -f /shlib/libc.so && glibpth="/shlib $glibpth" --test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" -+glibpth="" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special -@@ -1380,8 +1366,6 @@ libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun" - libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. --glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` --glibpth="/usr/shlib $glibpth" - : Do not use vfork unless overridden by a hint file. - usevfork=false - -@@ -2389,7 +2373,6 @@ uname - zip - " - pth=`echo $PATH | sed -e "s/$p_/ /g"` --pth="$pth /lib /usr/lib" - for file in $loclist; do - eval xxx=\$$file - case "$xxx" in -@@ -4708,7 +4691,7 @@ $rm -f testcpp.c testcpp.out - : Set private lib path - case "$plibpth" in - '') if ./mips; then -- plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib" -+ plibpth="$incpath/usr/lib" - fi;; - esac - case "$libpth" in -@@ -8354,13 +8337,8 @@ esac - echo " " - case "$sysman" in - '') -- syspath='/usr/share/man/man1 /usr/man/man1' -- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" -- syspath="$syspath /usr/man/u_man/man1" -- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" -- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" -- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" -- sysman=`./loc . /usr/man/man1 $syspath` -+ syspath='' -+ sysman='' - ;; - esac - if $test -d "$sysman"; then -@@ -19742,9 +19720,10 @@ $rm_try tryp - case "$full_ar" in - '') full_ar=$ar ;; - esac -+full_ar=ar - - : Store the full pathname to the sed program for use in the C program --full_sed=$sed -+full_sed=sed - - : see what type gids are declared as in the kernel - echo " " -diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL -index 439f254..2cdfdb0 100644 ---- a/ext/Errno/Errno_pm.PL -+++ b/ext/Errno/Errno_pm.PL -@@ -137,11 +137,7 @@ sub get_files { - if ($dep =~ /(\S+errno\.h)/) { - $file{$1} = 1; - } -- } elsif ($^O eq 'linux' && -- $Config{gccversion} ne '' && -- $Config{gccversion} !~ /intel/i -- # might be using, say, Intel's icc -- ) { -+ } elsif (0) { - # Some Linuxes have weird errno.hs which generate - # no #file or #line directives - my $linux_errno_h = -e '/usr/include/errno.h' ? -diff --git a/hints/freebsd.sh b/hints/freebsd.sh -index a67c0bb..0f07ca5 100644 ---- a/hints/freebsd.sh -+++ b/hints/freebsd.sh -@@ -119,21 +119,21 @@ case "$osvers" in - objformat=`/usr/bin/objformat` - if [ x$objformat = xaout ]; then - if [ -e /usr/lib/aout ]; then -- libpth="/usr/lib/aout /usr/local/lib /usr/lib" -- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" -+ libpth="" -+ glibpth="" - fi - lddlflags='-Bshareable' - else -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - fi - cccdlflags='-DPIC -fPIC' - ;; - *) -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - cccdlflags='-DPIC -fPIC' -diff --git a/hints/linux.sh b/hints/linux.sh -index 688c68d..c12f5f5 100644 ---- a/hints/linux.sh -+++ b/hints/linux.sh -@@ -60,17 +60,6 @@ libswanted="$*" - # Debian 4.0 puts ndbm in the -lgdbm_compat library. - libswanted="$libswanted gdbm_compat" - --# If you have glibc, then report the version for ./myconfig bug reporting. --# (Configure doesn't need to know the specific version since it just uses --# gcc to load the library for all tests.) --# We don't use __GLIBC__ and __GLIBC_MINOR__ because they --# are insufficiently precise to distinguish things like --# libc-2.0.6 and libc-2.0.7. --if test -L /lib/libc.so.6; then -- libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'` -- libc=/lib/$libc --fi -- - # Configure may fail to find lstat() since it's a static/inline - # function in . - d_lstat=define -@@ -154,24 +143,6 @@ case "$optimize" in - ;; - esac - --# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries --# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us --# where to look. We don't want gcc's own libraries, however, so we --# filter those out. --# This could be conditional on Unbuntu, but other distributions may --# follow suit, and this scheme seems to work even on rather old gcc's. --# This unconditionally uses gcc because even if the user is using another --# compiler, we still need to find the math library and friends, and I don't --# know how other compilers will cope with that situation. --# Morever, if the user has their own gcc earlier in $PATH than the system gcc, --# we don't want its libraries. So we try to prefer the system gcc --# Still, as an escape hatch, allow Configure command line overrides to --# plibpth to bypass this check. --if [ -x /usr/bin/gcc ] ; then -- gcc=/usr/bin/gcc --else -- gcc=gcc --fi - - case "$plibpth" in - '') plibpth=`LANG=C LC_ALL=C $gcc -print-search-dirs | grep libraries | -@@ -345,22 +316,6 @@ sparc*) - ;; - esac - --# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than --# true libraries. The scripts cause binding against static --# version of -lgdbm which is a bad idea. So if we have 'nm' --# make sure it can read the file --# NI-S 2003/08/07 --if [ -r /usr/lib/libndbm.so -a -x /usr/bin/nm ] ; then -- if /usr/bin/nm /usr/lib/libndbm.so >/dev/null 2>&1 ; then -- echo 'Your shared -lndbm seems to be a real library.' -- else -- echo 'Your shared -lndbm is not a real library.' -- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` -- shift -- libswanted="$*" -- fi --fi -- - - # This script UU/usethreads.cbu will get 'called-back' by Configure - # after it has prompted the user for whether to use threads. diff --git a/pkgs/development/interpreters/perl/5.16/setup-hook.sh b/pkgs/development/interpreters/perl/5.16/setup-hook.sh deleted file mode 100644 index a8656b8531d..00000000000 --- a/pkgs/development/interpreters/perl/5.16/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addPerlLibPath () { - addToSearchPath PERL5LIB $1/lib/perl5/site_perl -} - -envHooks+=(addPerlLibPath) diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix index d5c8efa5a61..eacf8620f7b 100644 --- a/pkgs/development/interpreters/perl/5.20/default.nix +++ b/pkgs/development/interpreters/perl/5.20/default.nix @@ -47,12 +47,14 @@ stdenv.mkDerivation rec { # while at the same time erasing the PATH environment variable so it unconditionally # fails. The code in question is guarded by a check for Mac OS, but the patch below # doesn't have any runtime effect on other platforms. - postPatch = stdenv.lib.optional (stdenv.isDarwin && !stdenv.cc.nativeLibc) '' + postPatch = stdenv.lib.optional stdenv.isDarwin '' pwd="$(type -P pwd)" substituteInPlace dist/PathTools/Cwd.pm \ - --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'" + --replace "/bin/pwd" "$pwd" ''; + sandboxProfile = stdenv.lib.sandbox.allow "ipc-sysv-sem"; + # Build a thread-safe Perl with a dynamic libperls.o. We need the # "installstyle" option to ensure that modules are put under # $out/lib/perl5 - this is the general default, but because $out @@ -67,6 +69,7 @@ stdenv.mkDerivation rec { "-Dlocincpth=${libc.dev or libc}/include" "-Dloclibpth=${libc.out or libc}/lib" ] + ++ optional stdenv.isSunOS "-Dcc=gcc" ++ optional enableThreading "-Dusethreads"; configureScript = "${stdenv.shell} ./Configure"; diff --git a/pkgs/development/interpreters/perl/5.20/ld-shared.patch b/pkgs/development/interpreters/perl/5.20/ld-shared.patch index be45230c8a7..9f92368df68 100644 --- a/pkgs/development/interpreters/perl/5.20/ld-shared.patch +++ b/pkgs/development/interpreters/perl/5.20/ld-shared.patch @@ -1,11 +1,24 @@ ---- perl-5.16.2/hints/solaris_2.sh.orig 2013-02-14 19:29:49.453988140 +0000 -+++ perl-5.16.2/hints/solaris_2.sh 2013-02-14 19:30:31.681631019 +0000 -@@ -568,7 +568,7 @@ - # ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" - # fi - ldflags="$ldflags -m64" -- lddlflags="$lddlflags -G -m64" -+ lddlflags="$lddlflags -shared -m64" +$NetBSD: patch-hints_solaris__2.sh,v 1.2 2015/10/27 09:10:44 jperkin Exp $ + +Redo PR pkg/44999. + +--- perl-5.20.2/hints/solaris_2.sh.orig 2015-05-13 20:19:29.000000000 +0000 ++++ perl-5.20.2/hints/solaris_2.sh +@@ -585,7 +585,7 @@ EOM + fi + fi + case "${cc:-cc} -v 2>/dev/null" in +- *gcc*) ++ *gcc*|clang*) + echo 'int main() { return 0; }' > try.c + case "`${cc:-cc} $ccflags -mcpu=v9 -m64 -S try.c 2>&1 | grep 'm64 is not supported by this configuration'`" in + *"m64 is not supported"*) +@@ -622,7 +622,7 @@ EOM + # use that with Solaris 11 and later, but keep + # the old behavior for older Solaris versions. + case "$osvers" in +- 2.?|2.10) lddlflags="$lddlflags -G -m64" ;; ++ 2.?|2.10) lddlflags="$lddlflags -shared -m64" ;; + *) lddlflags="$lddlflags -shared -m64" ;; + esac ;; - *) - getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" diff --git a/pkgs/development/interpreters/perl/5.22/default.nix b/pkgs/development/interpreters/perl/5.22/default.nix index 59afe27ba3c..99ae93c77b5 100644 --- a/pkgs/development/interpreters/perl/5.22/default.nix +++ b/pkgs/development/interpreters/perl/5.22/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { "-Dlocincpth=${libcInc}/include" "-Dloclibpth=${libcLib}/lib" ] + ++ optional stdenv.isSunOS "-Dcc=gcc" ++ optional enableThreading "-Dusethreads"; configureScript = "${stdenv.shell} ./Configure"; diff --git a/pkgs/development/interpreters/perl/5.22/ld-shared.patch b/pkgs/development/interpreters/perl/5.22/ld-shared.patch index be45230c8a7..140af9af40e 100644 --- a/pkgs/development/interpreters/perl/5.22/ld-shared.patch +++ b/pkgs/development/interpreters/perl/5.22/ld-shared.patch @@ -1,11 +1,24 @@ ---- perl-5.16.2/hints/solaris_2.sh.orig 2013-02-14 19:29:49.453988140 +0000 -+++ perl-5.16.2/hints/solaris_2.sh 2013-02-14 19:30:31.681631019 +0000 -@@ -568,7 +568,7 @@ - # ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" - # fi - ldflags="$ldflags -m64" -- lddlflags="$lddlflags -G -m64" -+ lddlflags="$lddlflags -shared -m64" +$NetBSD: patch-hints_solaris__2.sh,v 1.2 2015/10/27 09:10:44 jperkin Exp $ + +Redo PR pkg/44999. + +--- perl-5.22.0/hints/solaris_2.sh.orig 2015-05-13 20:19:29.000000000 +0000 ++++ perl-5.22.0/hints/solaris_2.sh +@@ -585,7 +585,7 @@ EOM + fi + fi + case "${cc:-cc} -v 2>/dev/null" in +- *gcc*) ++ *gcc*|clang*) + echo 'int main() { return 0; }' > try.c + case "`${cc:-cc} $ccflags -mcpu=v9 -m64 -S try.c 2>&1 | grep 'm64 is not supported by this configuration'`" in + *"m64 is not supported"*) +@@ -622,7 +622,7 @@ EOM + # use that with Solaris 11 and later, but keep + # the old behavior for older Solaris versions. + case "$osvers" in +- 2.?|2.10) lddlflags="$lddlflags -G -m64" ;; ++ 2.?|2.10) lddlflags="$lddlflags -shared -m64" ;; + *) lddlflags="$lddlflags -shared -m64" ;; + esac ;; - *) - getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 843e20708ad..bde21afea9d 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -7,7 +7,7 @@ let generic = - { version, sha256, url ? "http://www.php.net/distributions/php-${version}.tar.bz2" }: + { version, sha256 }: let php7 = lib.versionAtLeast version "7.0"; in @@ -21,6 +21,8 @@ let buildInputs = [ flex bison pkgconfig ]; + configureFlags = ["EXTENSION_DIR=$(out)/lib/php/extensions"]; + flags = { # much left to do here... @@ -274,7 +276,8 @@ let ''; src = fetchurl { - inherit url sha256; + url = "http://www.php.net/distributions/php-${version}.tar.bz2"; + inherit sha256; }; meta = with stdenv.lib; { @@ -305,10 +308,9 @@ in { sha256 = "1bnjpj5vjj2sx80z3x452vhk7bfdl8hbli61byhapgy1ch4z9rjg"; }; - php70 = lib.lowPrio (generic { - version = "7.0.0RC6"; - url = "https://downloads.php.net/~ab/php-7.0.0RC6.tar.bz2"; - sha256 = "0q8km0711chwj94d4mjrzdn999yw1vv4k695gj68pk791a6pcsyk"; - }); + php70 = generic { + version = "7.0.0"; + sha256 = "1spwxpfx0q95cfkwl1n8hpczgwy69x901v60ywwpl5ijd0q58am9"; + }; } diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index 25c4b8ec9ac..2b74aaa9441 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -7,7 +7,7 @@ assert zlibSupport -> zlib != null; let majorVersion = "4.0"; - version = "${majorVersion}.0"; + version = "${majorVersion}.1"; libPrefix = "pypy${majorVersion}"; pypy = stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2"; - sha256 = "008a7mxyw95asiz678v09p345v7pfchq6aa3x96fn7lkzhir67z7"; + sha256 = "1g7iipllgdfjgdkypsa1g2pzxgjw9agp40rh82hk31rsbak2hfbl"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper ] diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index f96327f3b91..1bcb0777e85 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -22,11 +22,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.10"; + version = "${majorVersion}.11"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw"; + sha256 = "0iiz844riiznsyhhyy962710pz228gmhv8qi3yk4w4jhmx2lqawn"; }; patches = @@ -97,7 +97,9 @@ let ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] ) ++ optional zlibSupport zlib - ++ optionals stdenv.isDarwin [ CF configd ]; + ++ optional stdenv.isDarwin CF; + + propagatedBuildInputs = optional stdenv.isDarwin configd; mkPaths = paths: { C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") paths); @@ -110,8 +112,8 @@ let name = "python-${version}"; pythonVersion = majorVersion; - inherit majorVersion version src patches buildInputs preConfigure - configureFlags; + inherit majorVersion version src patches buildInputs propagatedBuildInputs + preConfigure configureFlags; LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix index f17a6764202..4bc39f4c2b3 100644 --- a/pkgs/development/interpreters/python/3.5/default.nix +++ b/pkgs/development/interpreters/python/3.5/default.nix @@ -23,7 +23,7 @@ with stdenv.lib; let majorVersion = "3.5"; pythonVersion = majorVersion; - version = "${majorVersion}.0"; + version = "${majorVersion}.1"; fullVersion = "${version}"; buildInputs = filter (p: p != null) [ @@ -39,7 +39,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; - sha256 = "14dywb94mci0kqbsji9riyyq8kx0h9ljdjjgxnkfrvm56hbammyn"; + sha256 = "1j95yx32ggqx8jf13h3c8qfp34ixpyg8ipqcdjmn143d6q67rmf6"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index f757147b047..ba39965cb35 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -6,10 +6,13 @@ # Create a python executable that knows about additional packages. let recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; }; - env = (buildEnv { - name = "${python.name}-env"; + env = ( + let paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ]; + in buildEnv { + name = "${python.name}-env"; + inherit paths; inherit ignoreCollisions; postBuild = '' @@ -20,10 +23,16 @@ let fi mkdir -p "$out/bin" - cd "${python}/bin" - for prg in *; do - rm -f "$out/bin/$prg" - makeWrapper "${python}/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" + for path in ${stdenv.lib.concatStringsSep " " paths}; do + if [ -d "$path/bin" ]; then + cd "$path/bin" + for prg in *; do + if [ -f "$prg" ]; then + rm -f "$out/bin/$prg" + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" + fi + done + fi done '' + postBuild; diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix index 29fa3454d19..8032ce0145f 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix @@ -17,7 +17,7 @@ # This seperates "what to build" (the exact gem versions) from "how to build" # (to make gems behave if necessary). -{ lib, fetchurl, writeScript, ruby, libxml2, libxslt, python, stdenv, which +{ lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin @@ -105,6 +105,10 @@ in ''; }; + timfel-krb5-auth = attrs: { + buildInputs = [ kerberos ]; + }; + therubyracer = attrs: { buildFlags = [ "--with-v8-dir=${v8}" diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index a9bc2f775bb..e5e17e142f4 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -150,10 +150,10 @@ in { majorVersion = "2"; minorVersion = "0"; teenyVersion = "0"; - patchLevel = "645"; + patchLevel = "647"; sha256 = { - src = "1azl3kbqqw3jvwfcsy6fdb7vmwz5w73fwpq1y1gblz79zzzqx7sy"; - git = "14bnas1iif2shyaz4ylb0832x96y2mda52x0v0aglkvqmcz1cfxb"; + src = "1v2vbvydarcx5801gx9lc6gr6dfi0i7qbzwhsavjqbn79rdsz2n8"; + git = "186pf4q9xymzn4zn1sjppl1skrl5f0159ixz5cz8g72dmmynq3g3"; }; }; @@ -212,6 +212,17 @@ in { }; }; + ruby_2_1_7 = generic { + majorVersion = "2"; + minorVersion = "1"; + teenyVersion = "7"; + patchLevel = "0"; + sha256 = { + src = "10fxlqmpbq9407zgsx060q22yj4zq6c3czbf29h7xk1rmjb1b77m"; + git = "1fmbqd943akqjwsfbj9bg394ac46qmpavm8s0kv2w87rflrjcjfb"; + }; + }; + ruby_2_2_0 = generic { majorVersion = "2"; minorVersion = "2"; @@ -233,4 +244,15 @@ in { git = "08mw1ql2ghy483cp8xzzm78q17simn4l6phgm2gah7kjh9y3vbrn"; }; }; + + ruby_2_2_3 = generic { + majorVersion = "2"; + minorVersion = "2"; + teenyVersion = "3"; + patchLevel = "0"; + sha256 = { + src = "1kpdf7f8pw90n5bckpl2idzggk0nn0240ah92sj4a1w6k4pmyyfz"; + git = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx"; + }; + }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 0995e23890d..5f270dfe9c7 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -91,6 +91,17 @@ let self = rec { "${patchSet}/patches/ruby/2.1.6/railsexpress/08-funny-falcon-method-cache.patch" "${patchSet}/patches/ruby/2.1.6/railsexpress/09-heap-dump-support.patch" ]; + "2.1.7" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.1.7/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/03-display-more-detailed-stack-trace.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/05-funny-falcon-stc-density.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/06-funny-falcon-stc-pool-allocation.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/07-aman-opt-aset-aref-str.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/08-funny-falcon-method-cache.patch" + "${patchSet}/patches/ruby/2.1.7/railsexpress/09-heap-dump-support.patch" + ]; "2.2.0" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.2.0/railsexpress/01-zero-broken-tests.patch" "${patchSet}/patches/ruby/2.2.0/railsexpress/02-improve-gc-stats.patch" @@ -104,4 +115,9 @@ let self = rec { "${patchSet}/patches/ruby/2.2.2/railsexpress/03-display-more-detailed-stack-trace.patch" "${patchSet}/patches/ruby/2.2.2/railsexpress/04-backported-bugfixes-222.patch" ]; + "2.2.3" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.2.3/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch" + ]; }; in self diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 908b4b36372..f12402f0a0b 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "68be466019aa592e0321e894487f090aa459d602"; - sha256 = "12dw5shirnqbw037jg1sqk1aixyzl32w94y2nlan9by3cv7k3643"; + rev = "8ccf24490fec2218374734520c27d925078096de"; + sha256 = "88418484d2d3963975190836eafb2e28206e3e2bac9ee7c6208645bfe7428e2f"; } diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 70447d9f885..cfe86ce4e70 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { description = "A library to import various 3D model formats"; homepage = http://assimp.sourceforge.net/; license = licenses.bsd3; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; platfroms = platforms.linux; inherit version; }; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 5bf1ec78bef..c06b9355d30 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://acoustid.org/chromaprint"; description = "AcoustID audio fingerprinting library"; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 0e07519da11..a7a02521c69 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { ] ++ optional (precision != "double") "--enable-${precision}" # all x86_64 have sse2 - ++ optional stdenv.isx86_64 "--enable-sse2" + # however, not all float sizes fit + ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2" ++ optional stdenv.cc.isGNU "--enable-openmp"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index d7f40a3bf30..6ce234c3a64 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # internal pcre would only add <200kB, but it's relatively common configureFlags = [ "--with-pcre=system" ] ++ optional stdenv.isDarwin "--disable-compile-warnings" - ++ optional stdenv.isSunOS "--disable-modular-tests"; + ++ optional stdenv.isSunOS ["--disable-modular-tests" "--with-libiconv"]; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" + optionalString stdenv.isSunOS " -DBSD_COMP"; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index dbea97a0271..af6c91499ac 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,21 +1,16 @@ { fetchurl, fetchpatch, stdenv }: stdenv.mkDerivation rec { - name = "gsl-1.16"; + name = "gsl-2.1"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; + sha256 = "0rhcia9jhr3p1f1wybwyllwqfs9bggz99i3mi5lpyqcpff1hdbar"; }; patches = [ # ToDo: there might be more impurities than FMA support check ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html - (fetchpatch { - name = "bug-39055.patch"; - url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d"; - sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8"; - }) ]; doCheck = true; diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix new file mode 100644 index 00000000000..dbea97a0271 --- /dev/null +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -0,0 +1,39 @@ +{ fetchurl, fetchpatch, stdenv }: + +stdenv.mkDerivation rec { + name = "gsl-1.16"; + + src = fetchurl { + url = "mirror://gnu/gsl/${name}.tar.gz"; + sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; + }; + + patches = [ + # ToDo: there might be more impurities than FMA support check + ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html + (fetchpatch { + name = "bug-39055.patch"; + url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d"; + sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8"; + }) + ]; + + doCheck = true; + + meta = { + description = "The GNU Scientific Library, a large numerical library"; + homepage = http://www.gnu.org/software/gsl/; + license = stdenv.lib.licenses.gpl3Plus; + + longDescription = '' + The GNU Scientific Library (GSL) is a numerical library for C + and C++ programmers. It is free software under the GNU General + Public License. + + The library provides a wide range of mathematical routines such + as random number generators, special functions and least-squares + fitting. There are over 1000 functions in total with an + extensive test suite. + ''; + }; +} diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index b4c962d9e54..dd9ddc7ec9b 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -14,7 +14,7 @@ let inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.4.5"; + name = "gst-plugins-bad-1.6.1"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "0g4q9yqq71z32pz7zj54wigkcf438a2mcv5kvvwp4gb8a1rasbqm"; + sha256 = "0rjla9zcal9b5ynagq7cscjs53qrd9bafjkjssrp8s2z2apsjxp1"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index f959da4045e..9192feb1c0c 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.4.5"; + name = "gst-plugins-base-1.6.1"; meta = { description = "Base plugins and helper libraries"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "07ampnfa6p41s0lhia62l9h8bdx3c7vxvdz93pbx64m3wycq3gbp"; + sha256 = "18sbyjcp281zb3bsqji3pglsdsxi0s6ai7rx90sx8cpflkxdqcwm"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 5dbcb1cee4b..98cfa98bfe1 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.4.5"; + name = "gstreamer-1.6.1"; meta = { description = "Open source multimedia framework"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "1bmhbhak6i5wmmb6w86jyyv8lax4gdq983la4lk4a0krz6kim020"; + sha256 = "172w1bpnkn6mm1wi37n03apdbb6cdkykhzjf1vfxchcd7hhkyflp"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 07ce30d6319..7d2b4caf2a5 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -15,10 +15,14 @@ rec { gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; }; + # TODO: gnonlin is deprecated in gst-editing-services, better switch to nle + # (Non Linear Engine). gst-editing-services = callPackage ./ges { inherit gnonlin; }; gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; libva = libva-full; # looks also for libva-{x11,wayland} }; + + gst-validate = callPackage ./validate { inherit gst-plugins-base; }; } diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 47b09e95e6e..96dc42c3cb1 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, pkgconfig, python, gobjectIntrospection -, gnonlin, libxml2 +, gnonlin, libxml2, flex, perl }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.4.0"; + name = "gstreamer-editing-services-1.6.1"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "1cwbh244an6zsxsscvg6xjnb34ylci34g9zx59xjbv5wnw7vj86c"; + sha256 = "1lkvkrsipn35341hwwkhwn44n90y49sjwra1r5pazbjgn1yykxzm"; }; - nativeBuildInputs = [ pkgconfig python gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ]; propagatedBuildInputs = [ gnonlin libxml2 ]; } diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index c999c65229e..8afbfd4ff54 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -10,7 +10,7 @@ let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.4.5"; + name = "gst-plugins-good-1.6.1"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "0hg6qzdpib9nwn3hdxv0d4rvivi1c4bmxsq2a9hqmamwyzrvbcbr"; + sha256 = "0darc3058kbnql3mnlpizl0sq0hhli7vkm0rpqb7nywz14abim46"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index bcc05e44103..aeefd667b34 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -3,10 +3,13 @@ , withSystemLibav ? true, libav ? null }: +# Note that since gst-libav-1.6, libav is actually ffmpeg. See +# http://gstreamer.freedesktop.org/releases/1.6/ for more info. + assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.4.5"; + name = "gst-libav-1.6.1"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -17,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "1g7vg9amh3cc3nmc415h6g2rqxqi4wgwqi08hxfbpwq48ri64p30"; + sha256 = "1a9pc7zp5rg0cvpx8gqkr21w73i6p9xa505a34day9f8p3lfim94"; }; configureFlags = stdenv.lib.optionalString withSystemLibav diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index c13beb4d5f7..b014446c7c4 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.4.5"; + name = "gst-plugins-ugly-1.6.1"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "0rwhljn3f8mp2pfchzfcx4pvps1546dndw9mr56lz50qyqffimaw"; + sha256 = "0mvasl1pwq70w2kmrkcrg77kggl5q7jqybi7fkvy3vr28c7gkhqc"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 93c9b9a59b9..bf061b4125b 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2"; - sha256 = "1f3ji0h0x49w4wpqc0widraa9kvq0b47idrdxq4znjb8c1bwd97n"; + sha256 = "1cv7zlz5wj6b3acv0pr5cq5wqzd5vcs1lrrlvyl9wrzcnzz8mz1n"; }; nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix new file mode 100644 index 00000000000..c88cf489732 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base +, python, gobjectIntrospection +}: + +stdenv.mkDerivation rec { + name = "gst-validate-1.6.0"; + + meta = { + description = "Integration testing infrastructure for the GStreamer framework"; + homepage = "http://gstreamer.freedesktop.org"; + license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; + sha256 = "1vmg5mh068zrvhgrjsbnb7y4k632akyhm8ql0g196cinnp3zibiv"; + }; + + nativeBuildInputs = [ + pkgconfig gobjectIntrospection + ]; + + buildInputs = [ + python + ]; + + propagatedBuildInputs = [ gstreamer gst-plugins-base ]; + + enableParallelBuilding = true; +} + diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index b060498d40a..c6ead673982 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -1,20 +1,23 @@ { stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost, libnova -, libjpeg, gsl }: +, curl, libjpeg, gsl }: stdenv.mkDerivation { - name = "indilib-1.0.0"; + name = "indilib-1.1.0"; src = fetchurl { - url = mirror://sourceforge/indi/libindi_1.0.0.tar.gz; - sha256 = "0f66jykpjk8mv50lc3rywbqj9mqr4p2n1igfb1222h5fs83c1jhm"; + url = mirror://sourceforge/indi/libindi_1.1.0.tar.gz; + sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w"; }; patches = [ ./udev-dir.patch ] ; - propagatedBuildInputs = [ cmake cfitsio libusb zlib boost + buildInputs = [ curl cmake cfitsio libusb zlib boost libnova libjpeg gsl ]; meta = { - homepage = http://indi.sf.net; + homepage = http://www.indilib.org/; + license = stdenv.lib.licenses.lgpl2Plus; + description = "Implementaion of the INDI protocol for POSIX operating systems"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix new file mode 100644 index 00000000000..8c86a46401d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.16/breeze-icons.nix @@ -0,0 +1,8 @@ +{ kdeFramework +, extra-cmake-modules +}: + +kdeFramework { + name = "breeze-icons"; + nativeBuildInputs = [ extra-cmake-modules ]; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.16/default.nix b/pkgs/development/libraries/kde-frameworks-5.16/default.nix index 208a437c51e..6c2889aa598 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/default.nix @@ -40,6 +40,7 @@ let attica = callPackage ./attica.nix {}; baloo = callPackage ./baloo.nix {}; bluez-qt = callPackage ./bluez-qt.nix {}; + breeze-icons = callPackage ./breeze-icons.nix {}; extra-cmake-modules = callPackage ./extra-cmake-modules {}; frameworkintegration = callPackage ./frameworkintegration.nix {}; kactivities = callPackage ./kactivities.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix index 43c21bb51ef..f3a1db7bd48 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix @@ -1,12 +1,15 @@ -{ kdeFramework, lib +{ kdeFramework, lib, makeQtWrapper , extra-cmake-modules , shared_mime_info }: kdeFramework { name = "kcoreaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; buildInputs = [ shared_mime_info ]; + postInstall = '' + wrapQtProgram "$out/bin/desktoptojson" + ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix index 28df2415320..cbc114ccca0 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib +{ kdeFramework, lib, makeQtWrapper , extra-cmake-modules , kcompletion , kconfig @@ -18,13 +18,16 @@ kdeFramework { name = "kdesignerplugin"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui ]; propagatedBuildInputs = [ kio sonnet ]; + postInstall = '' + wrapQtProgram "$out/bin/kgendesignerplugin" + ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix index 02b516afedc..eb24403169d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix @@ -1,12 +1,16 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets, ki18n +{ kdeFramework, lib, makeQtWrapper +, extra-cmake-modules, kconfigwidgets, ki18n , kitemviews, qtsvg }: kdeFramework { name = "kiconthemes"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; buildInputs = [ kconfigwidgets kitemviews qtsvg ]; propagatedBuildInputs = [ ki18n ]; + postInstall = '' + wrapQtProgram "$out/bin/kiconfinder5" + ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kio.nix b/pkgs/development/libraries/kde-frameworks-5.16/kio.nix index 0789828d812..199565e2418 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kio.nix @@ -23,6 +23,7 @@ kdeFramework { wrapQtProgram "$out/bin/ktelnetservice5" wrapQtProgram "$out/bin/ktrash5" wrapQtProgram "$out/bin/kmailservice5" + wrapQtProgram "$out/bin/protocoltojson" ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index c59fb39eb5a..f2f31963d67 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.3.0"; + name = "libassuan-2.4.2"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "0lh4698pgb2wjrrrbdk14llizad5l74f8pdbg4ma4zq4fbsrkjc7"; + sha256 = "086bbcdnvs48qq5g4iac7dpk76j0q3jrp16mchdvyx0b720xq1mv"; }; outputs = [ "dev" "out" "info" ]; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 8c5c8bef351..09427e2788a 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = http://musicbrainz.org/doc/libdiscid; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 686b444e430..623256bb6b7 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { # FIXME: Eventually make Gettext a build input on all platforms. configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-nls"; + buildInputs = [ gettext ]; + meta = { description = "ELF object file access library"; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 98185da168a..b0b537ddb17 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, python, findutils }: +{ stdenv, fetchurl, autoreconfHook, openssl, python, findutils }: let version = "2.0.22"; in stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { outputBin = "dev"; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ python ] ++ stdenv.lib.optional stdenv.isCygwin findutils; + buildInputs = [ openssl python ] ++ stdenv.lib.optional stdenv.isCygwin findutils; meta = with stdenv.lib; { description = "Event notification library"; diff --git a/pkgs/development/libraries/libevhtp/default.nix b/pkgs/development/libraries/libevhtp/default.nix index f909d6d8ff2..4765f0b7d9a 100644 --- a/pkgs/development/libraries/libevhtp/default.nix +++ b/pkgs/development/libraries/libevhtp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libevhtp-${version}"; - version = "1.2.10"; + version = "1.2.11"; src = fetchFromGitHub { owner = "ellzey"; repo = "libevhtp"; rev = version; - sha256 = "0z5cxa65zp89vkaj286gp6fpmc5fylr8bmd17g3j1rgc42nysm6a"; + sha256 = "1rlxdp8w4alcy5ryr7pmw5wi6hv7d64885wwbk1zxhvi64s4x4rg"; }; buildInputs = [ cmake openssl libevent ]; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index b9ae43a7c8b..e430dc967f8 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, glib, pkgconfig, perl, intltool }: +{ stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection }: stdenv.mkDerivation { - name = "libgtop-2.28.5"; + name = "libgtop-2.32.0"; src = fetchurl { - url = mirror://gnome/sources/libgtop/2.28/libgtop-2.28.5.tar.xz; - sha256 = "0hik1aklcn79irgw1xf7d6cfkw8hzmy46r9jyfhp32aawisc24n8"; + url = mirror://gnome/sources/libgtop/2.32/libgtop-2.32.0.tar.xz; + sha256 = "13hpml2vfm23816qggr5fvxj75ndb1dq4rgmi7ik6azj69ij8hw4"; }; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig perl intltool ]; + nativeBuildInputs = [ pkgconfig perl intltool gobjectIntrospection ]; } diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 11300f6151a..1aa4b8ad045 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://xiph.org/ogg/; license = licenses.bsd3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 95370b92111..4058943b6f3 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -5,10 +5,10 @@ let version = "${libVersion}-list-${listVersion}"; - listVersion = "2015-11-13"; + listVersion = "2015-12-03"; listSources = fetchFromGitHub { - sha256 = "1l60mrrhrafpiga56h3j2x3vsx2607lih2vmjx1gx16g2j89gbmq"; - rev = "edf1735751c24e736018dc51f1be7dea686b6304"; + sha256 = "1192g8x57pm9r3va1xfvni0jczg8wy5kka6vcwnvc3lk4314l2na"; + rev = "6c137ba598d61f2ea299632bb447608a9fc25d0f"; repo = "list"; owner = "publicsuffix"; }; diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index d4b602c9017..8fa781c4fda 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.five-ten-sg.com/libpst/; description = "A library to read PST (MS Outlook Personal Folders) files"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = [maintainers.tohl]; }; } diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index c5a7a7202e2..2e3df7cf9e0 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "librsync-${version}"; version = "1.0.0"; - + src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared"; + CFLAGS = "-std=gnu89"; + crossAttrs = { dontStrip = true; }; diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix new file mode 100644 index 00000000000..b9c4a0a36d4 --- /dev/null +++ b/pkgs/development/libraries/libstroke/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, automake, autoconf, x11}: + +stdenv.mkDerivation { + name = "libstroke-0.5.1"; + + src = fetchurl { + url = http://etla.net/libstroke/libstroke-0.5.1.tar.gz; + sha256 = "0da9f5fde66feaf6697ba069baced8fb3772c3ddc609f39861f92788f5c7772d"; + }; + + buildInputs = [ automake autoconf x11 ]; + + # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it. + # Also, modern automake doesn't like things and returns error code 63. But it generates the file. + preConfigure = '' + rm config.sub + autoconf + automake -a || true + ''; + + meta = { + description = "libstroke, a library for simple gesture recognition"; + homepage = http://etla.net/libstroke/; + license = stdenv.lib.licenses.gpl2; + + longDescription = + '' libstroke, last updated in 2001, still successfully provides a basic + gesture recognition engine based around a 3x3 grid. It's simple and + easy to work with, and notably used by FVWM. + ''; + + }; +} diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index f1715805141..0022799c88f 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://xiph.org/vorbis/; license = licenses.bsd3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix new file mode 100644 index 00000000000..4f0311f9d92 --- /dev/null +++ b/pkgs/development/libraries/mapnik/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl +, boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff +, libwebp, libxml2, proj, python, scons, sqlite, zlib +}: + +stdenv.mkDerivation rec { + name = "mapnik-${version}"; + version = "3.0.9"; + + src = fetchurl { + url = "https://mapnik.s3.amazonaws.com/dist/v${version}/mapnik-v${version}.tar.bz2"; + sha256 = "1nnkamwq4vcg4q2lbqn7cn8sannxszzjxcxsllksby055d9nfgrs"; + }; + + nativeBuildInputs = [ python scons ]; + + buildInputs = + [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff + libwebp libxml2 proj python sqlite zlib + ]; + + configurePhase = '' + scons configure PREFIX="$out" + ''; + + buildPhase = false; + + installPhase = '' + mkdir -p "$out" + scons install + ''; + + meta = with stdenv.lib; { + description = "An open source toolkit for developing mapping applications"; + homepage = http://mapnik.org; + maintainers = with maintainers; [ hrdinka ]; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index c17b762cab2..8a964af01c8 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gmp ]; configureFlags = + stdenv.lib.optional stdenv.isSunOS "--disable-thread-safe" ++ stdenv.lib.optional stdenv.is64bit "--with-pic"; doCheck = true; diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index ef673d115ac..4d9e49a54d9 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "0.4-beta"; + version = "0.8-beta"; name = "nanomsg-${version}"; src = fetchurl { - url = "http://download.nanomsg.org/${name}.tar.gz"; - sha256 = "0bgjj1x1a991pckw4nm5bkmbibjsf74y0ns23fpk4jj5dwarhm3d"; + url = "https://github.com/nanomsg/nanomsg/releases/download/0.8-beta/${name}.tar.gz"; + sha256 = "0ix9yd6shqmgm1mxig8ww2jpbgg2n5dms0wrv1q81ihclml0rkkm"; }; installPhase = '' diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index efaf0fec215..41d609db478 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -30,6 +30,9 @@ stdenv.mkDerivation rec { "--enable-symlinks" ] ++ lib.optional unicode "--enable-widec"; + # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: + CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; + buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; preConfigure = '' @@ -42,6 +45,12 @@ stdenv.mkDerivation rec { "--mandir=$man/share/man" "--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR" ) + '' + + lib.optionalString stdenv.isSunOS '' + sed -i -e '/-D__EXTENSIONS__/ s/-D_XOPEN_SOURCE=\$cf_XOPEN_SOURCE//' \ + -e '/CPPFLAGS="$CPPFLAGS/s/ -D_XOPEN_SOURCE_EXTENDED//' \ + configure + CFLAGS=-D_XOPEN_SOURCE_EXTENDED '' + lib.optionalString stdenv.isCygwin '' sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure ''; diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix index 9175da0bca4..0c9c62dfb92 100644 --- a/pkgs/development/libraries/openssl/1.0.2.x.nix +++ b/pkgs/development/libraries/openssl/1.0.2.x.nix @@ -8,14 +8,14 @@ let stdenv.cross; in stdenv.mkDerivation rec { - name = "openssl-1.0.2d"; + name = "openssl-1.0.2e"; src = fetchurl { urls = [ "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha1 = "d01d17b44663e8ffa6a33a5a30053779d9593c3d"; + sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72"; }; patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2df2847e898..1d898df6e02 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -8,14 +8,14 @@ let stdenv.cross; in stdenv.mkDerivation rec { - name = "openssl-1.0.1p"; + name = "openssl-1.0.1q"; src = fetchurl { urls = [ "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha1 = "9d1977cc89242cd11471269ece2ed4650947c046"; + sha256 = "1dvz0hx7fjxag06b51pawy154y6d2xajm5rwxmfnlq7ax628nrdk"; }; patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix index 2c6e40eaf73..9866c0a67ce 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon qtbase ]; + NIX_CFLAGS_COMPILE = [ + # This flag should be picked up through pkgconfig, but it isn't. + "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" + ]; + nativeBuildInputs = [ cmake pkgconfig ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix index feaa743aca7..08bce2b68eb 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix @@ -15,7 +15,14 @@ stdenv.mkDerivation rec { sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10"; }; - buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon_qt5 qt5.base ]; + buildInputs = with gst_all_1; [ + gstreamer gst-plugins-base phonon_qt5 qt5.base + ]; + + NIX_CFLAGS_COMPILE = [ + # This flag should be picked up through pkgconfig, but it isn't. + "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" + ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 07b1e8877fb..376c80962cd 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, gfortran }: - +let + version = "3.5.0"; +in stdenv.mkDerivation rec { - name = "blas-3.5.0"; + name = "blas-${version}"; src = fetchurl { url = "http://www.netlib.org/blas/${name}.tgz"; sha256 = "096a3apnh899abjymjjg8m34hncagkzp9qxw08cms98g71fpfzgg"; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { echo >>make.inc "ARCH = gfortran" echo >>make.inc "ARCHFLAGS = -shared -o" echo >>make.inc "RANLIB = echo" - echo >>make.inc "BLASLIB = libblas.so.3.0.3" + echo >>make.inc "BLASLIB = libblas.so.${version}" ''; buildPhase = '' @@ -39,9 +41,9 @@ stdenv.mkDerivation rec { (stdenv.lib.optionalString stdenv.isFreeBSD "mkdir -p $out/lib ;") + '' install ${dashD} -m755 libblas.a "$out/lib/libblas.a" - install ${dashD} -m755 libblas.so.3.0.3 "$out/lib/libblas.so.3.0.3" - ln -s libblas.so.3.0.3 "$out/lib/libblas.so.3" - ln -s libblas.so.3.0.3 "$out/lib/libblas.so" + install ${dashD} -m755 libblas.so.${version} "$out/lib/libblas.so.${version}" + ln -s libblas.so.${version} "$out/lib/libblas.so.3" + ln -s libblas.so.${version} "$out/lib/libblas.so" ''; meta = { diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index cb34edb4762..58e5d0864d3 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "tbb-4.2-u5"; + name = "tbb-4.4-u2"; src = fetchurl { - url = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb42_20140601oss_src.tgz"; - sha256 = "1zjh81hvfxvk1v1li27w1nm3bp6kqv913lxfb2pqa134dibw2pp7"; + url = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20151115oss_src.tgz"; + sha256 = "1fvprkjdxj7529hr1qkzkxkk18mx6zllrpiwglq4k3y1hpyc9m9x"; }; checkTarget = "test"; diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index ceb028e0712..898c2b67fd6 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, ocaml, findlib }: -let version = "1.1"; in +let version = "3.0"; in stdenv.mkDerivation { name = "ocaml-dolog-${version}"; src = fetchzip { url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz"; - sha256 = "093lmprb1v2ran3pyymcdq80xnsgdz7h76g764xsy97dba5ik40n"; + sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix index 0554b67f1d7..bac558cc50a 100644 --- a/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -1,25 +1,27 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchzip, ocaml, findlib }: let pname = "easy-format"; - version = "1.0.2"; - webpage = "http://mjambon.com/${pname}.html"; + version = "1.1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; - src = fetchurl { - url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; - sha256 = "07wlgprqvk92z0p2xzbnvh312ca6gvhy3xc6hxlqfawnnnin7rzi"; + src = fetchzip { + url = "https://github.com/mjambon/${pname}/archive/v${version}.tar.gz"; + sha256 = "084blm13k5lakl5wq3qfxbd0l0bwblvk928v75xcxpaqwv426w5a"; }; buildInputs = [ ocaml findlib ]; createFindlibDestdir = true; + doCheck = true; + checkTarget = "test"; + meta = with stdenv.lib; { description = "A high-level and functional interface to the Format module of the OCaml standard library"; - homepage = "${webpage}"; + homepage = "http://mjambon.com/${pname}.html"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 121f333f543..67df949ac8b 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -4,7 +4,7 @@ let inherit (stdenv.lib) getVersion versionAtLeast; pname = "uucp"; - version = "0.9.1"; + version = "1.1.0"; webpage = "http://erratique.ch/software/${pname}"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0mbrh5fi2b9a4bl71p7hfs0wwbw023ww44n20x0syxn806wjlrkm"; + sha256 = "1vm5f2ppdrnk19j0ppjiqz56qf5bzyk26gs0lz071s7iblk459jz"; }; buildInputs = [ ocaml findlib opam ]; diff --git a/pkgs/development/ocaml-modules/why3/default.nix b/pkgs/development/ocaml-modules/why3/default.nix new file mode 100644 index 00000000000..3ce0f8bdfac --- /dev/null +++ b/pkgs/development/ocaml-modules/why3/default.nix @@ -0,0 +1,21 @@ +{ stdenv, ocaml, findlib, zarith, menhir, why3 }: + +let ocaml-version = stdenv.lib.getVersion ocaml; in + +assert stdenv.lib.versionAtLeast ocaml-version "4.01"; + +stdenv.mkDerivation { + name = "ocaml-${why3.name}"; + + inherit (why3) src; + + buildInputs = [ ocaml findlib zarith menhir ]; + + installTargets = "install-lib"; + + meta = { + inherit (why3.meta) license homepage; + platforms = ocaml.meta.platforms; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 0b40b68a7e8..34bcc08275b 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -1,16 +1,15 @@ -{stdenv, fetchurl, ocaml, findlib, cppo, easy-format, biniou}: +{ stdenv, fetchzip, ocaml, findlib, cppo, easy-format, biniou }: let pname = "yojson"; - version = "1.1.8"; - webpage = "http://mjambon.com/${pname}.html"; + version = "1.2.3"; in stdenv.mkDerivation { name = "ocaml-${pname}-${version}"; - src = fetchurl { - url = "http://mjambon.com/releases/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0ayx17dimnpavdfyq6dk9xv2x1fx69by85vc6vl3nqxjkcv5d2rv"; + src = fetchzip { + url = "https://github.com/mjambon/${pname}/archive/v${version}.tar.gz"; + sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl"; }; buildInputs = [ ocaml findlib ]; @@ -27,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An optimized parsing and printing library for the JSON format"; - homepage = "${webpage}"; + homepage = "http://mjambon.com/${pname}.html"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms; diff --git a/pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch b/pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch new file mode 100644 index 00000000000..b080771b17d --- /dev/null +++ b/pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch @@ -0,0 +1,95 @@ +From 5de3b12e4eecd4efb47e1896dc1d5432bc532568 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Tue, 3 Nov 2015 15:22:54 +0100 +Subject: [PATCH] Adjust view-dependency tests to work on newer libsqlite +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Port upstream fix for SQLite-3.9.0 to 0.082820: + +commit 26c663f123032941cb3f61d6cd11869b86716d6d +Author: Peter Rabbitson +Date: Tue Nov 3 14:35:35 2015 +0100 + + Adjust view-dependency tests to work on newer libsqlite + + The test and mechanism behind it is largely useless in these cases, but old + sqlite installations will lurk around for ever, so keep the check while moving + it to xt/ + +The original fix makes the tests author's tests, so they are not run +at all. Let's keep the test running by default until upstream releases +new version. + +CPAN RT#107852 + +Signed-off-by: Petr Písař +--- + t/105view_deps.t | 29 ++++++++++++++++------------- + 1 file changed, 16 insertions(+), 13 deletions(-) + +diff --git a/t/105view_deps.t b/t/105view_deps.t +index 21aa92b..39bb632 100644 +--- a/t/105view_deps.t ++++ b/t/105view_deps.t +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++use DBIx::Class::Optional::Dependencies -skip_all_without => 'deploy'; + + use strict; + use warnings; +@@ -11,15 +11,6 @@ use DBICTest; + use ViewDeps; + use ViewDepsBad; + +-BEGIN { +- require DBIx::Class; +- plan skip_all => 'Test needs ' . +- DBIx::Class::Optional::Dependencies->req_missing_for('deploy') +- unless DBIx::Class::Optional::Dependencies->req_ok_for('deploy'); +-} +- +-use_ok('DBIx::Class::ResultSource::View'); +- + #################### SANITY + + my $view = DBIx::Class::ResultSource::View->new; +@@ -73,10 +64,16 @@ can_ok( $view, $_ ) for qw/new from deploy_depends_on/; + = ViewDepsBad->connect( DBICTest->_database ( quote_char => '"') ); + ok( $schema2, 'Connected to ViewDepsBad schema OK' ); + ++ my $lazy_view_validity = !( ++ $schema2->storage->_server_info->{normalized_dbms_version} ++ < ++ 3.009 ++ ); ++ + #################### DEPLOY2 + + warnings_exist { $schema2->deploy } +- [qr/no such table: main.aba_name_artists/], ++ [ $lazy_view_validity ? () : qr/no such table: main.aba_name_artists/ ], + "Deploying the bad schema produces a warning: aba_name_artists was not created."; + + #################### DOES ORDERING WORK 2? +@@ -106,9 +103,15 @@ can_ok( $view, $_ ) for qw/new from deploy_depends_on/; + } grep { !/AbaNameArtistsAnd2010CDsWithManyTracks/ } + @{ [ $schema2->sources ] }; + ++ $schema2->storage->dbh->do(q( DROP VIEW "aba_name_artists" )) ++ if $lazy_view_validity; ++ + throws_ok { $schema2->resultset('AbaNameArtistsAnd2010CDsWithManyTracks')->next } +- qr/no such table: aba_name_artists_and_2010_cds_with_many_tracks/, +- "Query on AbaNameArtistsAnd2010CDsWithManyTracks throws, because the table does not exist" ++ qr/no such table: (?:main\.)?aba_name_artists/, ++ sprintf( ++ "Query on AbaNameArtistsAnd2010CDsWithManyTracks throws, because the%s view does not exist", ++ $lazy_view_validity ? ' underlying' : '' ++ ) + ; + } + +-- +2.4.3 diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 0b7069ab67d..240fe638834 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -36,7 +36,7 @@ in buildPythonPackage rec { six ]; - # Tests are in . + # Tests are in nixos/tests/blivet.nix. doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix deleted file mode 100644 index bd5b953f048..00000000000 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, python, db}: - -stdenv.mkDerivation rec { - name = "bsddb3-6.1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz"; - sha256 = "05gx3rfgq1qrgdmpd6hri6y5l97bh1wczvb6x853jchwi7in6cdi"; - }; - buildInputs = [python]; - buildPhase = "true"; - installPhase = "python ./setup.py install --prefix=$out --berkeley-db=${db}"; -} diff --git a/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch b/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch new file mode 100644 index 00000000000..7757691bfca --- /dev/null +++ b/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch @@ -0,0 +1,24 @@ +diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py +--- a/django/contrib/gis/gdal/libgdal.py ++++ b/django/contrib/gis/gdal/libgdal.py +@@ -17,7 +17,7 @@ try: + lib_path = settings.GDAL_LIBRARY_PATH + except (AttributeError, EnvironmentError, + ImportError, ImproperlyConfigured): +- lib_path = None ++ lib_path = "@gdal@/lib/libgdal.so" + + if lib_path: + lib_names = None +diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py +--- a/django/contrib/gis/geos/libgeos.py ++++ b/django/contrib/gis/geos/libgeos.py +@@ -23,7 +23,7 @@ try: + lib_path = settings.GEOS_LIBRARY_PATH + except (AttributeError, EnvironmentError, + ImportError, ImproperlyConfigured): +- lib_path = None ++ lib_path = "@geos@/lib/libgeos_c.so" + + # Setting the appropriate names for the GEOS-C library. + if lib_path: diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix deleted file mode 100644 index a07eceb45aa..00000000000 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, buildPythonPackage, openssl }: - -buildPythonPackage rec { - name = "ecdsa-0.11"; - - src = fetchurl { - url = "https://pypi.python.org/packages/source/e/ecdsa/${name}.tar.gz"; - sha256 = "134mbq5xsvx54k9xm7zrizvh9imxmcz1w9mhyfr99p4i7wcnqfwf"; - }; - - buildInputs = [ openssl ]; - - meta = { - homepage = "http://github.com/warner/python-ecdsa"; - description = "Pure-python ECDSA signature/verification"; - license = stdenv.lib.licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/irclib/default.nix b/pkgs/development/python-modules/irclib/default.nix deleted file mode 100644 index 38ae5949229..00000000000 --- a/pkgs/development/python-modules/irclib/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ buildPythonPackage, fetchurl }: - -buildPythonPackage rec { - name = "irclib-${version}"; - version = "0.4.8"; - - src = fetchurl { - url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz"; - sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1"; - }; - - patches = [(fetchurl { - url = "http://trac.uwc.ac.za/trac/python_tools/browser/xmpp/resources/irc-transport/irclib.py.diff?rev=387&format=raw"; - name = "irclib.py.diff"; - sha256 = "5fb8d95d6c95c93eaa400b38447c63e7a176b9502bc49b2f9b788c9905f4ec5e"; - })]; - - patchFlags = "irclib.py"; - - meta = { - description = "Python IRC library"; - }; -} diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix deleted file mode 100644 index a901ce774c5..00000000000 --- a/pkgs/development/python-modules/mygpoclient/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, python, buildPythonPackage, pythonPackages }: - -buildPythonPackage rec { - name = "mygpoclient-1.7"; - - src = fetchurl { - url = "https://thp.io/2010/mygpoclient/${name}.tar.gz"; - sha256 = "6a0b7b1fe2b046875456e14eda3e42430e493bf2251a64481cf4fd1a1e21a80e"; - }; - - buildInputs = with pythonPackages; [ nose minimock ]; - - checkPhase = '' - nosetests - ''; - - meta = { - description = "A gpodder.net client library"; - longDescription = '' - The mygpoclient library allows developers to utilize a Pythonic interface - to the gpodder.net web services. - ''; - homepage = "https://thp.io/2010/mygpoclient/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.skeidel ]; - }; -} diff --git a/pkgs/development/python-modules/numeric/default.nix b/pkgs/development/python-modules/numeric/default.nix deleted file mode 100644 index 0d6d5b0ffed..00000000000 --- a/pkgs/development/python-modules/numeric/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ fetchurl, stdenv, python }: - -let version = "24.2"; in - stdenv.mkDerivation { - name = "python-numeric-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/numpy/Numeric-${version}.tar.gz"; - sha256 = "0n2jy47n3d121pky4a3r0zjmk2vk66czr2x3y9179xbgxclyfwjz"; - }; - - buildInputs = [ python ]; - - buildPhase = ''python setup.py build --build-base "$out"''; - installPhase = '' - python setup.py install --prefix "$out" - - # Remove the `lib.linux-i686-2.5' and `temp.linux-i686-2.5' (or - # similar) directories. - rm -rf $out/lib.* $out/temp.* - ''; - - # FIXME: Run the tests. - - meta = { - description = "A Python module for high-performance, numeric computing"; - - longDescription = '' - Numeric is a Python module for high-performance, numeric - computing. It provides much of the functionality and - performance of commercial numeric software such as Matlab; it - some cases, it provides more functionality than commercial - software. - ''; - - license = "Python+LLNL"; - - homepage = http://people.csail.mit.edu/jrennie/python/numeric/; - }; - } diff --git a/pkgs/development/python-modules/psyco/default.nix b/pkgs/development/python-modules/psyco/default.nix deleted file mode 100644 index 1bdade67d68..00000000000 --- a/pkgs/development/python-modules/psyco/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, python}: - -assert stdenv.system == "i686-linux"; - -stdenv.mkDerivation { - name = "psyco-1.5.2"; - src = fetchurl { - url = mirror://sourceforge/psyco/psyco-1.5.2-src.tar.gz; - md5 = "bceb17423d06b573dc7b875d34e79417"; - }; - buildInputs = [python]; - buildPhase = "true"; - installPhase = "python ./setup.py install --prefix=$out"; -} diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index ddaa7eb508e..07a8e05730b 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -2,7 +2,7 @@ if (isPyPy || isPy35) then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { version = "1.10.0"; - name = "pycairo-${version}"; + name = "${python.libPrefix}-pycairo-${version}"; src = if python.is_py3k or false then fetchurl { url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2"; diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 68a56dedc3a..f8ca06eec86 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie -, sqlite, python3, cython3 +, sqlite, python, cython }: stdenv.mkDerivation rec { - name = "pycangjie-${version}"; + name = "${python.libPrefix}-pycangjie-${version}"; version = "1.3_rev_${rev}"; rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - autoconf automake libtool pkgconfig libcangjie sqlite python3 cython3 + autoconf automake libtool pkgconfig libcangjie sqlite python cython ]; preConfigure = '' diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix deleted file mode 100644 index 766dcaa58f7..00000000000 --- a/pkgs/development/python-modules/pycups/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, python, cups }: - -let version = "1.9.68"; in - -stdenv.mkDerivation { - name = "pycups-${version}"; - - src = fetchurl { - url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2"; - sha256 = "1i1ph9k1wampa7r6mgc30a99w0zjmxhvcxjxrgjqa5vdknynqd24"; - }; - - installPhase = '' - CFLAGS=-DVERSION=\\\"${version}\\\" python ./setup.py install --prefix $out - ''; - - buildInputs = [ python cups ]; -} diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 3a24767ae4e..321a0b49b08 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPythonPackage, pkgconfig, smpeg, libX11 -, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi +, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, isPy3k, }: buildPythonPackage { @@ -15,6 +15,9 @@ buildPythonPackage { smpeg portmidi libX11 ]; + # /nix/store/94kswjlwqnc0k2bnwgx7ckx0w2kqzaxj-stdenv/setup: line 73: python: command not found + disabled = isPy3k; + patches = [ ./pygame-v4l.patch ]; preConfigure = '' diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 14b7bd34eae..b8082890299 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }: stdenv.mkDerivation rec { - name = "pygobject-3.12.1"; + name = "pygobject-3.18.2"; src = fetchurl { - url = "mirror://gnome/sources/pygobject/3.12/${name}.tar.xz"; - sha256 = "0dfsjsa95ix8bx3h8w4bhnz7rymgl2paclvbn93x6qp8b53y0pys"; + url = "mirror://gnome/sources/pygobject/3.18/${name}.tar.xz"; + sha256 = "0prc3ky7g50ixmfxbc7zf43fw6in4hw2q07667hp8swi2wassg1a"; }; buildInputs = [ python pkgconfig glib gobjectIntrospection ]; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 7f4584f9c73..09890e8694f 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, astroid, buildPythonPackage }: -pythonPackages.buildPythonPackage rec { +buildPythonPackage rec { name = "pylint-1.4.1"; namePrefix = ""; @@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec { sha256 = "0c7hw1pcp5sqmc0v86zygw21isfgzbsqdmlb1sywncnlxmh30f1y"; }; - propagatedBuildInputs = with pythonPackages; [ astroid ]; + propagatedBuildInputs = [ astroid ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 92b74c952fa..31294c8dc98 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -3,7 +3,7 @@ let version = "4.11.3"; in stdenv.mkDerivation { - name = "PyQt-x11-gpl-${version}"; + name = "${python.libPrefix}-PyQt-x11-gpl-${version}"; src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt4/PyQt-${version}/PyQt-x11-gpl-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index b89052602d9..bb1d91b3ca8 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -3,7 +3,7 @@ let version = "5.4.2"; in stdenv.mkDerivation { - name = "PyQt-${version}"; + name = "${python.libPrefix}-PyQt-${version}"; meta = with stdenv.lib; { description = "Python bindings for Qt5"; diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index e3bcf059c1c..c7e0cc09f14 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, libxml2, libxslt, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, libxml2, libxslt, python, sphinx, qt4 }: stdenv.mkDerivation { - name = "pyside-apiextractor-0.10.10"; + name = "${python.libPrefix}-pyside-apiextractor-0.10.10"; src = fetchurl { url = "https://github.com/PySide/Apiextractor/archive/0.10.10.tar.gz"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ cmake libxml2 libxslt python27Packages.sphinx qt4 ]; + buildInputs = [ cmake libxml2 libxslt sphinx qt4 ]; meta = { description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index d274283594a..fc009a208b7 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }: +{ stdenv, fetchurl, cmake, python, pysideGeneratorrunner, pysideShiboken, qt4 }: -stdenv.mkDerivation { - name = "pyside-1.2.2"; +stdenv.mkDerivation rec { + name = "${python.libPrefix}-pyside-${version}"; + version = "1.2.4"; src = fetchurl { - url = "http://download.qt-project.org/official_releases/pyside/pyside-qt4.8+1.2.2.tar.bz2"; - sha256 = "1qbahpcjwl8d7zvvnc18nxpk1lbifpvjk8pi24ifbvvqcdsdzad1"; + url = "https://github.com/PySide/PySide/archive/${version}.tar.gz"; + sha256 = "90f2d736e2192ac69e5a2ac798fce2b5f7bf179269daa2ec262986d488c3b0f7"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 2423cbb0c2e..b576b29dae7 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, pysideApiextractor, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, pysideApiextractor, python, sphinx, qt4 }: stdenv.mkDerivation { - name = "pyside-generatorrunner-0.6.16"; + name = "${python.libPrefix}-pyside-generatorrunner-0.6.16"; src = fetchurl { url = "https://github.com/PySide/Generatorrunner/archive/0.6.16.tar.gz"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ cmake pysideApiextractor python27Packages.sphinx qt4 ]; + buildInputs = [ cmake pysideApiextractor sphinx qt4 ]; meta = { description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index 5e266aba7d0..549b6275a8c 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35 }: -stdenv.mkDerivation { - name = "pyside-shiboken-1.2.2"; +# Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77 +if isPy35 then throw "shiboken not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { + name = "${python.libPrefix}-pyside-shiboken-${version}"; + version = "1.2.4"; src = fetchurl { - url = "http://download.qt-project.org/official_releases/pyside/shiboken-1.2.2.tar.bz2"; - sha256 = "1i75ziljl7rgb88nf26hz6cm8jf5kbs9r33b1j8zs4z33z7vn9bn"; + url = "https://github.com/PySide/Shiboken/archive/${version}.tar.gz"; + sha256 = "1536f73a3353296d97a25e24f9554edf3e6a48126886f8d21282c3645ecb96a4"; }; enableParallelBuilding = true; - buildInputs = [ cmake pysideApiextractor pysideGeneratorrunner python27 python27Packages.sphinx qt4 ]; + buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ]; preConfigure = '' echo "preConfigure: Fixing shiboken_generator install target." @@ -18,6 +20,8 @@ stdenv.mkDerivation { \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ ''; + cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null; + meta = { description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index b5ddec09c03..facbccdce35 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, pyside, python27, qt4, pysideShiboken }: +{ stdenv, fetchurl, cmake, pyside, python, qt4, pysideShiboken }: stdenv.mkDerivation { - name = "pyside-tools-0.2.15"; + name = "${python.libPrefix}-pyside-tools-0.2.15"; src = fetchurl { url = "https://github.com/PySide/Tools/archive/0.2.15.tar.gz"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ cmake pyside python27 qt4 pysideShiboken ]; + buildInputs = [ cmake pyside python qt4 pysideShiboken ]; meta = { description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix deleted file mode 100644 index cc36680fcb0..00000000000 --- a/pkgs/development/python-modules/pyx/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, python, makeWrapper}: - -stdenv.mkDerivation rec { - name = "PyX-0.10"; - src = fetchurl { - url = "mirror://sourceforge/pyx/${name}.tar.gz"; - sha256 = "dfaa4a7790661d67d95f80b22044fdd8a9922483631950296ff1d7a9f85c8bba"; - }; - - patchPhase = '' - substituteInPlace ./setup.py --replace '"/etc"' '"etc"' - ''; - - buildInputs = [python makeWrapper]; - buildPhase = "python ./setup.py build"; - installPhase = '' - python ./setup.py install --prefix="$out" || exit 1 - - for i in "$out/bin/"* - do - # FIXME: We're assuming Python 2.4. - wrapProgram "$i" --prefix PYTHONPATH : \ - "$out/lib/python2.4/site-packages" || \ - exit 2 - done - ''; - - meta = { - description = ''Python graphics package''; - longDescription = '' - PyX is a Python package for the creation of PostScript and PDF - files. It combines an abstraction of the PostScript drawing - model with a TeX/LaTeX interface. Complex tasks like 2d and 3d - plots in publication-ready quality are built out of these - primitives. - ''; - license = stdenv.lib.licenses.gpl2; - homepage = http://pyx.sourceforge.net/; - }; -} diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix deleted file mode 100644 index b6375081551..00000000000 --- a/pkgs/development/python-modules/rbtools/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pythonPackages, python }: - -pythonPackages.buildPythonPackage rec { - name = "rbtools-0.7.2"; - namePrefix = ""; - - src = fetchurl { - url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.2.tar.gz"; - sha256 = "1ng8l8cx81cz23ls7fq9wz4ijs0zbbaqh4kj0mj6plzcqcf8na4i"; - }; - - propagatedBuildInputs = [ python.modules.sqlite3 pythonPackages.six ]; - - meta = { - maintainers = [ stdenv.lib.maintainers.iElectric ]; - }; -} diff --git a/pkgs/development/python-modules/slowaes/default.nix b/pkgs/development/python-modules/slowaes/default.nix deleted file mode 100644 index e45ffdfb2e1..00000000000 --- a/pkgs/development/python-modules/slowaes/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, buildPythonPackage }: - -buildPythonPackage rec { - name = "slowaes-0.1a1"; - - src = fetchurl { - url = "https://pypi.python.org/packages/source/s/slowaes/${name}.tar.gz"; - sha256 = "83658ae54cc116b96f7fdb12fdd0efac3a4e8c7c7064e3fac3f4a881aa54bf09"; - }; - - meta = { - homepage = "http://code.google.com/p/slowaes/"; - description = "AES implemented in pure python"; - license = stdenv.lib.licenses.asl20; - }; -} diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix deleted file mode 100644 index b1500b01972..00000000000 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ buildPythonPackage, fetchurl, setuptools }: - -buildPythonPackage rec { - name = "xmpp.py-${version}"; - version = "0.5.0rc1"; - - src = fetchurl { - url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz"; - sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si"; - }; - - buildInputs = [ setuptools ]; - - preInstall = '' - mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out) - export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out) - ''; - - meta = { - description = "XMPP python library"; - }; -} diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index d93c64a15a9..4a33a0cd8f3 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, pkgconfig, libelf, zlib, curl, elfutils, python, libiberty, binutils}: +{stdenv, fetchurl, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, binutils}: stdenv.mkDerivation rec { name = "kcov-${version}"; version = "29"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0nspf1bfq8zv7zmcmvkbgg3c90k10qcd56gyg8ln5z64nadvha9d"; }; - buildInputs = [ cmake pkgconfig libelf zlib curl elfutils python libiberty binutils ]; + preConfigure = "patchShebangs src/bin-to-c-source.py"; + buildInputs = [ cmake pkgconfig zlib curl elfutils python libiberty binutils ]; meta = with stdenv.lib; { description = "code coverage tester for compiled programs, Python scripts and shell scripts"; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 70a6fac7bab..f4f18dac487 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.5.2"; + version = "2.5.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "0pzs645315nvn981w3nj8fi30g6kq67cmj7hq7da658qlk0p6r7i"; + sha256 = "0xbfg6v6f3qyi99dbqragh3za2a0agrcq9c0qbkshvp5yd0fx4h1"; }; jarsrc = fetchurl { # NOTE: This is actually a .jar, Github has issues url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip"; - sha256 = "0qhvgvii4x3p49bx494f6fc7dfvxx2crp2wbkldxx2brvh105iv4"; + sha256 = "1p93j03v02mf1cnli6lv9qqnx7gwxr571g8z7y06p0d4nq31c32b"; }; patches = [ ./lein-fix-jar-path.patch ]; diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock index 60ff7b5ba3e..28b0e7f8aa4 100644 --- a/pkgs/development/tools/chefdk/Gemfile.lock +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -1,95 +1,173 @@ GEM remote: https://rubygems.org/ specs: - chef (12.0.3) - chef-zero (~> 3.2) + builder (3.2.2) + chef (12.5.1) + chef-config (= 12.5.1) + chef-zero (~> 4.2, >= 4.2.2) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) - ffi-yajl (~> 1.2) + ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) mixlib-authentication (~> 1.3) mixlib-cli (~> 1.4) - mixlib-config (~> 2.0) mixlib-log (~> 1.3) - mixlib-shellout (>= 2.0.0.rc.0, < 3.0) + mixlib-shellout (~> 2.0) net-ssh (~> 2.6) net-ssh-multi (~> 1.1) - ohai (~> 8.0) + ohai (>= 8.6.0.alpha.1, < 9) plist (~> 3.1.0) pry (~> 0.9) - chef-dk (0.4.0) - chef (~> 12.0) - cookbook-omnifetch (~> 0.2) - ffi-yajl (~> 1.0) + rspec-core (~> 3.2) + rspec-expectations (~> 3.2) + rspec-mocks (~> 3.2) + rspec_junit_formatter (~> 0.2.0) + serverspec (~> 2.7) + specinfra (~> 2.10) + syslog-logger (~> 1.6) + chef-config (12.5.1) + mixlib-config (~> 2.0) + mixlib-shellout (~> 2.0) + chef-dk (0.10.0) + chef (~> 12.0, >= 12.2.1) + chef-provisioning (~> 1.2) + cookbook-omnifetch (~> 0.2, >= 0.2.2) + diff-lcs (~> 1.0) + ffi-yajl (>= 1.0, < 3.0) + minitar (~> 0.5.4) mixlib-cli (~> 1.5) - mixlib-shellout (>= 2.0.0.rc.0, < 3.0.0) - solve (~> 1.2) - chef-zero (3.2.1) - ffi-yajl (~> 1.1) - hashie (~> 2.0) + mixlib-shellout (~> 2.0) + paint (~> 1.0) + solve (~> 2.0, >= 2.0.1) + chef-provisioning (1.5.0) + cheffish (~> 1.3, >= 1.3.1) + inifile (~> 2.0) + mixlib-install (~> 0.7.0) + net-scp (~> 1.0) + net-ssh (~> 2.0) + net-ssh-gateway (~> 1.2.0) + winrm (~> 1.3) + chef-zero (4.3.2) + ffi-yajl (~> 2.2) + hashie (>= 2.0, < 4.0) mixlib-log (~> 1.3) rack uuidtools (~> 2.1) + cheffish (1.6.0) + chef-zero (~> 4.3) coderay (1.1.0) - cookbook-omnifetch (0.2.0) + cookbook-omnifetch (0.2.2) minitar (~> 0.5.4) - dep-selector-libgecode (1.0.2) - dep_selector (1.0.3) - dep-selector-libgecode (~> 1.0) - ffi (~> 1.9) diff-lcs (1.2.5) erubis (2.7.0) - ffi (1.9.6) - ffi-yajl (1.4.0) - ffi (~> 1.5) + ffi (1.9.10) + ffi-yajl (2.2.2) libyajl2 (~> 1.2) - hashie (2.1.2) - highline (1.7.1) + gssapi (1.2.0) + ffi (>= 1.0.1) + gyoku (1.3.1) + builder (>= 2.1.2) + hashie (3.4.3) + highline (1.7.8) + httpclient (2.7.0.1) + inifile (2.0.2) ipaddress (0.8.0) libyajl2 (1.2.0) + little-plugger (1.1.4) + logging (2.0.0) + little-plugger (~> 1.1) + multi_json (~> 1.10) method_source (0.8.2) - mime-types (2.4.3) + mime-types (2.99) minitar (0.5.4) mixlib-authentication (1.3.0) mixlib-log mixlib-cli (1.5.0) - mixlib-config (2.1.0) + mixlib-config (2.2.1) + mixlib-install (0.7.0) mixlib-log (1.6.0) - mixlib-shellout (2.0.1) - net-dhcp (1.3.2) + mixlib-shellout (2.2.5) + molinillo (0.2.3) + multi_json (1.11.2) + net-scp (1.2.1) + net-ssh (>= 2.6.5) net-ssh (2.9.2) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) - net-ssh-multi (1.2.0) + net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) - ohai (8.1.1) + net-telnet (0.1.1) + nori (2.6.0) + ohai (8.7.0) + chef-config (>= 12.5.0.alpha.1, < 13) ffi (~> 1.9) - ffi-yajl (~> 1.1) + ffi-yajl (~> 2.2) ipaddress mime-types (~> 2.0) mixlib-cli mixlib-config (~> 2.0) mixlib-log mixlib-shellout (~> 2.0) - net-dhcp rake (~> 10.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) + paint (1.0.0) plist (3.1.0) - pry (0.10.1) + pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - rack (1.6.0) + rack (1.6.4) rake (10.4.2) + rspec (3.4.0) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-core (3.4.1) + rspec-support (~> 3.4.0) + rspec-expectations (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-its (1.2.0) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + rspec-mocks (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-support (3.4.1) + rspec_junit_formatter (0.2.3) + builder (< 4) + rspec-core (>= 2, < 4, != 2.12.0) + rubyntlm (0.4.0) semverse (1.2.1) + serverspec (2.24.3) + multi_json + rspec (~> 3.0) + rspec-its + specinfra (~> 2.43) + sfl (2.2) slop (3.6.0) - solve (1.2.1) - dep_selector (~> 1.0) + solve (2.0.1) + molinillo (~> 0.2.3) semverse (~> 1.1) - systemu (2.6.4) + specinfra (2.44.5) + net-scp + net-ssh (~> 2.7) + net-telnet + sfl + syslog-logger (1.6.8) + systemu (2.6.5) uuidtools (2.1.5) + winrm (1.3.6) + builder (>= 2.1.2) + gssapi (~> 1.2) + gyoku (~> 1.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (~> 2.0) + rubyntlm (~> 0.4.0) + uuidtools (~> 2.1.2) wmi-lite (1.0.0) PLATFORMS @@ -97,3 +175,6 @@ PLATFORMS DEPENDENCIES chef-dk + +BUNDLED WITH + 1.10.5 diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 043ee8adf42..3b427aae4d2 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, bundlerEnv, ruby, perl, autoconf }: bundlerEnv { - name = "chefdk-0.4.0"; + name = "chefdk-0.10.0"; inherit ruby; gemfile = ./Gemfile; diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix index f83e73693d8..cb4c1fcb67d 100644 --- a/pkgs/development/tools/chefdk/gemset.nix +++ b/pkgs/development/tools/chefdk/gemset.nix @@ -1,11 +1,19 @@ { - "chef" = { - version = "12.0.3"; + "builder" = { + version = "3.2.2"; source = { type = "gem"; - sha256 = "0lqix0mli6fm3lwrf563sjvfkfsrnyzbz8xqkp54q65dkl63ldy0"; + sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; + }; + }; + "chef" = { + version = "12.5.1"; + source = { + type = "gem"; + sha256 = "0hf6766wmh1dg7f09hi80s8hn1knvzgnaimbhvc05b4q973k5lmb"; }; dependencies = [ + "chef-config" "chef-zero" "diff-lcs" "erubis" @@ -13,7 +21,6 @@ "highline" "mixlib-authentication" "mixlib-cli" - "mixlib-config" "mixlib-log" "mixlib-shellout" "net-ssh" @@ -21,28 +28,66 @@ "ohai" "plist" "pry" + "rspec-core" + "rspec-expectations" + "rspec-mocks" + "rspec_junit_formatter" + "serverspec" + "specinfra" + "syslog-logger" + ]; + }; + "chef-config" = { + version = "12.5.1"; + source = { + type = "gem"; + sha256 = "18iqlf9x3iavh6183zlkiasxsz45drshihmk8yj56prrzfiys67m"; + }; + dependencies = [ + "mixlib-config" + "mixlib-shellout" ]; }; "chef-dk" = { - version = "0.4.0"; + version = "0.10.0"; source = { type = "gem"; - sha256 = "12fdk5j6cymwk4vk45mvi5i1hs9a88jvg6g7x6pxbc0bp3if2c6a"; + sha256 = "0gxm8dbq7y4bf9wb8zad9q5idsl88f1nm3rvnd2am0xka6bnxv29"; }; dependencies = [ "chef" + "chef-provisioning" "cookbook-omnifetch" + "diff-lcs" "ffi-yajl" + "minitar" "mixlib-cli" "mixlib-shellout" + "paint" "solve" ]; }; - "chef-zero" = { - version = "3.2.1"; + "chef-provisioning" = { + version = "1.5.0"; source = { type = "gem"; - sha256 = "04zypmygpxz8nwhjs4gvr8rcb9vqhmz37clbh7k7xxh5b2hs654k"; + sha256 = "1xln9hf8mcm81cmw96ccmyzrak54fbjrl9wgii37rx04v4a2435n"; + }; + dependencies = [ + "cheffish" + "inifile" + "mixlib-install" + "net-scp" + "net-ssh" + "net-ssh-gateway" + "winrm" + ]; + }; + "chef-zero" = { + version = "4.3.2"; + source = { + type = "gem"; + sha256 = "1djnxs97kj13vj1hxx4v6978pkwm8i03p76gbirbp3z2zs6jyvjf"; }; dependencies = [ "ffi-yajl" @@ -52,6 +97,16 @@ "uuidtools" ]; }; + "cheffish" = { + version = "1.6.0"; + source = { + type = "gem"; + sha256 = "10aj660azybnf7444a604pjs8p9pvwm3n4mavy8mp3g30yr07paq"; + }; + dependencies = [ + "chef-zero" + ]; + }; "coderay" = { version = "1.1.0"; source = { @@ -60,33 +115,15 @@ }; }; "cookbook-omnifetch" = { - version = "0.2.0"; + version = "0.2.2"; source = { type = "gem"; - sha256 = "027zz78693jd5g0fwp0xlzig2zijsxcgvfw5854ig37gy5a54wy4"; + sha256 = "1ml25xc69nsgbvp9a6w9yi376rav7b659cvyr8qhfb4jaj4l1yd6"; }; dependencies = [ "minitar" ]; }; - "dep-selector-libgecode" = { - version = "1.0.2"; - source = { - type = "gem"; - sha256 = "0755ps446wc4cf26ggmvibr4wmap6ch7zhkh1qmx1p6lic2hr4gn"; - }; - }; - "dep_selector" = { - version = "1.0.3"; - source = { - type = "gem"; - sha256 = "1ic90j3d6hmyxmdxzdz8crwmvw61f4kj0jphk43m6ipcx6bkphzw"; - }; - dependencies = [ - "dep-selector-libgecode" - "ffi" - ]; - }; "diff-lcs" = { version = "1.2.5"; source = { @@ -102,35 +139,68 @@ }; }; "ffi" = { - version = "1.9.6"; + version = "1.9.10"; source = { type = "gem"; - sha256 = "1ckw1336rnyv9yvvl614qgkqqi477g4hljv6xsws2vz14ynlvzhj"; + sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj"; }; }; "ffi-yajl" = { - version = "1.4.0"; + version = "2.2.2"; source = { type = "gem"; - sha256 = "1l289wyzc06v0rn73msqxx4gm48iqgxkd9rins22f13qicpczi5g"; + sha256 = "013n5cf80p2wfpmj1mdjkbmcyx3hg4c81wl3bamglaf4i12a2qk2"; }; dependencies = [ - "ffi" "libyajl2" ]; }; - "hashie" = { - version = "2.1.2"; + "gssapi" = { + version = "1.2.0"; source = { type = "gem"; - sha256 = "08w9ask37zh5w989b6igair3zf8gwllyzix97rlabxglif9f9qd9"; + sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix"; + }; + dependencies = [ + "ffi" + ]; + }; + "gyoku" = { + version = "1.3.1"; + source = { + type = "gem"; + sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh"; + }; + dependencies = [ + "builder" + ]; + }; + "hashie" = { + version = "3.4.3"; + source = { + type = "gem"; + sha256 = "1iv5hd0zcryprx9lbcm615r3afc0d6rhc27clywmhhgpx68k8899"; }; }; "highline" = { - version = "1.7.1"; + version = "1.7.8"; source = { type = "gem"; - sha256 = "1355zfwmm6baq44rp0ny7zdnsipgn5maxk19hvii0jx2bsk417fr"; + sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; + }; + }; + "httpclient" = { + version = "2.7.0.1"; + source = { + type = "gem"; + sha256 = "0k6bqsaqq6c824vrbfb5pkz8bpk565zikd10w85rzj2dy809ik6c"; + }; + }; + "inifile" = { + version = "2.0.2"; + source = { + type = "gem"; + sha256 = "03rpacxnrnisjhd2zhc7629ica958bkdbakicl5kipw1wbprck25"; }; }; "ipaddress" = { @@ -147,6 +217,24 @@ sha256 = "0n5j0p8dxf9xzb9n4bkdr8w0a8gg3jzrn9indri3n0fv90gcs5qi"; }; }; + "little-plugger" = { + version = "1.1.4"; + source = { + type = "gem"; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + }; + }; + "logging" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "0ka5q88qvc2w7yr9z338jwxcyj1kifmbr9is5hps2f37asismqvb"; + }; + dependencies = [ + "little-plugger" + "multi_json" + ]; + }; "method_source" = { version = "0.8.2"; source = { @@ -155,10 +243,10 @@ }; }; "mime-types" = { - version = "2.4.3"; + version = "2.99"; source = { type = "gem"; - sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq"; + sha256 = "1hravghdnk9qbibxb3ggzv7mysl97djh8n0rsswy3ssjaw7cbvf2"; }; }; "minitar" = { @@ -186,10 +274,17 @@ }; }; "mixlib-config" = { - version = "2.1.0"; + version = "2.2.1"; source = { type = "gem"; - sha256 = "13mb628614nl4dfwyyqpxc7b688ls6cfnjx06j8c13sl003xkp7g"; + sha256 = "0smhnyhw1va94vrd7zapxplbavbs4dc78h9yd1yfv52fzxx16zk3"; + }; + }; + "mixlib-install" = { + version = "0.7.0"; + source = { + type = "gem"; + sha256 = "0ll1p7v7fp3rf11dz8pifz33jhl4bdg779n4hzlnbia2z7xfsa2w"; }; }; "mixlib-log" = { @@ -200,19 +295,36 @@ }; }; "mixlib-shellout" = { - version = "2.0.1"; + version = "2.2.5"; source = { type = "gem"; - sha256 = "16n2zli15504bfzxwj5riq92zz3h8n8xswvs5gi0dp2dhyjd7lp3"; + sha256 = "1is07rar0x8n9h67j4iyrxz2yfgis4bnhh3x7vhbbi6khqqixg79"; }; }; - "net-dhcp" = { - version = "1.3.2"; + "molinillo" = { + version = "0.2.3"; source = { type = "gem"; - sha256 = "13mq3kwk6k3cd0vhnj1xq0gvbg2hbynzpnvq6fa6vqakbyc0iznd"; + sha256 = "1ylvnpdn20nna488mkzpq3iy6gr866gmkiv090c7g5h88x1qws0b"; }; }; + "multi_json" = { + version = "1.11.2"; + source = { + type = "gem"; + sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r"; + }; + }; + "net-scp" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + }; + dependencies = [ + "net-ssh" + ]; + }; "net-ssh" = { version = "2.9.2"; source = { @@ -231,23 +343,38 @@ ]; }; "net-ssh-multi" = { - version = "1.2.0"; + version = "1.2.1"; source = { type = "gem"; - sha256 = "0927244ac8h3z6wl5cifkblsa95ddpsxr6k8h2fmdvg5wdqs4ydh"; + sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71"; }; dependencies = [ "net-ssh" "net-ssh-gateway" ]; }; - "ohai" = { - version = "8.1.1"; + "net-telnet" = { + version = "0.1.1"; source = { type = "gem"; - sha256 = "1lcbl7lrmy56x6l6ca7miawj9h40ff6nv4b3n6bz3w7fa3vh9xz0"; + sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx"; + }; + }; + "nori" = { + version = "2.6.0"; + source = { + type = "gem"; + sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + }; + }; + "ohai" = { + version = "8.7.0"; + source = { + type = "gem"; + sha256 = "1f10kgxh89iwij54yx8q11n1q87653ckvdmdwg8cwz3qlgf4flhy"; }; dependencies = [ + "chef-config" "ffi" "ffi-yajl" "ipaddress" @@ -256,12 +383,18 @@ "mixlib-config" "mixlib-log" "mixlib-shellout" - "net-dhcp" "rake" "systemu" "wmi-lite" ]; }; + "paint" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "0mhwj6w60q40w4f6jz8xx8bv1kghjvsjc3d8q8pnslax4fkmzbp1"; + }; + }; "plist" = { version = "3.1.0"; source = { @@ -270,10 +403,10 @@ }; }; "pry" = { - version = "0.10.1"; + version = "0.10.3"; source = { type = "gem"; - sha256 = "1j0r5fm0wvdwzbh6d6apnp7c0n150hpm9zxpm5xvcgfqr36jaj8z"; + sha256 = "1x78rvp69ws37kwig18a8hr79qn36vh8g1fn75p485y3b3yiqszg"; }; dependencies = [ "coderay" @@ -282,10 +415,10 @@ ]; }; "rack" = { - version = "1.6.0"; + version = "1.6.4"; source = { type = "gem"; - sha256 = "1f57f8xmrgfgd76s6mq7vx6i266zm4330igw71an1g0kh3a42sbb"; + sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; }; }; "rake" = { @@ -295,6 +428,86 @@ sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8"; }; }; + "rspec" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "12axhz2nj2m0dy350lxym76m36m1hq48hc59mf00z9dajbpnj78s"; + }; + dependencies = [ + "rspec-core" + "rspec-expectations" + "rspec-mocks" + ]; + }; + "rspec-core" = { + version = "3.4.1"; + source = { + type = "gem"; + sha256 = "0zl4fbrzl4gg2bn3fhv910q04sm2jvzdidmvd71gdgqwbzk0zngn"; + }; + dependencies = [ + "rspec-support" + ]; + }; + "rspec-expectations" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "07pz570glwg87zpyagxxal0daa1jrnjkiksnn410s6846884fk8h"; + }; + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + }; + "rspec-its" = { + version = "1.2.0"; + source = { + type = "gem"; + sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3"; + }; + dependencies = [ + "rspec-core" + "rspec-expectations" + ]; + }; + "rspec-mocks" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "0iw9qvpawj3cfcg3xipi1v4y11g9q4f5lvmzgksn6f0chf97sjy1"; + }; + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + }; + "rspec-support" = { + version = "3.4.1"; + source = { + type = "gem"; + sha256 = "0l6zzlf22hn3pcwnxswsjsiwhqjg7a8mhvm680k5vq98307bkikr"; + }; + }; + "rspec_junit_formatter" = { + version = "0.2.3"; + source = { + type = "gem"; + sha256 = "0hphl8iggqh1mpbbv0avf8735x6jgry5wmkqyzgv1zwnimvja1ai"; + }; + dependencies = [ + "builder" + "rspec-core" + ]; + }; + "rubyntlm" = { + version = "0.4.0"; + source = { + type = "gem"; + sha256 = "03xmi8mxcbc5laad10r6b705dk4vyhl9lr7h940f2rhibymxq45x"; + }; + }; "semverse" = { version = "1.2.1"; source = { @@ -302,6 +515,26 @@ sha256 = "0s47lprqwmlhnxm3anrhvd3559g51hgrcqn3mq0fy696zkv8vfd8"; }; }; + "serverspec" = { + version = "2.24.3"; + source = { + type = "gem"; + sha256 = "03v6qqshqjsvbbjf1pwbi2mzgqg84wdbhnqb3gdbl1m9bz7sxg1n"; + }; + dependencies = [ + "multi_json" + "rspec" + "rspec-its" + "specinfra" + ]; + }; + "sfl" = { + version = "2.2"; + source = { + type = "gem"; + sha256 = "0aq7ykbyvx8mx4szkcgp09zs094fg60l2pzxscmxqrgqk9yvyg1j"; + }; + }; "slop" = { version = "3.6.0"; source = { @@ -310,21 +543,41 @@ }; }; "solve" = { - version = "1.2.1"; + version = "2.0.1"; source = { type = "gem"; - sha256 = "0ff5iwhsr6fcp10gd2ivrx1fcw3lm5f5f11srhy2z5dc3v79mcja"; + sha256 = "0009xvg40y59bijds5njnwfshfw68wmj54yz3qy538g9rpxvmqp1"; }; dependencies = [ - "dep_selector" + "molinillo" "semverse" ]; }; - "systemu" = { - version = "2.6.4"; + "specinfra" = { + version = "2.44.5"; source = { type = "gem"; - sha256 = "16k94azpsy1r958r6ysk4ksnpp54rqmh5hyamad9kwc3lk83i32z"; + sha256 = "018i3bmmy7lc21hagvwfmz2sdfj0v87a7yy3z162lcpq62vxw89r"; + }; + dependencies = [ + "net-scp" + "net-ssh" + "net-telnet" + "sfl" + ]; + }; + "syslog-logger" = { + version = "1.6.8"; + source = { + type = "gem"; + sha256 = "14y20phq1khdla4z9wvf98k7j3x6n0rjgs4f7vb0xlf7h53g6hbm"; + }; + }; + "systemu" = { + version = "2.6.5"; + source = { + type = "gem"; + sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1"; }; }; "uuidtools" = { @@ -334,6 +587,23 @@ sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g"; }; }; + "winrm" = { + version = "1.3.6"; + source = { + type = "gem"; + sha256 = "1rx42y5w9d3w6axxwdj9zckzsgsjk172zxn52w2jj65spl98vxbc"; + }; + dependencies = [ + "builder" + "gssapi" + "gyoku" + "httpclient" + "logging" + "nori" + "rubyntlm" + "uuidtools" + ]; + }; "wmi-lite" = { version = "1.0.0"; source = { diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 78669dfdce7..82bbab5ff87 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -20,12 +20,14 @@ stdenv.mkDerivation { buildInputs = [ perl python flex bison ] ++ stdenv.lib.optional (qt4 != null) qt4 + ++ stdenv.lib.optional stdenv.isSunOS libiconv ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; prefixKey = "--prefix "; configureFlags = [ "--dot dot" ] + ++ stdenv.lib.optional stdenv.isSunOS "--install install" ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard"; preConfigure = diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix new file mode 100644 index 00000000000..a8fa950c98d --- /dev/null +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -0,0 +1,32 @@ +{ stdenv, ghc, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "multi-ghc-travis-${version}"; + version = "git-2015-11-04"; + + buildInputs = [ ghc ]; + + src = fetchFromGitHub { + owner = "hvr"; + repo = "multi-ghc-travis"; + rev = "4c288937ff8b80f6f1532609f9920912856dc3ee"; + sha256 = "0978k81by403in7iq7ia4hsfwlvaalnjqyh3ihwyw8822a5gm8y9"; + }; + + patchPhase = '' + substituteInPlace make_travis_yml.hs --replace "make_travis_yml.hs" "multi-ghc-travis" + ''; + + installPhase = '' + mkdir -p $out/bin + ghc -O --make make_travis_yml.hs -o $out/bin/multi-ghc-travis + ''; + + meta = with stdenv.lib; { + description = "Generate .travis.yml for multiple ghc versions"; + homepage = "https://github.com/hvr/multi-ghc-travis"; + license = licenses.free; + platforms = platforms.all; + maintainers = with maintainers; [ jb55 ]; + }; +} diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 4386e7eaf74..8f687908017 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.47.2"; + name = "help2man-1.47.3"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0z1zgw6k1fba59fii6ksfi1g2gci6i4ysa3kdfh3j475fdkn1if4"; + sha256 = "0miqq77ssk5rgsc9xlv7k5n2wk2c5wv2m1kh4zhbwrggfmjaycn2"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 127223c4ee1..c98bddf53c0 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { patches = optional (!vanilla) ./requires-private.patch ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch; - buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin) libiconv; - preConfigure = stdenv.lib.optionalString (stdenv.system == "mips64el-linux") ''cp -v ${automake}/share/automake*/config.{sub,guess} .''; + buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; - configureFlags = [ "--with-internal-glib" ]; + configureFlags = [ "--with-internal-glib" ] + ++ stdenv.lib.optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]; postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file diff --git a/pkgs/development/tools/misc/texinfo/6.0.nix b/pkgs/development/tools/misc/texinfo/6.0.nix index 5099676f32b..11e822291e8 100644 --- a/pkgs/development/tools/misc/texinfo/6.0.nix +++ b/pkgs/development/tools/misc/texinfo/6.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }: +{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, interactive ? false }: stdenv.mkDerivation rec { name = "texinfo-6.0"; @@ -9,14 +9,17 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl xz ] + ++ stdenv.lib.optionals stdenv.isSunOS [ libiconv gawk ] ++ stdenv.lib.optional interactive ncurses; + configureFlags = stdenv.lib.optionalString stdenv.isSunOS "AWK=${gawk}/bin/awk"; + preInstall = '' installFlags="TEXMF=$out/texmf-dist"; installTargets="install install-tex"; ''; - doCheck = !stdenv.isDarwin && !interactive; + doCheck = !stdenv.isDarwin && !interactive && !stdenv.isSunOS/*flaky*/; meta = { homepage = "http://www.gnu.org/software/texinfo/"; diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index b38751ba99e..ee007414017 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl }: +{ stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { name = "bison-3.0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "b67fd2daae7a64b5ba862c66c07c1addb9e6b1b05c5f2049392cfd8a2172952e"; }; - nativeBuildInputs = [ m4 perl ]; + nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; propagatedBuildInputs = [ m4 ]; meta = { diff --git a/pkgs/development/tools/parsing/flex/2.5.39.nix b/pkgs/development/tools/parsing/flex/default.nix similarity index 75% rename from pkgs/development/tools/parsing/flex/2.5.39.nix rename to pkgs/development/tools/parsing/flex/default.nix index 93d54803e7c..57ce29f5175 100644 --- a/pkgs/development/tools/parsing/flex/2.5.39.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bison, m4 }: -stdenv.mkDerivation { - name = "flex-2.5.39"; +stdenv.mkDerivation rec { + name = "flex-2.6.0"; src = fetchurl { - url = mirror://sourceforge/flex/flex-2.5.39.tar.bz2; - sha256 = "0zv15giw3gma03y2bzw78hjfy49vyir7vbcgnh9bb3637dgvblmd"; + url = "mirror://sourceforge/flex/${name}.tar.bz2"; + sha256 = "1sdqx63yadindzafrq1w31ajblf9gl1c301g068s20s7bbpi3ri4"; }; buildInputs = [ bison ]; diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 876734a3e11..49a87754e72 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -3,15 +3,15 @@ with rustPlatform; buildRustPackage rec { - name = "rustfmt-git-2015-10-28"; + name = "rustfmt-git-2015-12-08"; src = fetchFromGitHub { owner = "nrc"; repo = "rustfmt"; - rev = "bd0fdbb364ba69c69b867f96bc1ea9b59177fb76"; - sha256 = "07yxz409yxgwrzm46fhq6kyn9igznb7481kxyk90ngmhdd0a5mfd"; + rev = "e94bd34a06d878a41bb8be409f173a8824dda63f"; + sha256 = "0f0ixbr5nfla0j0b91plmapw75yl3d3lxwvllj2wx4z94nfxanp6"; }; - depsSha256 = "0qs6ilpvcrvcmxg7a94rbg9rql1hxfljy6gxrvpn59dy8hb1qccb"; + depsSha256 = "0vsrpw4icn9jf44sqr5749hbazsxp3hqn1g7gr90fvnfvz4s5f07"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix index 6ee3c089d2c..5d292a34078 100644 --- a/pkgs/development/web/nodejs/v0_10.nix +++ b/pkgs/development/web/nodejs/v0_10.nix @@ -6,7 +6,7 @@ }: let - version = "0.10.40"; + version = "0.10.41"; # !!! Should we also do shared libuv? deps = { @@ -32,7 +32,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "17qlk4adjk1ls8ka4gbmvcl02xmvxdxhfdmg54bbxbjrv4prrrxs"; + sha256 = "15f9n9pydfb3f6gbbxnh6qqmkmwr0j3gcs8cbnvl69f4lpi99xkr"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/v4.nix similarity index 95% rename from pkgs/development/web/nodejs/default.nix rename to pkgs/development/web/nodejs/v4.nix index 6c16382de2a..8ccf8976a94 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -7,7 +7,7 @@ assert stdenv.system != "armv5tel-linux"; let - version = "4.2.2"; + version = "4.2.3"; deps = { inherit openssl zlib libuv; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "1c8c45b39fg2mz1c88jl0q0yhpxixdr25rpmpfskdd1m6hshkrq0"; + sha256 = "0ksmbln5qhrr7qhdz3npwmyz44y1vpznpxk3j7sqkc5lzvjss22h"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ]; diff --git a/pkgs/development/web/nodejs/v4_1_0.nix b/pkgs/development/web/nodejs/v4_1_0.nix deleted file mode 100644 index de8fa5f6bd3..00000000000 --- a/pkgs/development/web/nodejs/v4_1_0.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool -}: - -let - version = "4.1.0"; - - deps = { - inherit openssl zlib libuv; - - # disabled system v8 because v8 3.14 no longer receives security fixes - # we fall back to nodejs' internal v8 copy which receives backports for now - # inherit v8 - } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) { - inherit http-parser; - }); - - inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms; -in stdenv.mkDerivation { - name = "nodejs-${version}"; - - src = fetchurl { - url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "025lqmhvl7xpx1ip97jwkz21a97sw9zb4zi3y7fgfag59vv0ac25"; - }; - - configureFlags = map (name: "--shared-${name}") (builtins.attrNames deps) ++ [ "--without-dtrace" ]; - - dontDisableStatic = true; - - prePatch = '' - patchShebangs . - ''; - - patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode-4.1.0.patch; - - buildInputs = [ python which ] ++ (builtins.attrValues deps) - ++ optional stdenv.isLinux utillinux - ++ optionals stdenv.isDarwin [ openssl libtool ]; - setupHook = ./setup-hook.sh; - - enableParallelBuilding = true; - - passthru.interpreterName = "nodejs"; - - meta = { - description = "Event-driven I/O framework for the V8 JavaScript engine"; - homepage = http://nodejs.org; - license = licenses.mit; - maintainers = [ maintainers.goibhniu maintainers.havvy ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/web/nodejs/v5_0.nix b/pkgs/development/web/nodejs/v5.nix similarity index 95% rename from pkgs/development/web/nodejs/v5_0.nix rename to pkgs/development/web/nodejs/v5.nix index d83efdf2fa5..f9e9ee12edc 100644 --- a/pkgs/development/web/nodejs/v5_0.nix +++ b/pkgs/development/web/nodejs/v5.nix @@ -7,7 +7,7 @@ assert stdenv.system != "armv5tel-linux"; let - version = "5.0.0"; + version = "5.1.1"; deps = { inherit openssl zlib libuv; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "1x6dmk78k4cpdzvxi8390w2w0pvkb6bc1rc64l5a5rks0ri9d3b9"; + sha256 = "1hr2zjwrah8yrih1jsm3v8b449d7xla1rykmyd8yrd80z0jf0yd7"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ]; diff --git a/pkgs/games/castle-combat/default.nix b/pkgs/games/castle-combat/default.nix deleted file mode 100644 index 789b043e18f..00000000000 --- a/pkgs/games/castle-combat/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ fetchurl, stdenv, buildPythonPackage, pygame, twisted, numeric, makeWrapper }: - -buildPythonPackage rec { - name = "castle-combat-0.8.1"; - namePrefix = ""; - - src = fetchurl { - url = "mirror://sourceforge/castle-combat/${name}.tar.gz"; - sha256 = "1hp4y5dgj88j9g44h4dqiakrgj8lip1krlrdl2qpffin08agrvik"; - }; - - buildInputs = [ makeWrapper ]; - propagatedBuildInputs = - [ pygame twisted - - # XXX: `Numeric.pth' should be found by Python but it's not. - # Gobolinux has the same problem: - # http://bugs.python.org/issue1431 . - numeric - ]; - - patchPhase = '' - sed -i "src/common.py" \ - -e "s|^data_path *=.*$|data_path = \"$out/share/${name}\"|g" - - mv -v "src/"*.py . - sed -i "setup.py" -e's/"src"/""/g' - ''; - - postInstall = '' - mkdir -p "$out/share/${name}" - cp -rv "data/"* "$out/share/${name}" - - mv -v "$out/bin/castle-combat.py" "$out/bin/castle-combat" - ''; - - postPhases = "fixLoaderPath"; - - fixLoaderPath = - let dollar = "\$"; in - '' sed -i "$out/bin/castle-combat" \ - -e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-cc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\ -export LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\"" - ''; - # ^ - # `--- The run-time says: "libgcc_s.so.1 must be installed for - # pthread_cancel to work", which means it needs help to find it. - - # No test suite. - doCheck = false; - - meta = { - description = "Castle-Combat, a clone of the old arcade game Rampart"; - - longDescription = '' - Castle-Combat is a clone of the old arcade game Rampart. Up to - four players (or more in future versions) build castle walls, - place cannons inside these walls, and shoot at the walls of - their enemy(s). If a player cannot build a complete wall around - one of his castles, he loses. The last surviving player wins. - ''; - - homepage = http://www.linux-games.com/castle-combat/; - - license = "unknown"; - - maintainers = [ ]; - }; -} diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index 83560c21f5d..80cc7763266 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { { description = "World class backgammon application"; homepage = http://www.gnubg.org/; license = licenses.gpl3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index e5057c27e99..05c39fb2f2b 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,70 +1,85 @@ -{ stdenv, fetchurl, writeScript, ncurses, gzip, flex, bison }: +{ stdenv, lib, fetchurl, writeScript, ncurses, gzip, flex, bison }: -stdenv.mkDerivation rec { - name = "nethack-3.4.3"; +let + platform = + if lib.elem stdenv.system lib.platforms.unix then "unix" + else abort "Unknown platform for NetHack"; + unixHint = + if stdenv.isLinux then "linux" + # We probably want something different for Darwin + else "unix"; + userDir = "~/.config/nethack"; + +in stdenv.mkDerivation { + name = "nethack-3.6.0"; src = fetchurl { - url = "mirror://sourceforge/nethack/nethack-343-src.tgz"; - sha256 = "1r3ghqj82j0bar62z3b0lx9hhx33pj7p1ppxr2hg8bgfm79c6fdv"; + url = "mirror://sourceforge/nethack/nethack-360-src.tgz"; + sha256 = "12mi5kgqw3q029y57pkg3gnp930p7yvlqi118xxdif2qhj6nkphs"; }; buildInputs = [ ncurses ]; nativeBuildInputs = [ flex bison ]; - preBuild = '' - ( cd sys/unix ; sh setup.sh ) + makeFlags = [ "PREFIX=$(out)" ]; + + configurePhase = '' + cd sys/${platform} + ${lib.optionalString (platform == "unix") '' + sed -e '/^ *cd /d' -i nethack.sh + ${lib.optionalString (unixHint == "linux") '' + sed \ + -e 's,/bin/gzip,${gzip}/bin/gzip,g' \ + -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \ + -i hints/linux + ''} + sh setup.sh hints/${unixHint} + ''} + cd ../.. - sed -e '/define COMPRESS/d' -i include/config.h - sed -e '1i\#define COMPRESS "${gzip}/bin/gzip"' -i include/config.h - sed -e '1i\#define COMPRESS_EXTENSION ".gz"' -i include/config.h sed -e '/define CHDIR/d' -i include/config.h - - sed -e '/extern char [*]tparm/d' -i win/tty/*.c - - sed -e 's/-ltermlib/-lncurses/' -i src/Makefile - sed -e 's/^YACC *=.*/YACC = bison -y/' -i util/Makefile - sed -e 's/^LEX *=.*/LEX = flex/' -i util/Makefile - - sed -re 's@^(CH...).*@\1 = true@' -i Makefile - - sed -e '/^ *cd /d' -i sys/unix/nethack.sh + sed \ + -e 's/^YACC *=.*/YACC = bison -y/' \ + -e 's/^LEX *=.*/LEX = flex/' \ + -i util/Makefile ''; postInstall = '' + mkdir -p $out/games/lib/nethackuserdir for i in logfile perm record save; do - rm -rf $out/games/lib/nethackdir/$i + mv $out/games/lib/nethackdir/$i $out/games/lib/nethackuserdir done mkdir -p $out/bin cat <$out/bin/nethack - #! ${stdenv.shell} -e - if [ ! -d ~/.nethack ]; then - mkdir -p ~/.nethack/save - for i in logfile perm record; do - [ ! -e ~/.nethack/\$i ] && touch ~/.nethack/\$i - done - fi + #! ${stdenv.shell} -e - cd ~/.nethack + if [ ! -d ${userDir} ]; then + mkdir -p ${userDir} + cp -r $out/games/lib/nethackuserdir/* ${userDir} + chmod -R +w ${userDir} + fi - cleanup() { - for i in $out/games/lib/nethackdir/*; do - rm -rf \$(basename \$i) - done - } - trap cleanup EXIT + RUNDIR=\$(mktemp -td nethack.\$USER.XXXXX) - for i in $out/games/lib/nethackdir/*; do - ln -s \$i \$(basename \$i) - done - $out/games/nethack + cleanup() { + rm -rf \$RUNDIR + } + trap cleanup EXIT + + cd \$RUNDIR + for i in ${userDir}/*; do + ln -s \$i \$(basename \$i) + done + for i in $out/games/lib/nethackdir/*; do + ln -s \$i \$(basename \$i) + done + $out/games/nethack EOF chmod +x $out/bin/nethack ''; - makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { description = "Rogue-like game"; homepage = "http://nethack.org/"; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 8b9c412eaac..97b6be9be2e 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "0a4zh66vvkipdrm45gql4mlqpf26mn4m6pl86f02cd1fap58xrk0"; + sha256 = "0qxss5rxzac94z5k16xv84ll0n163sphs88xkgv3z7vwramagffq"; }; buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ]; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 2a5795be93c..fc0e70e4354 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -1,4 +1,4 @@ -{ lib, buildFHSUserEnv +{ lib, buildFHSUserEnv, steam , withJava ? false , withPrimus ? false }: @@ -48,6 +48,13 @@ buildFHSUserEnv { ln -s ../lib32/steam-runtime steamrt/i386 ''; + extraInstallCommands = '' + mkdir -p $out/share/applications + ln -s ${steam}/share/icons $out/share + ln -s ${steam}/share/pixmaps $out/share + sed "s,/usr/bin/steam,$out/bin/steam,g" ${steam}/share/applications/steam.desktop > $out/share/applications/steam.desktop + ''; + profile = '' export STEAM_RUNTIME=/steamrt ''; diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index 624f41749aa..8dbd8cd6721 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -247,10 +247,10 @@ }; } rec { - name = "libcomerr2_1.42-1ubuntu2+srt4_amd64"; - md5 = "fc890b8ce50abe33c1c60ec45ca1d203"; + name = "libcomerr2_1.42-1ubuntu2.2+srt1_amd64"; + md5 = "12cd8bbe50da1b698d5280c8cd1efe38"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_amd64.deb"; inherit md5; name = "libcomerr2.deb"; }; @@ -283,10 +283,10 @@ }; } rec { - name = "libdbus-1-3_1.4.18-1ubuntu1.6+srt1_amd64"; - md5 = "31ff871795887c7595908ebef7151186"; + name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64"; + md5 = "5082143b56f4d6a72c21244c4b7bc653"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.6+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64.deb"; inherit md5; name = "libdbus-1-3.deb"; }; @@ -328,10 +328,10 @@ }; } rec { - name = "libexpat1_2.0.1-7.2ubuntu1.1+srt4_amd64"; - md5 = "18307a925d2ce2d432699073fe679b09"; + name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64"; + md5 = "a7148db45279001346cebc02a7d7c1af"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.1+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64.deb"; inherit md5; name = "libexpat1.deb"; }; @@ -373,10 +373,10 @@ }; } rec { - name = "libfreetype6_2.4.8-1ubuntu2.2+srt1_amd64"; - md5 = "635e6ee1b6dbb9f609f3b7d738b88d83"; + name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64"; + md5 = "06f7ccb54bba06c1e2673471866039a0"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.2+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64.deb"; inherit md5; name = "libfreetype6.deb"; }; @@ -400,10 +400,10 @@ }; } rec { - name = "libgcrypt11_1.5.0-3ubuntu0.3+srt1_amd64"; - md5 = "869c080b36c95e90484987fc3a46d17b"; + name = "libgcrypt11_1.5.0-3ubuntu0.4+srt1_amd64"; + md5 = "e97b1a78944b7b07871dd36116b07bfe"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.3+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.4+srt1_amd64.deb"; inherit md5; name = "libgcrypt11.deb"; }; @@ -787,10 +787,10 @@ }; } rec { - name = "libnss3_3.17.1-0ubuntu0.12.04.1+srt1_amd64"; - md5 = "d2583ca89a2aa19abfd497be664b2fcd"; + name = "libnss3_3.19.2-0ubuntu0.12.04.1+srt1_amd64"; + md5 = "ba6be27b60728d1bbdc849354376adf8"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/n/nss/libnss3_3.17.1-0ubuntu0.12.04.1+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/n/nss/libnss3_3.19.2-0ubuntu0.12.04.1+srt1_amd64.deb"; inherit md5; name = "libnss3.deb"; }; @@ -868,10 +868,10 @@ }; } rec { - name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.1+srt4_amd64"; - md5 = "f3f0e80ce2a6be9e830862184223b3ff"; + name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64"; + md5 = "52134e1b8190957f069268827f2bde74"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.1+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64.deb"; inherit md5; name = "libpixman-1-0.deb"; }; @@ -1057,19 +1057,19 @@ }; } rec { - name = "libsqlite3-0_3.7.9-2ubuntu1.1+srt4_amd64"; - md5 = "777bba933183fe2e1ec7cddf7d311609"; + name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64"; + md5 = "1a9c37c32fa46f7d55a2e384cd6ce5a6"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.1+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64.deb"; inherit md5; name = "libsqlite3-0.deb"; }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.21+srt1_amd64"; - md5 = "0f740796454b18233ab65134c8250889"; + name = "libssl1.0.0_1.0.1-4ubuntu5.31+srt1_amd64"; + md5 = "0ea8b768e93487f8108336c5da92b952"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.21+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.31+srt1_amd64.deb"; inherit md5; name = "libssl1.0.0.deb"; }; @@ -1102,10 +1102,10 @@ }; } rec { - name = "libtasn1-3_2.10-1ubuntu1.2+srt1_amd64"; - md5 = "cd6947eb0f8a2fbb31ac5483d7aad25a"; + name = "libtasn1-3_2.10-1ubuntu1.4+srt1_amd64"; + md5 = "6e092ebafe0cf5a49ee9319e2cf6f4fd"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.2+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_amd64.deb"; inherit md5; name = "libtasn1-3.deb"; }; @@ -1138,10 +1138,10 @@ }; } rec { - name = "libtiff4_3.9.5-2ubuntu1.6+srt3_amd64"; - md5 = "f6f1ba2a0a76245cc05217e6c8385fcc"; + name = "libtiff4_3.9.5-2ubuntu1.8+srt1_amd64"; + md5 = "7c44d58a6acf73b6c298cfa03e982e0f"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.6+srt3_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_amd64.deb"; inherit md5; name = "libtiff4.deb"; }; @@ -1210,10 +1210,10 @@ }; } rec { - name = "libvdpau1_0.4.1-3ubuntu1.1+srt4_amd64"; - md5 = "ad17ca0b0794852836c8166b530b520d"; + name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64"; + md5 = "d31594fc832bfd0bc65c43f2e7f40ac5"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.1+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64.deb"; inherit md5; name = "libvdpau1.deb"; }; @@ -1273,28 +1273,28 @@ }; } rec { - name = "libx11-6_1.4.99.1-0ubuntu2.2+steamrt1+srt4_amd64"; - md5 = "d1dd7819a0bcd2915c6df05f34bd2932"; + name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; + md5 = "22ca2e28aa3f3d70b77632a8772a4a9d"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.2+steamrt1+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; inherit md5; name = "libx11-6.deb"; }; } rec { - name = "libx11-data_1.4.99.1-0ubuntu2.2+steamrt1+srt4_all"; - md5 = "e9c006f3f06178fd1a47f4fdffcc9da3"; + name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; + md5 = "c012bbc8654c3c012dc7b5901c486f4d"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.2+steamrt1+srt4_all.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; inherit md5; name = "libx11-data.deb"; }; } rec { - name = "libx11-xcb1_1.4.99.1-0ubuntu2.2+steamrt1+srt4_amd64"; - md5 = "59f62a1b493eeaa0438d4b5e002fe269"; + name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; + md5 = "e94af0629e0b59f21c1ccc4f4d4088b5"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.2+steamrt1+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; inherit md5; name = "libx11-xcb1.deb"; }; @@ -1588,19 +1588,19 @@ }; } rec { - name = "libxext6_1.3.0-3ubuntu0.1+steamrt1+srt1_amd64"; - md5 = "6b395ceb55a4454c5fe2f4cfe45d2a3d"; + name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64"; + md5 = "b6dcf651f5b9dda20fd39912bf03a4c3"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.1+steamrt1+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64.deb"; inherit md5; name = "libxext6.deb"; }; } rec { - name = "libxfixes3_5.0-4ubuntu4.3+srt1_amd64"; - md5 = "462d20f1f3e38c92f22434fe75c4f932"; + name = "libxfixes3_5.0-4ubuntu4.4+srt1_amd64"; + md5 = "a80bcd458215e445daddf4cf0d625758"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.3+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_amd64.deb"; inherit md5; name = "libxfixes3.deb"; }; @@ -1615,10 +1615,10 @@ }; } rec { - name = "libxi6_1.7.1.901-1ubuntu1~precise2+srt1_amd64"; - md5 = "c4aa3fcef9981735073c73d822ac52cb"; + name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64"; + md5 = "f25d86e540477fe044c0294670b5f1b5"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise2+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64.deb"; inherit md5; name = "libxi6.deb"; }; @@ -1660,19 +1660,19 @@ }; } rec { - name = "libxrandr2_1.3.2-2ubuntu0.2+srt4_amd64"; - md5 = "7fde5d0b6ffa9f94f0300edc4de04ad6"; + name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64"; + md5 = "bde5d98946e1bfd60a42482339e29787"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.2+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64.deb"; inherit md5; name = "libxrandr2.deb"; }; } rec { - name = "libxrender1_0.9.6-2ubuntu0.1+srt4_amd64"; - md5 = "a01473ee15ce4a8bb1a1ac2fc8e81bda"; + name = "libxrender1_0.9.6-2ubuntu0.2+srt1_amd64"; + md5 = "6781fa18b873dc95da21e82cc61609d6"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.1+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_amd64.deb"; inherit md5; name = "libxrender1.deb"; }; @@ -1986,10 +1986,10 @@ }; } rec { - name = "libcomerr2_1.42-1ubuntu2+srt4_i386"; - md5 = "165e9ea1f09704a353220b9ff6cf2f1b"; + name = "libcomerr2_1.42-1ubuntu2.2+srt1_i386"; + md5 = "a7450fa3b218cc993b252f7f51b4f83a"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_i386.deb"; inherit md5; name = "libcomerr2.deb"; }; @@ -2022,10 +2022,10 @@ }; } rec { - name = "libdbus-1-3_1.4.18-1ubuntu1.6+srt1_i386"; - md5 = "01a50cab2a169d9b0eff71b5cee000ad"; + name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386"; + md5 = "36d5b7a27a90cc6069c14317c5b182e8"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.6+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386.deb"; inherit md5; name = "libdbus-1-3.deb"; }; @@ -2067,10 +2067,10 @@ }; } rec { - name = "libexpat1_2.0.1-7.2ubuntu1.1+srt4_i386"; - md5 = "4478766ffb8f96db66de0b0f2ccfb290"; + name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386"; + md5 = "44b8336cf9a2340a693528f2ebe19da2"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.1+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386.deb"; inherit md5; name = "libexpat1.deb"; }; @@ -2112,10 +2112,10 @@ }; } rec { - name = "libfreetype6_2.4.8-1ubuntu2.2+srt1_i386"; - md5 = "257bf20101de39017f83e9934cea06e4"; + name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_i386"; + md5 = "2b1dd9e53e6a94443e9959de83d8621f"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.2+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_i386.deb"; inherit md5; name = "libfreetype6.deb"; }; @@ -2139,10 +2139,10 @@ }; } rec { - name = "libgcrypt11_1.5.0-3ubuntu0.3+srt1_i386"; - md5 = "a857ecbbc060af329d774fefe41b4d5d"; + name = "libgcrypt11_1.5.0-3ubuntu0.4+srt1_i386"; + md5 = "3ee78c6888bcf55b43fb6830059c65e3"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.3+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.4+srt1_i386.deb"; inherit md5; name = "libgcrypt11.deb"; }; @@ -2526,10 +2526,10 @@ }; } rec { - name = "libnss3_3.17.1-0ubuntu0.12.04.1+srt1_i386"; - md5 = "9be8a7f5cc84852f14af1fc7e9c44f56"; + name = "libnss3_3.19.2-0ubuntu0.12.04.1+srt1_i386"; + md5 = "35330de1ca02b0034f468c0df11882bd"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/n/nss/libnss3_3.17.1-0ubuntu0.12.04.1+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/n/nss/libnss3_3.19.2-0ubuntu0.12.04.1+srt1_i386.deb"; inherit md5; name = "libnss3.deb"; }; @@ -2607,10 +2607,10 @@ }; } rec { - name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.1+srt4_i386"; - md5 = "cbad5a39d1cb49085cd4b50a2e1d96a6"; + name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386"; + md5 = "630fa4416398e12dfae1816acdac1d89"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.1+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386.deb"; inherit md5; name = "libpixman-1-0.deb"; }; @@ -2796,19 +2796,19 @@ }; } rec { - name = "libsqlite3-0_3.7.9-2ubuntu1.1+srt4_i386"; - md5 = "466f9b4663bdf71a2cb36437e8f70fca"; + name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386"; + md5 = "6653a03901b263af6fce56e6c394e9b3"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.1+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386.deb"; inherit md5; name = "libsqlite3-0.deb"; }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.21+srt1_i386"; - md5 = "c530243255161578fbddfa9f7200d30c"; + name = "libssl1.0.0_1.0.1-4ubuntu5.31+srt1_i386"; + md5 = "40b412b5964f9f48ef4f5997702da3d5"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.21+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.31+srt1_i386.deb"; inherit md5; name = "libssl1.0.0.deb"; }; @@ -2841,10 +2841,10 @@ }; } rec { - name = "libtasn1-3_2.10-1ubuntu1.2+srt1_i386"; - md5 = "55364b5ab0d027f6ffaf89444f5c0ad9"; + name = "libtasn1-3_2.10-1ubuntu1.4+srt1_i386"; + md5 = "c24dd57cc16746dbead2fbfa571f978a"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.2+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_i386.deb"; inherit md5; name = "libtasn1-3.deb"; }; @@ -2877,10 +2877,10 @@ }; } rec { - name = "libtiff4_3.9.5-2ubuntu1.6+srt3_i386"; - md5 = "50f018955b48c06df3b00a45c1999c63"; + name = "libtiff4_3.9.5-2ubuntu1.8+srt1_i386"; + md5 = "8374a1fc7909c42faa5ee585eb967b20"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.6+srt3_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_i386.deb"; inherit md5; name = "libtiff4.deb"; }; @@ -2949,10 +2949,10 @@ }; } rec { - name = "libvdpau1_0.4.1-3ubuntu1.1+srt4_i386"; - md5 = "b627e61dac887be2c3697d3945b4eee6"; + name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_i386"; + md5 = "61cd2560476f54dc11b3e859e104daec"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.1+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_i386.deb"; inherit md5; name = "libvdpau1.deb"; }; @@ -3012,28 +3012,28 @@ }; } rec { - name = "libx11-6_1.4.99.1-0ubuntu2.2+steamrt1+srt4_i386"; - md5 = "ecf312639e19cab505e978dcb75eea4d"; + name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; + md5 = "cc208840d2883eec6f9770b623c24b9d"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.2+steamrt1+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; inherit md5; name = "libx11-6.deb"; }; } rec { - name = "libx11-data_1.4.99.1-0ubuntu2.2+steamrt1+srt4_all"; - md5 = "e9c006f3f06178fd1a47f4fdffcc9da3"; + name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; + md5 = "c012bbc8654c3c012dc7b5901c486f4d"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.2+steamrt1+srt4_all.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; inherit md5; name = "libx11-data.deb"; }; } rec { - name = "libx11-xcb1_1.4.99.1-0ubuntu2.2+steamrt1+srt4_i386"; - md5 = "8ce612a1d9c5b392d7d77c9a49eda59d"; + name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; + md5 = "2ef2ffe569708f8433cfb36e754526ec"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.2+steamrt1+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; inherit md5; name = "libx11-xcb1.deb"; }; @@ -3327,19 +3327,19 @@ }; } rec { - name = "libxext6_1.3.0-3ubuntu0.1+steamrt1+srt1_i386"; - md5 = "a68ef50ca2623f2779b5d6668f545c75"; + name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386"; + md5 = "7f18f7c6fb6bca8a033e243ca4222057"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.1+steamrt1+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386.deb"; inherit md5; name = "libxext6.deb"; }; } rec { - name = "libxfixes3_5.0-4ubuntu4.3+srt1_i386"; - md5 = "263f3532430749f671a83ba3ca48b072"; + name = "libxfixes3_5.0-4ubuntu4.4+srt1_i386"; + md5 = "25d8be35a5e5a6bac479d4bdce8dceba"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.3+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_i386.deb"; inherit md5; name = "libxfixes3.deb"; }; @@ -3354,10 +3354,10 @@ }; } rec { - name = "libxi6_1.7.1.901-1ubuntu1~precise2+srt1_i386"; - md5 = "f9e20e913df71ed877cd5ec6bd7e823d"; + name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386"; + md5 = "5f82357fd11b009d7fee5020e8ff2c8a"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise2+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386.deb"; inherit md5; name = "libxi6.deb"; }; @@ -3399,19 +3399,19 @@ }; } rec { - name = "libxrandr2_1.3.2-2ubuntu0.2+srt4_i386"; - md5 = "44eee22d721a1f41c569400fed1810ca"; + name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_i386"; + md5 = "659bfe8b731e831f32b047e66643ae05"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.2+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_i386.deb"; inherit md5; name = "libxrandr2.deb"; }; } rec { - name = "libxrender1_0.9.6-2ubuntu0.1+srt4_i386"; - md5 = "a7a6e50fde5d43c42a9e8f1202f043e5"; + name = "libxrender1_0.9.6-2ubuntu0.2+srt1_i386"; + md5 = "e5ea9172d234d61d6a31d86465428b05"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.1+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_i386.deb"; inherit md5; name = "libxrender1.deb"; }; diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 2f2ce921176..b41847c25ba 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -1,26 +1,24 @@ {stdenv, fetchurl, traceDeps ? false}: -stdenv.mkDerivation rec { - name = "${program}-original-${version}"; - program = "steam"; +let + traceLog = "/tmp/steam-trace-dependencies.log"; version = "1.0.0.49"; +in stdenv.mkDerivation rec { + name = "steam-original-${version}"; + src = fetchurl { - url = "http://repo.steampowered.com/steam/pool/steam/s/steam/${program}_${version}.tar.gz"; + url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz"; sha256 = "1c1gl5pwvb5gnnnqf5d9hpcjnfjjgmn4lgx8v0fbx1am5xf3p2gx"; }; - traceLog = "/tmp/steam-trace-dependencies.log"; - - installPhase = '' - make DESTDIR=$out install - mv $out/usr/* $out #*/ - rmdir $out/usr + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + postInstall = '' rm $out/bin/steamdeps ${stdenv.lib.optionalString traceDeps '' cat > $out/bin/steamdeps <> ${traceLog} cat \$1 >> ${traceLog} echo >> ${traceLog} @@ -32,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A digital distribution platform"; homepage = http://store.steampowered.com/; - license = licenses.unfree; + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ jagajaga ]; }; } diff --git a/pkgs/games/steam/update-runtime-shell.nix b/pkgs/games/steam/update-runtime-shell.nix new file mode 100644 index 00000000000..bb9362b9bf0 --- /dev/null +++ b/pkgs/games/steam/update-runtime-shell.nix @@ -0,0 +1,13 @@ +with import {}; + +(python2.buildEnv.override { + extraLibs = with python2Packages; + [ debian + ]; + postBuild = '' + mkdir -p $out/bin + for i in ${nixUnstable}/bin/*; do + ln -s $i $out/bin/$(basename $i) + done + ''; +}).env diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix deleted file mode 100644 index 9089b58bd53..00000000000 --- a/pkgs/games/thePenguinMachine/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{stdenv, fetchurl, python, pil, pygame, SDL} @ args: with args; -stdenv.mkDerivation { - name = "thePenguinMachine"; - - src = fetchurl { - url = http://www.migniot.com/matrix/projects/thepenguinmachine/ThePenguinMachine.tar.gz; - sha256 = "09ljks8vj75g00h3azc83yllbfsrxwmv1c9g32gylcmsshik0dqv"; - }; - - broken = true; # Not found - - buildInputs = [python pil pygame SDL]; - - configurePhase = '' - sed -e "/includes = /aincludes.append('${SDL.dev}/include/SDL')" -i setup.py; - sed -e "/includes = /aincludes.append('$(echo ${pygame}/include/python*)')" -i setup.py; - cat setup.py; - export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" - ''; - buildPhase = '' - sed -e "s/pygame.display.toggle_fullscreen.*/pass;/" -i tpm/Application.py - sed -e 's@"Surface"@"pygame.Surface"@' -i src/surfutils.c - python setup.py build; - python setup.py build_clib; - python setup.py build_ext; - python setup.py build_py; - python setup.py build_scripts; - ''; - installPhase = '' - python setup.py install --prefix=$out - mkdir -p "$out"/share/tpm/ - cp -r . "$out"/share/tpm/build-dir - mkdir -p "$out/bin" - echo "#! /bin/sh" >> "$out/bin/tpm" - echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pil}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" - echo "cd \"$out/share/tpm/build-dir\"" >> "$out/bin/tpm" - echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pil}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" - echo "${python}/bin/python \"$out\"/share/tpm/build-dir/ThePenguinMachine.py \"\$@\"" >> "$out/bin/tpm" - chmod a+x "$out/bin/tpm" - ''; - - meta = { - description = "An Incredible Machine clone"; - }; -} diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix index e590cf60ac0..b70e2178844 100644 --- a/pkgs/misc/emulators/cdemu/client.nix +++ b/pkgs/misc/emulators/cdemu/client.nix @@ -1,8 +1,8 @@ { callPackage, python, dbus_python, intltool, makeWrapper }: let pkg = import ./base.nix { - version = "3.0.0"; + version = "3.0.1"; pkgName = "cdemu-client"; - pkgSha256 = "125f6j7c52a0c7smbx323vdpwhx24yl0vglkiyfcbm92fjji14rm"; + pkgSha256 = "1kg5m7npdxli93vihhp033hgkvikw5b6fm0qwgvlvdjby7njyyyg"; }; in callPackage pkg { buildInputs = [ python dbus_python intltool makeWrapper ]; diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix index cc7a619b14f..47a967fb52e 100644 --- a/pkgs/misc/emulators/cdemu/daemon.nix +++ b/pkgs/misc/emulators/cdemu/daemon.nix @@ -1,8 +1,8 @@ { callPackage, glib, libao }: let pkg = import ./base.nix { - version = "3.0.2"; + version = "3.0.3"; pkgName = "cdemu-daemon"; - pkgSha256 = "01jg9b1nkqrbh6binfcbyraz83s9yjavgwi3y4w1bmqg5qlhv6lc"; + pkgSha256 = "00gi3x03l019nyqfxkph1rsldd7fwg0r0x95spwv5py5wyiqvp3m"; }; in callPackage pkg { buildInputs = [ glib libao (callPackage ./libmirage.nix {}) ]; diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 226031a2eb7..13ca367734c 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -1,8 +1,8 @@ { callPackage, python, pygobject3, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }: let pkg = import ./base.nix { - version = "3.0.0"; + version = "3.0.1"; pkgName = "gcdemu"; - pkgSha256 = "1m5ab325r586v2y2d93a817phn6wck67y5mfkf948mph40ks0mqk"; + pkgSha256 = "1dlng1bvhns7f0ff5p89npsm2nznfqnaspr0alfh4fl0f11cvnfr"; }; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix index f6ae5d132fc..5e83ef7bbbf 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/misc/emulators/cdemu/libmirage.nix @@ -1,8 +1,8 @@ { callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate }: let pkg = import ./base.nix { - version = "3.0.3"; + version = "3.0.4"; pkgName = "libmirage"; - pkgSha256 = "03idg94h5qhmnnc8g9dw8yqf14yv2paph5n77dfmg925f3z70nyn"; + pkgSha256 = "0grzdacl8hlj20amq88r98h8pd039ww0g4hl1a8lhly11h7kf1fc"; }; in callPackage pkg { buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate ]; diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix index fa74e014fa1..bfdbd0177da 100644 --- a/pkgs/misc/emulators/wine/versions.nix +++ b/pkgs/misc/emulators/wine/versions.nix @@ -1,11 +1,11 @@ { unstable = { - wineVersion = "1.7.55"; - wineSha256 = "06b1sgjxycbr1qsy33z5w22ykz12kkdsfq2yl7qmx9s5rg4zcj51"; - geckoVersion = "2.36"; - geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g"; - gecko64Version = "2.36"; - gecko64Sha256 = "0i7dchrzsda4nqbkhp3rrchk74rc2whn2af1wzda517m9c0886vh"; + wineVersion = "1.8-rc3"; + wineSha256 = "0j65v0jr1z56p9g16c0412ssx44zif8gfna7a6m865wz8gs1fnm6"; + geckoVersion = "2.40"; + geckoSha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s"; + gecko64Version = "2.40"; + gecko64Sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3"; monoVersion = "4.5.6"; monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c"; }; @@ -20,11 +20,11 @@ monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c"; }; staging = { - version = "1.7.55"; - sha256 = "16hs1q2ff7frja36pnriprxrpvk22bacjbigbscayshhlj958a8m"; + version = "1.8-rc3"; + sha256 = "1jp91w4sn10ycd21rwqsgxmpr425r4in4d2g085dhiw6g57ixfnj"; }; winetricks = { - version = "20151110"; - sha256 = "1aq8rkqq8mdksb5c4gc3k9plh3zc28gffi7y29v9vyk4f25j64sz"; + version = "20151116"; + sha256 = "1iih2b85s7f4if1mn36infc43hd4pdp8bl84q0nml3gh3fh8zqpr"; }; } diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix new file mode 100644 index 00000000000..23d91040b12 --- /dev/null +++ b/pkgs/misc/emulators/yabause/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, config +, cmake, pkgconfig +, doxygen +, qt +, libXmu, mesa, openal, SDL2, freeglut +}: + +stdenv.mkDerivation rec { + name = "yabause-${meta.version}"; + + src = fetchurl { + url = "http://download.tuxfamily.org/yabause/releases/${meta.version}/${name}.tar.gz"; + sha256 = "0nkpvnr599g0i2mf19sjvw5m0rrvixdgz2snav4qwvzgfc435rkm"; + }; + + patches = [ ./linkage-rwx-linux-elf.diff ]; + + buildInputs = + [ cmake pkgconfig doxygen qt libXmu mesa openal SDL2 freeglut ]; + + cmakeConfigureFlags = [ + "-DYAB_PORTS='qt'" + "-DYAB_OPTIMIZED_DMA='ON'" + "-DYAB_NETWORK='ON'" ] ; + + meta = with stdenv.lib; { + version = "0.9.14"; + description = "An open-source Sega Saturn emulator"; + homepage = http://yabause.org/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} +# TODO: Qt5 diff --git a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff b/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff new file mode 100644 index 00000000000..bb0491b373f --- /dev/null +++ b/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff @@ -0,0 +1,20 @@ +--- a/src/sh2_dynarec/linkage_x64.s 2013-03-11 20:29:53.112870900 +0100 ++++ b/src/sh2_dynarec/linkage_x64.s 2013-03-11 20:31:48.856778600 +0100 +@@ -747,3 +747,7 @@ breakpoint: + ret + /* Set breakpoint here for debugging */ + .size breakpoint, .-breakpoint ++ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +--- a/src/sh2_dynarec/linkage_x86.s 2013-03-11 20:30:08.157693100 +0100 ++++ b/src/sh2_dynarec/linkage_x86.s 2013-03-11 20:32:30.993310600 +0100 +@@ -743,3 +743,7 @@ breakpoint: + ret + /* Set breakpoint here for debugging */ + .size breakpoint, .-breakpoint ++ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index c75a92f46cf..adb93890066 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -1,5 +1,5 @@ {stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin -, nix-prefetch-scripts }: +, nix-prefetch-hg, nix-prefetch-git }: /* @@ -310,8 +310,8 @@ rec { echom repeat("=", 80) endif let opts = {} - let opts.nix_prefetch_git = "${nix-prefetch-scripts}/bin/nix-prefetch-git" - let opts.nix_prefetch_hg = "${nix-prefetch-scripts}/bin/nix-prefetch-hg" + let opts.nix_prefetch_git = "${nix-prefetch-git}/bin/nix-prefetch-git" + let opts.nix_prefetch_hg = "${nix-prefetch-hg}/bin/nix-prefetch-hg" let opts.cache_file = g:vim_addon_manager.plugin_root_dir.'/cache' let opts.plugin_dictionaries = [] ${lib.concatMapStrings (file: "let opts.plugin_dictionaries += map(readfile(\"${file}\"), 'eval(v:val)')\n") namefiles } diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 24083060e54..c18d3f6cc6d 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -95,8 +95,10 @@ let propagatedBuildInputs = deps; - # Not going to bother being more precise than this... - __propagatedImpureHostDeps = (import ./impure-deps.nix).${name}; + # allows building the symlink tree + __impureHostDeps = [ "/System/Library/Frameworks/${name}.framework" ]; + + __propagatedImpureHostDeps = stdenv.lib.optional (name != "Kernel") "/System/Library/Frameworks/${name}.framework/${name}"; meta = with stdenv.lib; { description = "Apple SDK framework ${name}"; @@ -159,6 +161,12 @@ in rec { ''; }); + CoreServices = stdenv.lib.overrideDerivation super.CoreServices (drv: { + __propagatedSandboxProfile = drv.__propagatedSandboxProfile ++ ['' + (allow mach-lookup (global-name "com.apple.CoreServices.coreservicesd")) + '']; + }); + Security = stdenv.lib.overrideDerivation super.Security (drv: { setupHook = ./security-setup-hook.sh; }); diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix index 55c8279340b..3993a360156 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix @@ -8,13 +8,7 @@ appleDerivation { patches = [ ./add-cf-initialize.patch ./add-cfmachport.patch ./cf-bridging.patch ]; - __propagatedImpureHostDeps = [ - "/System/Library/Frameworks/CoreFoundation.framework" - "/usr/lib/libc++.1.dylib" - "/usr/lib/libc++abi.dylib" - "/usr/lib/libicucore.A.dylib" - "/usr/lib/libz.1.dylib" - ]; + __propagatedImpureHostDeps = [ "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation" ]; preBuild = '' substituteInPlace Makefile \ @@ -52,5 +46,7 @@ appleDerivation { postInstall = '' mv $out/System/* $out rmdir $out/System + mv $out/Library/Frameworks/CoreFoundation.framework/Versions/A/PrivateHeaders/* \ + $out/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix index 9f6031771c2..203ca010d62 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix @@ -1,7 +1,7 @@ { stdenv, appleDerivation, unifdef }: appleDerivation { - buildinputs = [ unifdef ]; + buildInputs = [ unifdef ]; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix index 4bc3a7a7fa4..a0261875c10 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix @@ -1,32 +1,87 @@ -{ stdenv, appleDerivation, version }: +{ stdenv, appleDerivation, fetchzip, version, bsdmake, perl, flex, yacc, writeScriptBin +}: + +# this derivation sucks +# locale data was removed after adv_cmds-118, so our base is that because it's easier than +# replicating the bizarre bsdmake file structure +# +# sadly adv_cmds-118 builds a mklocale and colldef that generate files that our libc can no +# longer understand +# +# the more recent adv_cmds release is used for everything else in this package + +let recentAdvCmds = fetchzip { + url = "http://opensource.apple.com/tarballs/adv_cmds/adv_cmds-158.tar.gz"; + sha256 = "0z081kcprzg5jcvqivfnwvvv6wfxzkjg2jc2lagsf8c7j7vgm8nn"; +}; + +in appleDerivation { + buildInputs = [ bsdmake perl yacc flex ]; + + patchPhase = '' + substituteInPlace BSDMakefile \ + --replace chgrp true \ + --replace /Developer/Makefiles/bin/compress-man-pages.pl true \ + --replace "ps.tproj" "" --replace "gencat.tproj" "" --replace "md.tproj" "" \ + --replace "tabs.tproj" "" --replace "cap_mkdb.tproj" "" \ + --replace "!= tconf --test TARGET_OS_EMBEDDED" "= NO" + + substituteInPlace Makefile --replace perl true + + for subproject in colldef mklocale monetdef msgdef numericdef timedef; do + substituteInPlace usr-share-locale.tproj/$subproject/BSDmakefile \ + --replace /usr/share/locale "" \ + --replace '-o ''${BINOWN} -g ''${BINGRP}' "" \ + --replace "rsync -a" "cp -r" + done + ''; + + preBuild = '' + cp -r --no-preserve=all ${recentAdvCmds}/colldef . + pushd colldef + mv locale/collate.h . + flex -t -8 -i scan.l > scan.c + yacc -d parse.y + clang *.c -o colldef -lfl + popd + mv colldef/colldef colldef.tproj/colldef + + cp -r --no-preserve=all ${recentAdvCmds}/mklocale . + pushd mklocale + flex -t -8 -i lex.l > lex.c + yacc -d yacc.y + clang *.c -o mklocale -lfl + popd + mv mklocale/mklocale mklocale.tproj/mklocale + ''; -appleDerivation { - # Will override the name until we provide all of adv_cmds buildPhase = '' - pushd ps - cc -Os -Wall -I. -c -o fmt.o fmt.c - cc -Os -Wall -I. -c -o keyword.o keyword.c - cc -Os -Wall -I. -c -o nlist.o nlist.c - cc -Os -Wall -I. -c -o print.o print.c - cc -Os -Wall -I. -c -o ps.o ps.c - cc -Os -Wall -I. -c -o tasks.o tasks.c - cc -o ps fmt.o keyword.o nlist.o print.o ps.o tasks.o - popd + runHook preBuild - pushd locale - c++ -o locale locale.cc - popd + bsdmake -C usr-share-locale.tproj + + clang ${recentAdvCmds}/ps/*.c -o ps ''; installPhase = '' - mkdir -p $out/bin $out/share/man/man1 + bsdmake -C usr-share-locale.tproj install DESTDIR="$locale/share/locale" - cp ps/ps $out/bin/ps - cp ps/ps.1 $out/share/man/man1 - cp locale/locale $out/bin/locale - cp locale/locale.1 $out/share/man/man1 + # need to get rid of runtime dependency on flex + # install -d 0755 $locale/bin + # install -m 0755 colldef.tproj/colldef $locale/bin + # install -m 0755 mklocale.tproj/mklocale $locale/bin + + install -d 0755 $ps/bin + install ps $ps/bin/ps ''; + outputs = [ + "ps" + "locale" + ]; + + # ps uses this syscall to get process info + propagatedSandboxProfile = stdenv.lib.sandbox.allow "mach-priv-task-port"; meta = { platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix new file mode 100644 index 00000000000..dcbf8b43308 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix @@ -0,0 +1,45 @@ +{ stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }: + +appleDerivation { + buildInputs = [ makeWrapper ]; + + patchPhase = '' + substituteInPlace mk/bsd.prog.mk \ + --replace '-o ''${BINOWN} -g ''${BINGRP}' "" \ + --replace '-o ''${SCRIPTSOWN_''${.ALLSRC:T}}' "" \ + --replace '-g ''${SCRIPTSGRP_''${.ALLSRC:T}}' "" + substituteInPlace mk/bsd.lib.mk --replace '-o ''${LIBOWN} -g ''${LIBGRP}' "" + substituteInPlace mk/bsd.info.mk --replace '-o ''${INFOOWN} -g ''${INFOGRP}' "" + substituteInPlace mk/bsd.doc.mk --replace '-o ''${BINOWN} -g ''${BINGRP}' "" + substituteInPlace mk/bsd.man.mk --replace '-o ''${MANOWN} -g ''${MANGRP}' "" + substituteInPlace mk/bsd.files.mk \ + --replace '-o ''${''${group}OWN_''${.ALLSRC:T}}' "" \ + --replace '-g ''${''${group}GRP_''${.ALLSRC:T}}' "" \ + --replace '-o ''${''${group}OWN} -g ''${''${group}GRP}' "" + substituteInPlace mk/bsd.incs.mk \ + --replace '-o ''${''${group}OWN_''${.ALLSRC:T}}' "" \ + --replace '-g ''${''${group}GRP_''${.ALLSRC:T}}' "" \ + --replace '-o ''${''${group}OWN} -g ''${''${group}GRP}' "" + ''; + + buildPhase = '' + objs=() + for file in $(find . -name '*.c'); do + obj="$(basename "$file" .c).o" + objs+=("$obj") + cc -c "$file" -o "$obj" -DDEFSHELLNAME='"sh"' -D__FBSDID=__RCSID -mdynamic-no-pic -g + done + cc "''${objs[@]}" -o bsdmake + ''; + + installPhase = '' + install -d 0644 $out/bin + install -m 0755 bsdmake $out/bin + install -d 0644 $out/share/mk + install -m 0755 mk/* $out/share/mk + ''; + + preFixup = '' + wrapProgram "$out/bin/bsdmake" --add-flags "-m $out/share/mk" + ''; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix index 8687f3fe532..1fbacfb9284 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix @@ -7,6 +7,10 @@ appleDerivation { propagatedBuildInputs = [ Security ]; + propagatedSandboxProfile = '' + (allow mach-lookup (global-name "com.apple.SystemConfiguration.configd")) + ''; + patchPhase = '' substituteInPlace SystemConfiguration.fproj/SCNetworkReachabilityInternal.h \ --replace '#include ' "" diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 906e0ad2d54..f1b72b4123f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -48,16 +48,19 @@ let IOKitSrcs = stdenv.lib.mapAttrs (name: value: if builtins.isFunction value then value name else value) IOKitSpecs; + adv_cmds = applePackage "adv_cmds" "119" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {}; + packages = { - adv_cmds = applePackage "adv_cmds" "153" "174v6a4zkcm2pafzgdm6kvs48z5f911zl7k49hv7kjq6gm58w99v" {}; + inherit (adv_cmds) ps locale; architecture = applePackage "architecture" "265" "05wz8wmxlqssfp29x203fwfb8pgbdjj1mpz12v508658166yzqj8" {}; bootstrap_cmds = applePackage "bootstrap_cmds" "86" "0xr0296jm1r3q7kbam98h85g23qlfi763z54ahj563n636kyk2wb" {}; + bsdmake = applePackage "bsdmake" "24" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {}; CarbonHeaders = applePackage "CarbonHeaders" "9A581" "1hc0yijlpwq39x5bic6nnywqp2m1wj1f11j33m2q7p505h1h740c" {}; CF = applePackage "CF" "855.17" "1sadmxi9fsvsmdyxvg2133sdzvkzwil5fvyyidxsyk1iyfzqsvln" {}; CommonCrypto = applePackage "CommonCrypto" "60049" "1azin6w7cnzl0iv8kd2qzgwcp6a45zy64y5z1i6jysjcl6xmlw2h" {}; configd = applePackage "configd" "453.19" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {}; copyfile = applePackage "copyfile" "103.92.1" "15i2hw5aqx0fklvmq6avin5s00adacvzqc740vviwc2y742vrdcd" {}; - CoreOSMakefiles = applePackage "CoreOSMakefiles" "76" "0sw3w3sjil0kvxz8y86b81sz82rcd1nijayki1a1bsnsf0hz6qbf" {}; + CoreOSMakefiles = applePackage "CoreOSMakefiles" "40" "0kxp53spbn7109l7cvhi88pmfsi81lwmbws819b6wr3hm16v84f4" {}; Csu = applePackage "Csu" "79" "1hif4dz23isgx85sgh11yg8amvp2ksvvhz3y5v07zppml7df2lnh" {}; dtrace = applePackage "dtrace" "118.1" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wcf" {}; dyld = applePackage "dyld" "239.4" "07z7lyv6x0f6gllb5hymccl31zisrdhz4gqp722xcs9nhsqaqvn7" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index 4a739032e2a..ccce7448e5d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -30,6 +30,9 @@ name: version: sha256: args: let ''; buildInputs = [ pkgs.gnustep-make + pkgs.darwin.apple_sdk.frameworks.AppKit + pkgs.darwin.apple_sdk.frameworks.Foundation + pkgs.darwin.cf-private ]; makeFlags = [ "-f${makeFile}" diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix index 23ac246b4af..9de1d120cc9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix @@ -14,6 +14,9 @@ appleDerivation { substituteInPlace lib/debugging.cpp --replace PATH_MAX 1024 substituteInPlace lib/superblob.h --replace 'result->at' 'result->template at' substituteInPlace lib/ccaudit.cpp --replace '' '"bsm/libbsm.h"' + substituteInPlace lib/powerwatch.h --replace \ + '' \ + '"${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/PrivateHeaders/pwr_mgt/IOPMLibPrivate.h"' cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/security_utilities/utilities_dtrace.h lib cp -R ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/bsm lib diff --git a/pkgs/os-specific/darwin/cf-private/setup-hook.sh b/pkgs/os-specific/darwin/cf-private/setup-hook.sh index a83a1323bf8..7594c07977b 100644 --- a/pkgs/os-specific/darwin/cf-private/setup-hook.sh +++ b/pkgs/os-specific/darwin/cf-private/setup-hook.sh @@ -6,7 +6,7 @@ linkWithRealCF() { # gross! many symbols (such as _OBJC_CLASS_$_NSArray) are defined in system CF, but not # in the opensource release # if the package needs private headers, we assume they also want to link with system CF - NIX_LDFLAGS+=" /System/Library/Frameworks/CoreFoundation.framework/CoreFoundation" + NIX_LDFLAGS+=" /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation" } preConfigureHooks+=(prependSearchPath linkWithRealCF) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 62c883b6ab8..46b749f55e8 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -8,6 +8,12 @@ , ibmSupport ? true # IBM/Lenovo notebooks # optional features with extra dependencies + +# ouch, this is ugly, but this gives the man page +, docsSupport ? true, docbook2x, libxslt ? null + , man ? null, less ? null + , docbook_xsl ? null , docbook_xml_dtd_44 ? null + , ncursesSupport ? true , ncurses ? null , x11Support ? true , xlibsWrapper ? null , xdamageSupport ? x11Support, libXdamage ? null @@ -27,6 +33,10 @@ , libxml2 ? null }: +assert docsSupport -> docbook2x != null && libxslt != null + && man != null && less != null + && docbook_xsl != null && docbook_xml_dtd_44 != null; + assert ncursesSupport -> ncurses != null; assert x11Support -> xlibsWrapper != null; @@ -63,11 +73,20 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \ cmake/ConkyPlatformChecks.cmake + '' + optionalString docsSupport '' + # Drop examples, since they contain non-ASCII characters that break docbook2x :( + sed -i 's/ Example: .*$//' doc/config_settings.xml + + substituteInPlace cmake/Docbook.cmake \ + --replace "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/html/docbook.xsl" + substituteInPlace doc/docs.xml \ + --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd" ''; NIX_LDFLAGS = "-lgcc_s"; buildInputs = [ pkgconfig glib cmake ] + ++ optionals docsSupport [ docbook2x libxslt man less ] ++ optional ncursesSupport ncurses ++ optional x11Support xlibsWrapper ++ optional xdamageSupport libXdamage @@ -82,6 +101,7 @@ stdenv.mkDerivation rec { ; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] + ++ optional docsSupport "-DMAINTAINER_MODE=ON" ++ optional curlSupport "-DBUILD_CURL=ON" ++ optional (!ibmSupport) "-DBUILD_IBM=OFF" ++ optional imlib2Support "-DBUILD_IMLIB2=ON" diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index 196167667e0..7a341b9e82b 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,9 +1,9 @@ { fetchzip }: rec { - version = "3.3.2"; + version = "3.4.2"; src = fetchzip { url = "https://www.jool.mx/download/Jool-${version}.zip"; - sha256 = "0hc6vlxzmjrgf7vjcwprdqcbx3biq8kphks5k725mrd9rb84drgw"; + sha256 = "1qv7wwipylb76n8m8vphbf9rgxrryb42dsyw6mm43zjc9knsz7r0"; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index afb4437459b..987452618f0 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.56"; + version = "3.14.58"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1ggvjrz51nfhj7amn3v2nd0b0x8dnz68k9cldzl729cqp9gsc3hf"; + sha256 = "0jw1023cpn4bjmi0db86lrxri9xj75cj8p2iqs44jabvh35idl7l"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 3a57839b85c..54ad2183382 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4-rc1"; - modDirVersion = "4.4.0-rc1"; + version = "4.4-rc4"; + modDirVersion = "4.4.0-rc4"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "05zz8vvkd2jm3l19vydz627lmhc6zvhh5v9ij5hrh8m6g3zhyfga"; + sha256 = "040ddm61rifscssnycd1lq9bfni3yrsdrrgg172rb9h5d7ya6981"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 0af936aa703..4ca3f978798 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -12,14 +12,14 @@ assert stdenv.isLinux; assert pythonSupport -> pythonPackages != null; stdenv.mkDerivation rec { - version = "227"; + version = "228"; name = "systemd-${version}"; src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "7d94d27801d20278103d8c146633fe81e06697d6"; - sha256 = "0cvzsrazqgbia3zajb0z4ik8myfil4bdy2c29qs6w93d6yvrjfkj"; + rev = "17c30663f79499ad0163c7ffe2c79e5c28525a6f"; + sha256 = "0jyqwqyh7l2qp7k4h83gzzp9bgijz0bx02jhd0063jcl1s2amlnh"; }; patches = [ ./hwdb-location.diff ]; @@ -57,13 +57,13 @@ stdenv.mkDerivation rec { "--enable-compat-libs" # get rid of this eventually "--disable-tests" - "--disable-hostnamed" + "--enable-hostnamed" "--enable-networkd" "--disable-sysusers" - "--disable-timedated" + "--enable-timedated" "--enable-timesyncd" "--disable-firstboot" - "--disable-localed" + "--enable-localed" "--enable-resolved" "--disable-split-usr" "--disable-libcurl" diff --git a/pkgs/servers/certificate-transparency/default.nix b/pkgs/servers/certificate-transparency/default.nix new file mode 100644 index 00000000000..ebfa7427fc0 --- /dev/null +++ b/pkgs/servers/certificate-transparency/default.nix @@ -0,0 +1,57 @@ +{ stdenv, pkgs, ...}: + +stdenv.mkDerivation rec { + name = "certificate-transparency-${version}"; + + version = "2015-11-27"; + rev = "dc5a51e55af989ff5871a6647166d00d0de478ab"; + + meta = with stdenv.lib; { + homepage = https://www.certificate-transparency.org/; + description = "Auditing for TLS certificates."; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ philandstuff ]; + }; + + src = pkgs.fetchFromGitHub { + owner = "google"; + repo = "certificate-transparency"; + rev = rev; + sha256 = "14sgc2kcjjsnrykwcjin21h1f3v4kg83w6jqiq9qdm1ha165yhvx"; + }; + + # need to disable regex support in evhtp or building will fail + libevhtp_without_regex = stdenv.lib.overrideDerivation pkgs.libevhtp + (oldAttrs: { + cmakeFlags="-DEVHTP_DISABLE_REGEX:STRING=ON -DCMAKE_C_FLAGS:STRING=-fPIC"; + }); + + buildInputs = with pkgs; [ + autoconf automake clang_34 pkgconfig + glog gmock google-gflags gperftools gtest json_c leveldb + libevent libevhtp_without_regex openssl protobuf sqlite + ]; + + patches = [ + ./protobuf-include-from-env.patch + ]; + + doCheck = false; + + preConfigure = '' + ./autogen.sh + configureFlagsArray=( + CC=clang + CXX=clang++ + GMOCK_DIR=${pkgs.gmock} + GTEST_DIR=${pkgs.gtest} + ) + ''; + + # the default Makefile constructs BUILD_VERSION from `git describe` + # which isn't available in the nix build environment + makeFlags = "BUILD_VERSION=${version}-${rev}"; + + protocFlags = "-I ${pkgs.protobuf}/include"; +} diff --git a/pkgs/servers/certificate-transparency/protobuf-include-from-env.patch b/pkgs/servers/certificate-transparency/protobuf-include-from-env.patch new file mode 100644 index 00000000000..a1f9a1849b6 --- /dev/null +++ b/pkgs/servers/certificate-transparency/protobuf-include-from-env.patch @@ -0,0 +1,14 @@ +Get protobuf include path from environment + +--- a/python/Makefile ++++ b/python/Makefile +@@ -5,7 +5,7 @@ all: ct/proto/client_pb2.py ct/proto/ct_pb2.py ct/proto/tls_options_pb2.py \ + ct/proto/test_message_pb2.py ct/proto/certificate_pb2.py + + ct/proto/%_pb2.py: ct/proto/%.proto +- $(PROTOC) $^ -I/usr/include/ -I/usr/local/include -I$(INSTALL_DIR)/include -I. --python_out=. ++ $(PROTOC) $^ $(protocFlags) -I. --python_out=. + + ct/proto/ct_pb2.py: ../proto/ct.proto + $(PROTOC) --python_out=ct/proto -I../proto ../proto/ct.proto + diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index c61bb0ca51e..00b3c6a9d6a 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -71,8 +71,8 @@ src = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; - rev = "v0.9.16"; - sha256 = "0dvdam228jhsrayb22ishljdkgib08bakh8ygn84sq0c2xbidzlp"; + rev = "v0.9.19"; + sha256 = "13h58rzdfhc5kc4xqwrd2p34rgnwim4hikq923cnfz1p2bvlddrf"; }; inputs = [ pkgs.luajit ]; preConfigure = '' diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index 5ef42a7aa43..4fc513a1173 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -7,10 +7,10 @@ with stdenv.lib; let - version = "1.9.4"; + version = "1.9.7"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "1a1bixw2a4s5c3qzw3583s4a4y6i0sdzhihhlbab5rkyfh1hr6s7"; + sha256 = "1ma82wfg9akghx1cnzfmz4nplf0zjv1rk49x4v3f3z7xmwbx4jvr"; }; in @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-http_ssl_module" - "--with-http_spdy_module" + "--with-http_v2_module" "--with-http_realip_module" "--with-http_addition_module" "--with-http_xslt_module" diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index 2ad6dedbf69..8955f40e565 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mlmmj-${version}"; - version = "1.2.18.1"; + version = "1.2.19.0"; src = fetchurl { url = "http://mlmmj.org/releases/${name}.tar.gz"; - sha256 = "336b6b20a6d7f0dcdc7445ecea0fe4bdacee241f624fcc710b4341780f35e383"; + sha256 = "18n7b41nfdj7acvmqzkkz984d26xvz14xk8kmrnzv23dkda364m0"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 41e3b547f70..82d18091050 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = http://www.musicpd.org/libs/libmpdclient/; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ mornfall emery ]; + maintainers = with maintainers; [ mornfall ehmry ]; }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index bf968ae4b39..b672083340e 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -21,7 +21,7 @@ , jackSupport ? true, libjack2 , gmeSupport ? true, game-music-emu , icuSupport ? true, icu -, clientSupport ? false, mpd_clientlib +, clientSupport ? true, mpd_clientlib , opusSupport ? true, libopus }: @@ -107,7 +107,7 @@ in stdenv.mkDerivation rec { description = "A flexible, powerful daemon for playing music"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; license = licenses.gpl2; - maintainers = with maintainers; [ astsmtl fuuzetsu emery ]; + maintainers = with maintainers; [ astsmtl fuuzetsu ehmry ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index a0500e899b4..cac8eb3fba8 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -11,8 +11,8 @@ let - version = "2.1.11"; - sha256 = "1jiikznjhyyh23xw02amzccr15c8wmz94yxah9qxagbfg9wn7j2j"; + version = "2.1.12"; + sha256 = "0ngibzw7lx2nppzsq5hn6adbkyzns6bnhsrkllqpimyjf27sjfq1"; in diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix index 449eee556c1..0351df9718b 100644 --- a/pkgs/servers/owncloud/default.nix +++ b/pkgs/servers/owncloud/default.nix @@ -1,28 +1,59 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { - name= "owncloud-${version}"; - version = "7.0.5"; +let + common = { versiona, sha256 } @ args: stdenv.mkDerivation (rec { - src = fetchurl { - url = "https://download.owncloud.org/community/${name}.tar.bz2"; + name= "owncloud-${version}"; + version= versiona; + + src = fetchurl { + url = "https://download.owncloud.org/community/${name}.tar.bz2"; + inherit sha256; + }; + + installPhase = + '' + mkdir -p $out + find . -maxdepth 1 -execdir cp -r '{}' $out \; + + substituteInPlace $out/lib/base.php \ + --replace 'OC_Config::$object = new \OC\Config(self::$configDir);' \ + 'self::$configDir = getenv("OC_CONFIG_PATH"); OC_Config::$object = new \OC\Config(self::$configDir);' + ''; + + meta = { + description = "An enterprise file sharing solution for online collaboration and storage"; + homepage = https://owncloud.org; + maintainers = with stdenv.lib.maintainers; [ matejc ]; + license = stdenv.lib.licenses.agpl3Plus; + }; + + }); + +in { + + owncloud705 = common { + versiona = "7.0.5"; sha256 = "1j21b7ljvbhni9l0b1cpzlhsjy36scyas1l1j222mqdg2srfsi9y"; }; - installPhase = - '' - mkdir -p $out - find . -maxdepth 1 -execdir cp -r '{}' $out \; + owncloud70 = common { + versiona = "7.0.11"; + sha256 = "21dd75de4ed832f16f577eb6763d04c663ef13251153ba2e8847e3f5799d2ad2"; + }; - substituteInPlace $out/lib/base.php \ - --replace 'OC_Config::$object = new \OC\Config(self::$configDir);' \ - 'self::$configDir = getenv("OC_CONFIG_PATH"); OC_Config::$object = new \OC\Config(self::$configDir);' - ''; + owncloud80 = common { + versiona = "8.0.9"; + sha256 = "0c1f915f4123dbe07d564cf0172930568690ab5257d2fca4fec4ec515858bef1"; + }; - meta = { - description = "An enterprise file sharing solution for online collaboration and storage"; - homepage = https://owncloud.org; - maintainers = with stdenv.lib.maintainers; [ matejc ]; - license = stdenv.lib.licenses.agpl3Plus; + owncloud81 = common { + versiona = "8.1.4"; + sha256 = "e0f4bf0c85821fc1b6e7f6268080ad3ca3e98c41baa68a9d616809d74a77312d"; + }; + + owncloud82 = common { + versiona = "8.2.1"; + sha256 = "5390b2172562a5bf97a46e9a621d1dd92f9b74efaccbb77978c39eb90d6988d4"; }; } diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix index 08ccbbd06c6..1ca18d7d3a7 100644 --- a/pkgs/servers/polipo/default.nix +++ b/pkgs/servers/polipo/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = http://www.pps.jussieu.fr/~jch/software/polipo/; description = "A small and fast caching web proxy"; license = licenses.mit; - maintainers = with maintainers; [ phreedom emery ]; + maintainers = with maintainers; [ phreedom ehmry ]; platforms = platforms.all; }; } \ No newline at end of file diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 808f181442a..7f9f08af002 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ripple P2P payment network reference server"; homepage = https://ripple.com; - maintainers = with maintainers; [ emery offline ]; + maintainers = with maintainers; [ ehmry offline ]; license = licenses.isc; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index 37a546770a0..ed859ac344b 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pam, openssl, openssh, shadow, makeWrapper }: stdenv.mkDerivation rec { - version = "2.16"; + version = "2.19"; name = "shellinabox-${version}"; src = fetchFromGitHub { owner = "shellinabox"; repo = "shellinabox"; - rev = "8ac3a4efcf20f7b66d3f1eb1d4f3054aef6e196b"; - sha256 = "1pp6nk0279d2q7l1cvx8jc73skfjv0s42wxb2m00x0bg9i1fvs5j"; + rev = "1a8010f2c94a62e7398c4fa130dfe9e099dc55cd"; + sha256 = "16cr7gbnh6vzsxlhg9j9avqrxbhbkqhsbvh197b0ccdwbb04ysan"; }; patches = [ ./shellinabox-minus.patch ]; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index c04ac7372c1..f23a8f422b3 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mariadb-${version}"; - version = "10.1.8"; + version = "10.1.9"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "1yiv0161rkgll1yd9r1cb1wdx55rwynj8i623p6wjvda9536mgvw"; + sha256 = "0471vwg9c5c17m7679krjha16ib6d48fcsphkchb9v9cf8k5i74f"; }; buildInputs = [ diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index e60a74eaf89..b42fe004af3 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { { description = "Serve 9P from Unix"; homepage = http://plan9.bell-labs.com/magic/man2html/4/u9fs; license = licenses.free; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index a6e0d474d89..0d276c18f2d 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { description = "High performance peer-to-peer hub for the ADC network"; homepage = https://www.uhub.org/; license = licenses.gpl3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; }; } \ No newline at end of file diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix new file mode 100644 index 00000000000..4151144e3ab --- /dev/null +++ b/pkgs/servers/ums/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, makeWrapper +, libzen, libmediainfo , jre8 +}: + +stdenv.mkDerivation rec { + name = "ums-${version}"; + version = "5.3.1"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz"; + sha256 = "197lrfqk4n6fffrabj0607a9a5wc1j662s46anc0mkyqbb4r3avh"; + name = "${name}-${version}.tgz"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + cp -a . $out/ + mkdir $out/bin + mv $out/documentation /$out/doc + + makeWrapper "$out/UMS.sh" "$out/bin/ums" \ + --prefix LD_LIBRARY_PATH ":" "${libzen}/lib:${libmediainfo}/lib" \ + --set JAVA_HOME "${jre8}" + ''; + + meta = { + description = "Universal Media Server: a DLNA-compliant UPnP Media Server."; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thall ]; + }; +} diff --git a/pkgs/servers/web-apps/pump.io/default.nix b/pkgs/servers/web-apps/pump.io/default.nix new file mode 100644 index 00000000000..2d376593662 --- /dev/null +++ b/pkgs/servers/web-apps/pump.io/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchFromGitHub, makeWrapper, callPackage, nodejs, python, utillinux, graphicsmagick }: + +with stdenv.lib; + +let + nodePackages = callPackage (import ../../../top-level/node-packages.nix) { + inherit stdenv nodejs fetchurl fetchgit; + neededNatives = [ python ] ++ optional stdenv.isLinux utillinux; + self = nodePackages; + generated = ./node-packages.nix; + }; + +in nodePackages.buildNodePackage rec { + version = "git-2015-11-09"; + name = "pump.io-${version}"; + + src = fetchFromGitHub { + owner = "e14n"; + repo = "pump.io"; + rev = "2f8d6b3518607ed02b594aee0db6ccacbe631b2d"; + sha256 = "1xym3jzpxlni1n2i0ixwrnpkx5fbnd1p6sm1hf9n3w5m2lx6gdw5"; + }; + + deps = (filter (v: nixType v == "derivation") (attrValues nodePackages)); + + buildInputs = [ makeWrapper ]; + + postInstall = '' + for prog in pump pump-authorize pump-follow pump-post-note pump-register-app pump-register-user pump-stop-following; do + wrapProgram "$out/bin/$prog" \ + --set NODE_PATH "$out/lib/node_modules/pump.io/node_modules/" \ + --prefix PATH : ${graphicsmagick}/bin:$out/bin + done + ''; + + passthru.names = ["pump.io"]; + + meta = { + description = "Social server with an ActivityStreams API"; + homepage = http://pump.io/; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.rvl ]; + longDescription = '' + This is pump.io. It's a stream server that does most of what + people really want from a social network. + + What's it for? + + I post something and my followers see it. That's the rough idea + behind the pump. + + There's an API defined in the API.md file. It uses + activitystrea.ms JSON as the main data and command format. + + You can post almost anything that can be represented with + activity streams -- short or long text, bookmarks, images, + video, audio, events, geo checkins. You can follow friends, + create lists of people, and so on. + + The software is useful for at least these scenarios: + + * Mobile-first social networking + * Activity stream functionality for an existing app + * Experimenting with social software + ''; + }; +} diff --git a/pkgs/servers/web-apps/pump.io/node-packages.json b/pkgs/servers/web-apps/pump.io/node-packages.json new file mode 100644 index 00000000000..10d50a0c72e --- /dev/null +++ b/pkgs/servers/web-apps/pump.io/node-packages.json @@ -0,0 +1,36 @@ +{ + "name": "pump.io", + "dependencies": { + "bcrypt": "0.8.x", + "bunyan": "0.16.x", + "connect": "1.x", + "connect-auth": "0.5.3", + "connect-databank": "0.13.x", + "crypto-cacerts": "0.1.x", + "databank": "0.19.x", + "databank-lrucache": "^0.1.2", + "databank-memcached": "^0.15.0", + "databank-mongodb": "^0.18.10", + "databank-redis": "^0.19.6", + "dateformat": "1.x", + "dialback-client": "~0.1.5", + "emailjs": "0.3.x", + "express": "2.5.x", + "gm": "1.9.x", + "jankyqueue": "0.1.x", + "mkdirp": "0.3.x", + "node-uuid": "1.3.x", + "oauth-evanp": "~0.9.10-evanp.2", + "optimist": "0.3.x", + "schlock": "~0.2.1", + "set-immediate": "0.1.x", + "showdown": "0.3.x", + "sockjs": "0.3.x", + "step": "0.0.x", + "underscore": "1.4.x", + "underscore-contrib": "0.1.x", + "utml": "0.2.x", + "validator": "0.4.x", + "webfinger": "~0.4.2" + } +} diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix new file mode 100644 index 00000000000..4d6272511aa --- /dev/null +++ b/pkgs/servers/web-apps/pump.io/node-packages.nix @@ -0,0 +1,2734 @@ +{ self, fetchurl, fetchgit ? null, lib }: + +{ + by-spec."addressparser"."^0.3.2" = + self.by-version."addressparser"."0.3.2"; + by-version."addressparser"."0.3.2" = self.buildNodePackage { + name = "addressparser-0.3.2"; + version = "0.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"; + name = "addressparser-0.3.2.tgz"; + sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."addressparser"."~0.2.0" = + self.by-version."addressparser"."0.2.1"; + by-version."addressparser"."0.2.1" = self.buildNodePackage { + name = "addressparser-0.2.1"; + version = "0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz"; + name = "addressparser-0.2.1.tgz"; + sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."array-parallel"."~0.1.0" = + self.by-version."array-parallel"."0.1.3"; + by-version."array-parallel"."0.1.3" = self.buildNodePackage { + name = "array-parallel-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz"; + name = "array-parallel-0.1.3.tgz"; + sha1 = "8f785308926ed5aa478c47e64d1b334b6c0c947d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."array-series"."~0.1.0" = + self.by-version."array-series"."0.1.5"; + by-version."array-series"."0.1.5" = self.buildNodePackage { + name = "array-series-0.1.5"; + version = "0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz"; + name = "array-series-0.1.5.tgz"; + sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."0.2.x" = + self.by-version."async"."0.2.10"; + by-version."async"."0.2.10" = self.buildNodePackage { + name = "async-0.2.10"; + version = "0.2.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + name = "async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."0.9.x" = + self.by-version."async"."0.9.2"; + by-version."async"."0.9.2" = self.buildNodePackage { + name = "async-0.9.2"; + version = "0.9.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; + name = "async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bcrypt"."0.8.x" = + self.by-version."bcrypt"."0.8.5"; + by-version."bcrypt"."0.8.5" = self.buildNodePackage { + name = "bcrypt-0.8.5"; + version = "0.8.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.8.5.tgz"; + name = "bcrypt-0.8.5.tgz"; + sha1 = "8e5b81b4db80e944f440005979ca8d58a961861d"; + }; + deps = { + "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; + "nan-2.0.5" = self.by-version."nan"."2.0.5"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "bcrypt" = self.by-version."bcrypt"."0.8.5"; + by-spec."bindings"."1.2.1" = + self.by-version."bindings"."1.2.1"; + by-version."bindings"."1.2.1" = self.buildNodePackage { + name = "bindings-1.2.1"; + version = "1.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + name = "bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bisection"."*" = + self.by-version."bisection"."0.0.3"; + by-version."bisection"."0.0.3" = self.buildNodePackage { + name = "bisection-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bisection/-/bisection-0.0.3.tgz"; + name = "bisection-0.0.3.tgz"; + sha1 = "9891d506d86ec7d50910c5157bb592dbb03f33db"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bson"."~0.2" = + self.by-version."bson"."0.2.22"; + by-version."bson"."0.2.22" = self.buildNodePackage { + name = "bson-0.2.22"; + version = "0.2.22"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bson/-/bson-0.2.22.tgz"; + name = "bson-0.2.22.tgz"; + sha1 = "fcda103f26d0c074d5a52d50927db80fd02b4b39"; + }; + deps = { + "nan-1.8.4" = self.by-version."nan"."1.8.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bufferjs"."=1.1.0" = + self.by-version."bufferjs"."1.1.0"; + by-version."bufferjs"."1.1.0" = self.buildNodePackage { + name = "bufferjs-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bufferjs/-/bufferjs-1.1.0.tgz"; + name = "bufferjs-1.1.0.tgz"; + sha1 = "095ffa39c5e6b40a2178a1169c9effc584a73201"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."builtin-modules"."^1.0.0" = + self.by-version."builtin-modules"."1.1.0"; + by-version."builtin-modules"."1.1.0" = self.buildNodePackage { + name = "builtin-modules-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"; + name = "builtin-modules-1.1.0.tgz"; + sha1 = "1053955fd994a5746e525e4ac717b81caf07491c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bunyan"."0.16.x" = + self.by-version."bunyan"."0.16.8"; + by-version."bunyan"."0.16.8" = self.buildNodePackage { + name = "bunyan-0.16.8"; + version = "0.16.8"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/bunyan/-/bunyan-0.16.8.tgz"; + name = "bunyan-0.16.8.tgz"; + sha1 = "3b3f6cdca262fa31aba43eb0eb6fb58e7bdde547"; + }; + deps = { + "dtrace-provider-0.2.4" = self.by-version."dtrace-provider"."0.2.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "bunyan" = self.by-version."bunyan"."0.16.8"; + by-spec."camelcase"."^2.0.0" = + self.by-version."camelcase"."2.0.1"; + by-version."camelcase"."2.0.1" = self.buildNodePackage { + name = "camelcase-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"; + name = "camelcase-2.0.1.tgz"; + sha1 = "57568d687b8da56c4c1d17b4c74a3cee26d73aeb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."camelcase-keys"."^2.0.0" = + self.by-version."camelcase-keys"."2.0.0"; + by-version."camelcase-keys"."2.0.0" = self.buildNodePackage { + name = "camelcase-keys-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz"; + name = "camelcase-keys-2.0.0.tgz"; + sha1 = "ab87e740d72a1ffcb12a43cc04c14b39d549eab9"; + }; + deps = { + "camelcase-2.0.1" = self.by-version."camelcase"."2.0.1"; + "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."connect"."1.x" = + self.by-version."connect"."1.9.2"; + by-version."connect"."1.9.2" = self.buildNodePackage { + name = "connect-1.9.2"; + version = "1.9.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; + name = "connect-1.9.2.tgz"; + sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; + }; + deps = { + "qs-6.0.1" = self.by-version."qs"."6.0.1"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; + "formidable-1.0.17" = self.by-version."formidable"."1.0.17"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "connect" = self.by-version."connect"."1.9.2"; + by-spec."connect"."2.0.0" = + self.by-version."connect"."2.0.0"; + by-version."connect"."2.0.0" = self.buildNodePackage { + name = "connect-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-2.0.0.tgz"; + name = "connect-2.0.0.tgz"; + sha1 = "be0f8fcee7c1a0e2caa2e246a278dbbe250b9f27"; + }; + deps = { + "qs-0.4.2" = self.by-version."qs"."0.4.2"; + "mime-1.2.4" = self.by-version."mime"."1.2.4"; + "formidable-1.0.17" = self.by-version."formidable"."1.0.17"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."connect-auth"."0.5.3" = + self.by-version."connect-auth"."0.5.3"; + by-version."connect-auth"."0.5.3" = self.buildNodePackage { + name = "connect-auth-0.5.3"; + version = "0.5.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connect-auth/-/connect-auth-0.5.3.tgz"; + name = "connect-auth-0.5.3.tgz"; + sha1 = "2af00ac6f67ac1c5f451a0ff841a8d20a725091e"; + }; + deps = { + "connect-2.0.0" = self.by-version."connect"."2.0.0"; + "oauth-0.9.7" = self.by-version."oauth"."0.9.7"; + "openid-0.4.1" = self.by-version."openid"."0.4.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "connect-auth" = self.by-version."connect-auth"."0.5.3"; + by-spec."connect-databank"."0.13.x" = + self.by-version."connect-databank"."0.13.0"; + by-version."connect-databank"."0.13.0" = self.buildNodePackage { + name = "connect-databank-0.13.0"; + version = "0.13.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/connect-databank/-/connect-databank-0.13.0.tgz"; + name = "connect-databank-0.13.0.tgz"; + sha1 = "0d5063e9402381073e0242fd7c6ef28b2d61676b"; + }; + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; + "databank-0.19.1" = self.by-version."databank"."0.19.1"; + "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; + "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "connect-databank" = self.by-version."connect-databank"."0.13.0"; + by-spec."core-util-is"."~1.0.0" = + self.by-version."core-util-is"."1.0.2"; + by-version."core-util-is"."1.0.2" = self.buildNodePackage { + name = "core-util-is-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + name = "core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."crypto-cacerts"."0.1.x" = + self.by-version."crypto-cacerts"."0.1.0"; + by-version."crypto-cacerts"."0.1.0" = self.buildNodePackage { + name = "crypto-cacerts-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/crypto-cacerts/-/crypto-cacerts-0.1.0.tgz"; + name = "crypto-cacerts-0.1.0.tgz"; + sha1 = "3499c6dff949ab005d4ad4a3f09c48ced6c88a41"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "crypto-cacerts" = self.by-version."crypto-cacerts"."0.1.0"; + by-spec."databank"."0.18.x" = + self.by-version."databank"."0.18.2"; + by-version."databank"."0.18.2" = self.buildNodePackage { + name = "databank-0.18.2"; + version = "0.18.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/databank/-/databank-0.18.2.tgz"; + name = "databank-0.18.2.tgz"; + sha1 = "b1f85bafa329cdb415589c0ee819a04c989a03ed"; + }; + deps = { + "vows-0.7.0" = self.by-version."vows"."0.7.0"; + "step-0.0.6" = self.by-version."step"."0.0.6"; + "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."databank"."0.19.x" = + self.by-version."databank"."0.19.1"; + by-version."databank"."0.19.1" = self.buildNodePackage { + name = "databank-0.19.1"; + version = "0.19.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/databank/-/databank-0.19.1.tgz"; + name = "databank-0.19.1.tgz"; + sha1 = "95c6f662927b891f62c6f07fefe5e690fbe666e0"; + }; + deps = { + "vows-0.7.0" = self.by-version."vows"."0.7.0"; + "step-0.0.6" = self.by-version."step"."0.0.6"; + "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "databank" = self.by-version."databank"."0.19.1"; + by-spec."databank"."~0.19.1" = + self.by-version."databank"."0.19.1"; + by-spec."databank-lrucache"."^0.1.2" = + self.by-version."databank-lrucache"."0.1.2"; + by-version."databank-lrucache"."0.1.2" = self.buildNodePackage { + name = "databank-lrucache-0.1.2"; + version = "0.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.2.tgz"; + name = "databank-lrucache-0.1.2.tgz"; + sha1 = "846d3bbc3d908ea2880baf9a611d86a28697c640"; + }; + deps = { + "databank-0.19.1" = self.by-version."databank"."0.19.1"; + "underscore-1.5.2" = self.by-version."underscore"."1.5.2"; + "lru-cache-2.3.1" = self.by-version."lru-cache"."2.3.1"; + "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "databank-lrucache" = self.by-version."databank-lrucache"."0.1.2"; + by-spec."databank-memcached"."^0.15.0" = + self.by-version."databank-memcached"."0.15.0"; + by-version."databank-memcached"."0.15.0" = self.buildNodePackage { + name = "databank-memcached-0.15.0"; + version = "0.15.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/databank-memcached/-/databank-memcached-0.15.0.tgz"; + name = "databank-memcached-0.15.0.tgz"; + sha1 = "0817452dfb2b09267cd1c8bbec95363ec14f14f2"; + }; + deps = { + "memcached-0.2.8" = self.by-version."memcached"."0.2.8"; + "databank-0.18.2" = self.by-version."databank"."0.18.2"; + "step-0.0.6" = self.by-version."step"."0.0.6"; + "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "databank-memcached" = self.by-version."databank-memcached"."0.15.0"; + by-spec."databank-mongodb"."^0.18.10" = + self.by-version."databank-mongodb"."0.18.10"; + by-version."databank-mongodb"."0.18.10" = self.buildNodePackage { + name = "databank-mongodb-0.18.10"; + version = "0.18.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/databank-mongodb/-/databank-mongodb-0.18.10.tgz"; + name = "databank-mongodb-0.18.10.tgz"; + sha1 = "5f9d37059d024f1116bdca05459f9c033b0d8ae5"; + }; + deps = { + "databank-0.19.1" = self.by-version."databank"."0.19.1"; + "mongodb-1.4.39" = self.by-version."mongodb"."1.4.39"; + "step-0.0.6" = self.by-version."step"."0.0.6"; + "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "databank-mongodb" = self.by-version."databank-mongodb"."0.18.10"; + by-spec."databank-redis"."^0.19.6" = + self.by-version."databank-redis"."0.19.6"; + by-version."databank-redis"."0.19.6" = self.buildNodePackage { + name = "databank-redis-0.19.6"; + version = "0.19.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/databank-redis/-/databank-redis-0.19.6.tgz"; + name = "databank-redis-0.19.6.tgz"; + sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9"; + }; + deps = { + "async-0.9.2" = self.by-version."async"."0.9.2"; + "databank-0.19.1" = self.by-version."databank"."0.19.1"; + "redis-0.10.3" = self.by-version."redis"."0.10.3"; + "underscore-1.6.0" = self.by-version."underscore"."1.6.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "databank-redis" = self.by-version."databank-redis"."0.19.6"; + by-spec."dateformat"."1.x" = + self.by-version."dateformat"."1.0.12"; + by-version."dateformat"."1.0.12" = self.buildNodePackage { + name = "dateformat-1.0.12"; + version = "1.0.12"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; + name = "dateformat-1.0.12.tgz"; + sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; + }; + deps = { + "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; + "meow-3.6.0" = self.by-version."meow"."3.6.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "dateformat" = self.by-version."dateformat"."1.0.12"; + by-spec."debug"."*" = + self.by-version."debug"."2.2.0"; + by-version."debug"."2.2.0" = self.buildNodePackage { + name = "debug-2.2.0"; + version = "2.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + name = "debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + deps = { + "ms-0.7.1" = self.by-version."ms"."0.7.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."debug"."0.7.0" = + self.by-version."debug"."0.7.0"; + by-version."debug"."0.7.0" = self.buildNodePackage { + name = "debug-0.7.0"; + version = "0.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-0.7.0.tgz"; + name = "debug-0.7.0.tgz"; + sha1 = "f5be05ec0434c992d79940e50b2695cfb2e01b08"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."dialback-client"."~0.1.5" = + self.by-version."dialback-client"."0.1.5"; + by-version."dialback-client"."0.1.5" = self.buildNodePackage { + name = "dialback-client-0.1.5"; + version = "0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/dialback-client/-/dialback-client-0.1.5.tgz"; + name = "dialback-client-0.1.5.tgz"; + sha1 = "ff37f58554ac7dca79a219ba3e6e7c5ed4cc0745"; + }; + deps = { + "express-2.5.11" = self.by-version."express"."2.5.11"; + "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; + "databank-0.18.2" = self.by-version."databank"."0.18.2"; + "step-0.0.6" = self.by-version."step"."0.0.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "dialback-client" = self.by-version."dialback-client"."0.1.5"; + by-spec."diff"."~1.0.3" = + self.by-version."diff"."1.0.8"; + by-version."diff"."1.0.8" = self.buildNodePackage { + name = "diff-1.0.8"; + version = "1.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; + name = "diff-1.0.8.tgz"; + sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."dtrace-provider"."0.2.4" = + self.by-version."dtrace-provider"."0.2.4"; + by-version."dtrace-provider"."0.2.4" = self.buildNodePackage { + name = "dtrace-provider-0.2.4"; + version = "0.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.4.tgz"; + name = "dtrace-provider-0.2.4.tgz"; + sha1 = "0719d4449c8994cc89e317cf0d732213f94653d7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."emailjs"."0.3.x" = + self.by-version."emailjs"."0.3.16"; + by-version."emailjs"."0.3.16" = self.buildNodePackage { + name = "emailjs-0.3.16"; + version = "0.3.16"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/emailjs/-/emailjs-0.3.16.tgz"; + name = "emailjs-0.3.16.tgz"; + sha1 = "f162735352ce7b6615a5d811714051f90f23331d"; + }; + deps = { + "addressparser-0.3.2" = self.by-version."addressparser"."0.3.2"; + "mimelib-0.2.14" = self.by-version."mimelib"."0.2.14"; + "moment-1.7.0" = self.by-version."moment"."1.7.0"; + "starttls-0.2.1" = self.by-version."starttls"."0.2.1"; + }; + optionalDependencies = { + "bufferjs-1.1.0" = self.by-version."bufferjs"."1.1.0"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "emailjs" = self.by-version."emailjs"."0.3.16"; + by-spec."encoding"."~0.1" = + self.by-version."encoding"."0.1.11"; + by-version."encoding"."0.1.11" = self.buildNodePackage { + name = "encoding-0.1.11"; + version = "0.1.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/encoding/-/encoding-0.1.11.tgz"; + name = "encoding-0.1.11.tgz"; + sha1 = "52c65ac15aab467f1338451e2615f988eccc0258"; + }; + deps = { + "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."error-ex"."^1.2.0" = + self.by-version."error-ex"."1.3.0"; + by-version."error-ex"."1.3.0" = self.buildNodePackage { + name = "error-ex-1.3.0"; + version = "1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"; + name = "error-ex-1.3.0.tgz"; + sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9"; + }; + deps = { + "is-arrayish-0.2.1" = self.by-version."is-arrayish"."0.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."express"."2.5.x" = + self.by-version."express"."2.5.11"; + by-version."express"."2.5.11" = self.buildNodePackage { + name = "express-2.5.11"; + version = "2.5.11"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz"; + name = "express-2.5.11.tgz"; + sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; + }; + deps = { + "connect-1.9.2" = self.by-version."connect"."1.9.2"; + "mime-1.2.4" = self.by-version."mime"."1.2.4"; + "qs-0.4.2" = self.by-version."qs"."0.4.2"; + "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "express" = self.by-version."express"."2.5.11"; + by-spec."eyes".">=0.1.6" = + self.by-version."eyes"."0.1.8"; + by-version."eyes"."0.1.8" = self.buildNodePackage { + name = "eyes-0.1.8"; + version = "0.1.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + name = "eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."faye-websocket"."^0.9.3" = + self.by-version."faye-websocket"."0.9.4"; + by-version."faye-websocket"."0.9.4" = self.buildNodePackage { + name = "faye-websocket-0.9.4"; + version = "0.9.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.4.tgz"; + name = "faye-websocket-0.9.4.tgz"; + sha1 = "885934c79effb0409549e0c0a3801ed17a40cdad"; + }; + deps = { + "websocket-driver-0.6.3" = self.by-version."websocket-driver"."0.6.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."find-up"."^1.0.0" = + self.by-version."find-up"."1.1.0"; + by-version."find-up"."1.1.0" = self.buildNodePackage { + name = "find-up-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz"; + name = "find-up-1.1.0.tgz"; + sha1 = "a63b0eec4625a2902534898a5f9eec8aaed046e9"; + }; + deps = { + "path-exists-2.1.0" = self.by-version."path-exists"."2.1.0"; + "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."formidable"."1.0.x" = + self.by-version."formidable"."1.0.17"; + by-version."formidable"."1.0.17" = self.buildNodePackage { + name = "formidable-1.0.17"; + version = "1.0.17"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; + name = "formidable-1.0.17.tgz"; + sha1 = "ef5491490f9433b705faa77249c99029ae348559"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."get-stdin"."^4.0.1" = + self.by-version."get-stdin"."4.0.1"; + by-version."get-stdin"."4.0.1" = self.buildNodePackage { + name = "get-stdin-4.0.1"; + version = "4.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + name = "get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."gm"."1.9.x" = + self.by-version."gm"."1.9.2"; + by-version."gm"."1.9.2" = self.buildNodePackage { + name = "gm-1.9.2"; + version = "1.9.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/gm/-/gm-1.9.2.tgz"; + name = "gm-1.9.2.tgz"; + sha1 = "00443279fe959a10fa23025e0c8401e710215845"; + }; + deps = { + "debug-0.7.0" = self.by-version."debug"."0.7.0"; + "array-series-0.1.5" = self.by-version."array-series"."0.1.5"; + "array-parallel-0.1.3" = self.by-version."array-parallel"."0.1.3"; + "through-2.3.8" = self.by-version."through"."2.3.8"; + "stream-to-buffer-0.0.1" = self.by-version."stream-to-buffer"."0.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "gm" = self.by-version."gm"."1.9.2"; + by-spec."graceful-fs"."^4.1.2" = + self.by-version."graceful-fs"."4.1.2"; + by-version."graceful-fs"."4.1.2" = self.buildNodePackage { + name = "graceful-fs-4.1.2"; + version = "4.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"; + name = "graceful-fs-4.1.2.tgz"; + sha1 = "fe2239b7574972e67e41f808823f9bfa4a991e37"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hashring"."0.0.x" = + self.by-version."hashring"."0.0.8"; + by-version."hashring"."0.0.8" = self.buildNodePackage { + name = "hashring-0.0.8"; + version = "0.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hashring/-/hashring-0.0.8.tgz"; + name = "hashring-0.0.8.tgz"; + sha1 = "203ab13c364119f10106526d2eaf7bd42b484c31"; + }; + deps = { + "bisection-0.0.3" = self.by-version."bisection"."0.0.3"; + "simple-lru-cache-0.0.2" = self.by-version."simple-lru-cache"."0.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hosted-git-info"."^2.1.4" = + self.by-version."hosted-git-info"."2.1.4"; + by-version."hosted-git-info"."2.1.4" = self.buildNodePackage { + name = "hosted-git-info-2.1.4"; + version = "2.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"; + name = "hosted-git-info-2.1.4.tgz"; + sha1 = "d9e953b26988be88096c46e926494d9604c300f8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."iconv-lite"."~0.4.4" = + self.by-version."iconv-lite"."0.4.13"; + by-version."iconv-lite"."0.4.13" = self.buildNodePackage { + name = "iconv-lite-0.4.13"; + version = "0.4.13"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; + name = "iconv-lite-0.4.13.tgz"; + sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."indent-string"."^2.1.0" = + self.by-version."indent-string"."2.1.0"; + by-version."indent-string"."2.1.0" = self.buildNodePackage { + name = "indent-string-2.1.0"; + version = "2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; + name = "indent-string-2.1.0.tgz"; + sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; + }; + deps = { + "repeating-2.0.0" = self.by-version."repeating"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."inherits"."~2.0.1" = + self.by-version."inherits"."2.0.1"; + by-version."inherits"."2.0.1" = self.buildNodePackage { + name = "inherits-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + name = "inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-arrayish"."^0.2.1" = + self.by-version."is-arrayish"."0.2.1"; + by-version."is-arrayish"."0.2.1" = self.buildNodePackage { + name = "is-arrayish-0.2.1"; + version = "0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + name = "is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-builtin-module"."^1.0.0" = + self.by-version."is-builtin-module"."1.0.0"; + by-version."is-builtin-module"."1.0.0" = self.buildNodePackage { + name = "is-builtin-module-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; + name = "is-builtin-module-1.0.0.tgz"; + sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; + }; + deps = { + "builtin-modules-1.1.0" = self.by-version."builtin-modules"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-finite"."^1.0.0" = + self.by-version."is-finite"."1.0.1"; + by-version."is-finite"."1.0.1" = self.buildNodePackage { + name = "is-finite-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; + name = "is-finite-1.0.1.tgz"; + sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; + }; + deps = { + "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-utf8"."^0.2.0" = + self.by-version."is-utf8"."0.2.0"; + by-version."is-utf8"."0.2.0" = self.buildNodePackage { + name = "is-utf8-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"; + name = "is-utf8-0.2.0.tgz"; + sha1 = "b8aa54125ae626bfe4e3beb965f16a89c58a1137"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."isarray"."0.0.1" = + self.by-version."isarray"."0.0.1"; + by-version."isarray"."0.0.1" = self.buildNodePackage { + name = "isarray-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + name = "isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."jackpot".">=0.0.6" = + self.by-version."jackpot"."0.0.6"; + by-version."jackpot"."0.0.6" = self.buildNodePackage { + name = "jackpot-0.0.6"; + version = "0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz"; + name = "jackpot-0.0.6.tgz"; + sha1 = "3cff064285cbf66f4eab2593c90bce816a821849"; + }; + deps = { + "retry-0.6.0" = self.by-version."retry"."0.6.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."jankyqueue"."0.1.x" = + self.by-version."jankyqueue"."0.1.1"; + by-version."jankyqueue"."0.1.1" = self.buildNodePackage { + name = "jankyqueue-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jankyqueue/-/jankyqueue-0.1.1.tgz"; + name = "jankyqueue-0.1.1.tgz"; + sha1 = "4181b0318fb32e77aee8c54af73f97660f2e88d2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "jankyqueue" = self.by-version."jankyqueue"."0.1.1"; + by-spec."kerberos"."0.0.11" = + self.by-version."kerberos"."0.0.11"; + by-version."kerberos"."0.0.11" = self.buildNodePackage { + name = "kerberos-0.0.11"; + version = "0.0.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.11.tgz"; + name = "kerberos-0.0.11.tgz"; + sha1 = "cb29891c21c22ac195f3140b97dd12204fea7dc2"; + }; + deps = { + "nan-1.8.4" = self.by-version."nan"."1.8.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."load-json-file"."^1.0.0" = + self.by-version."load-json-file"."1.1.0"; + by-version."load-json-file"."1.1.0" = self.buildNodePackage { + name = "load-json-file-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + name = "load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + deps = { + "graceful-fs-4.1.2" = self.by-version."graceful-fs"."4.1.2"; + "parse-json-2.2.0" = self.by-version."parse-json"."2.2.0"; + "pify-2.3.0" = self.by-version."pify"."2.3.0"; + "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; + "strip-bom-2.0.0" = self.by-version."strip-bom"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."loud-rejection"."^1.0.0" = + self.by-version."loud-rejection"."1.2.0"; + by-version."loud-rejection"."1.2.0" = self.buildNodePackage { + name = "loud-rejection-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz"; + name = "loud-rejection-1.2.0.tgz"; + sha1 = "f4f87db6abec3b7fe47834531ecf6a011143e58d"; + }; + deps = { + "signal-exit-2.1.2" = self.by-version."signal-exit"."2.1.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lru-cache"."2.3.x" = + self.by-version."lru-cache"."2.3.1"; + by-version."lru-cache"."2.3.1" = self.buildNodePackage { + name = "lru-cache-2.3.1"; + version = "2.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; + name = "lru-cache-2.3.1.tgz"; + sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."map-obj"."^1.0.0" = + self.by-version."map-obj"."1.0.1"; + by-version."map-obj"."1.0.1" = self.buildNodePackage { + name = "map-obj-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + name = "map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."memcached"."0.2.x" = + self.by-version."memcached"."0.2.8"; + by-version."memcached"."0.2.8" = self.buildNodePackage { + name = "memcached-0.2.8"; + version = "0.2.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/memcached/-/memcached-0.2.8.tgz"; + name = "memcached-0.2.8.tgz"; + sha1 = "ffbf9498cbc30779625b77e77770bd50dc525212"; + }; + deps = { + "hashring-0.0.8" = self.by-version."hashring"."0.0.8"; + "jackpot-0.0.6" = self.by-version."jackpot"."0.0.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."meow"."^3.3.0" = + self.by-version."meow"."3.6.0"; + by-version."meow"."3.6.0" = self.buildNodePackage { + name = "meow-3.6.0"; + version = "3.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/meow/-/meow-3.6.0.tgz"; + name = "meow-3.6.0.tgz"; + sha1 = "e7a535295cb89db0e0782428e55fa8615bf9e150"; + }; + deps = { + "camelcase-keys-2.0.0" = self.by-version."camelcase-keys"."2.0.0"; + "loud-rejection-1.2.0" = self.by-version."loud-rejection"."1.2.0"; + "minimist-1.2.0" = self.by-version."minimist"."1.2.0"; + "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5"; + "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1"; + "read-pkg-up-1.0.1" = self.by-version."read-pkg-up"."1.0.1"; + "redent-1.0.0" = self.by-version."redent"."1.0.0"; + "trim-newlines-1.0.0" = self.by-version."trim-newlines"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime"."1.2.4" = + self.by-version."mime"."1.2.4"; + by-version."mime"."1.2.4" = self.buildNodePackage { + name = "mime-1.2.4"; + version = "1.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; + name = "mime-1.2.4.tgz"; + sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime".">= 0.0.1" = + self.by-version."mime"."1.3.4"; + by-version."mime"."1.3.4" = self.buildNodePackage { + name = "mime-1.3.4"; + version = "1.3.4"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + name = "mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mimelib"."0.2.14" = + self.by-version."mimelib"."0.2.14"; + by-version."mimelib"."0.2.14" = self.buildNodePackage { + name = "mimelib-0.2.14"; + version = "0.2.14"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz"; + name = "mimelib-0.2.14.tgz"; + sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831"; + }; + deps = { + "encoding-0.1.11" = self.by-version."encoding"."0.1.11"; + "addressparser-0.2.1" = self.by-version."addressparser"."0.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimist"."^1.1.3" = + self.by-version."minimist"."1.2.0"; + by-version."minimist"."1.2.0" = self.buildNodePackage { + name = "minimist-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + name = "minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mkdirp"."0.3.0" = + self.by-version."mkdirp"."0.3.0"; + by-version."mkdirp"."0.3.0" = self.buildNodePackage { + name = "mkdirp-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + name = "mkdirp-0.3.0.tgz"; + sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mkdirp"."0.3.x" = + self.by-version."mkdirp"."0.3.5"; + by-version."mkdirp"."0.3.5" = self.buildNodePackage { + name = "mkdirp-0.3.5"; + version = "0.3.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + name = "mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "mkdirp" = self.by-version."mkdirp"."0.3.5"; + by-spec."moment"."= 1.7.0" = + self.by-version."moment"."1.7.0"; + by-version."moment"."1.7.0" = self.buildNodePackage { + name = "moment-1.7.0"; + version = "1.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/moment/-/moment-1.7.0.tgz"; + name = "moment-1.7.0.tgz"; + sha1 = "6f3d73a446c6bd6af1b993801d0b8071efad5e28"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mongodb"."1.4.x" = + self.by-version."mongodb"."1.4.39"; + by-version."mongodb"."1.4.39" = self.buildNodePackage { + name = "mongodb-1.4.39"; + version = "1.4.39"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.39.tgz"; + name = "mongodb-1.4.39.tgz"; + sha1 = "f5b25c7f7df06c968cd5d3c68280adc9a6404591"; + }; + deps = { + "bson-0.2.22" = self.by-version."bson"."0.2.22"; + }; + optionalDependencies = { + "kerberos-0.0.11" = self.by-version."kerberos"."0.0.11"; + "readable-stream-2.0.4" = self.by-version."readable-stream"."2.0.4"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ms"."0.7.1" = + self.by-version."ms"."0.7.1"; + by-version."ms"."0.7.1" = self.buildNodePackage { + name = "ms-0.7.1"; + version = "0.7.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + name = "ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nan"."2.0.5" = + self.by-version."nan"."2.0.5"; + by-version."nan"."2.0.5" = self.buildNodePackage { + name = "nan-2.0.5"; + version = "2.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-2.0.5.tgz"; + name = "nan-2.0.5.tgz"; + sha1 = "365888014be1fd178db0cbfa258edf7b0cb1c408"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nan"."~1.8" = + self.by-version."nan"."1.8.4"; + by-version."nan"."1.8.4" = self.buildNodePackage { + name = "nan-1.8.4"; + version = "1.8.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz"; + name = "nan-1.8.4.tgz"; + sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."node-uuid"."1.3.x" = + self.by-version."node-uuid"."1.3.3"; + by-version."node-uuid"."1.3.3" = self.buildNodePackage { + name = "node-uuid-1.3.3"; + version = "1.3.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"; + name = "node-uuid-1.3.3.tgz"; + sha1 = "d3db4d7b56810d9e4032342766282af07391729b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "node-uuid" = self.by-version."node-uuid"."1.3.3"; + by-spec."node-uuid"."1.4.x" = + self.by-version."node-uuid"."1.4.7"; + by-version."node-uuid"."1.4.7" = self.buildNodePackage { + name = "node-uuid-1.4.7"; + version = "1.4.7"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; + name = "node-uuid-1.4.7.tgz"; + sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."node-uuid"."^1.4.1" = + self.by-version."node-uuid"."1.4.7"; + by-spec."normalize-package-data"."^2.3.2" = + self.by-version."normalize-package-data"."2.3.5"; + by-version."normalize-package-data"."2.3.5" = self.buildNodePackage { + name = "normalize-package-data-2.3.5"; + version = "2.3.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"; + name = "normalize-package-data-2.3.5.tgz"; + sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; + }; + deps = { + "hosted-git-info-2.1.4" = self.by-version."hosted-git-info"."2.1.4"; + "is-builtin-module-1.0.0" = self.by-version."is-builtin-module"."1.0.0"; + "semver-5.1.0" = self.by-version."semver"."5.1.0"; + "validate-npm-package-license-3.0.1" = self.by-version."validate-npm-package-license"."3.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."normalize-package-data"."^2.3.4" = + self.by-version."normalize-package-data"."2.3.5"; + by-spec."number-is-nan"."^1.0.0" = + self.by-version."number-is-nan"."1.0.0"; + by-version."number-is-nan"."1.0.0" = self.buildNodePackage { + name = "number-is-nan-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; + name = "number-is-nan-1.0.0.tgz"; + sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."oauth"."0.9.7" = + self.by-version."oauth"."0.9.7"; + by-version."oauth"."0.9.7" = self.buildNodePackage { + name = "oauth-0.9.7"; + version = "0.9.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth/-/oauth-0.9.7.tgz"; + name = "oauth-0.9.7.tgz"; + sha1 = "c2554d0368c966eb3050bec96584625577ad1ecd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."oauth-evanp"."~0.9.10-evanp.2" = + self.by-version."oauth-evanp"."0.9.10-evanp.2"; + by-version."oauth-evanp"."0.9.10-evanp.2" = self.buildNodePackage { + name = "oauth-evanp-0.9.10-evanp.2"; + version = "0.9.10-evanp.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth-evanp/-/oauth-evanp-0.9.10-evanp.2.tgz"; + name = "oauth-evanp-0.9.10-evanp.2.tgz"; + sha1 = "9b5fb3508cea584420855957d56531405cf53a02"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "oauth-evanp" = self.by-version."oauth-evanp"."0.9.10-evanp.2"; + by-spec."object-assign"."^4.0.1" = + self.by-version."object-assign"."4.0.1"; + by-version."object-assign"."4.0.1" = self.buildNodePackage { + name = "object-assign-4.0.1"; + version = "4.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"; + name = "object-assign-4.0.1.tgz"; + sha1 = "99504456c3598b5cad4fc59c26e8a9bb107fe0bd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."openid"."0.4.1" = + self.by-version."openid"."0.4.1"; + by-version."openid"."0.4.1" = self.buildNodePackage { + name = "openid-0.4.1"; + version = "0.4.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/openid/-/openid-0.4.1.tgz"; + name = "openid-0.4.1.tgz"; + sha1 = "de0eb5e381d34dc4aa5a77a98678bedafd11f387"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."optimist"."0.3.x" = + self.by-version."optimist"."0.3.7"; + by-version."optimist"."0.3.7" = self.buildNodePackage { + name = "optimist-0.3.7"; + version = "0.3.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + name = "optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }; + deps = { + "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "optimist" = self.by-version."optimist"."0.3.7"; + by-spec."parse-json"."^2.2.0" = + self.by-version."parse-json"."2.2.0"; + by-version."parse-json"."2.2.0" = self.buildNodePackage { + name = "parse-json-2.2.0"; + version = "2.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + name = "parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + deps = { + "error-ex-1.3.0" = self.by-version."error-ex"."1.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."path-exists"."^2.0.0" = + self.by-version."path-exists"."2.1.0"; + by-version."path-exists"."2.1.0" = self.buildNodePackage { + name = "path-exists-2.1.0"; + version = "2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + name = "path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + deps = { + "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."path-type"."^1.0.0" = + self.by-version."path-type"."1.1.0"; + by-version."path-type"."1.1.0" = self.buildNodePackage { + name = "path-type-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + name = "path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + deps = { + "graceful-fs-4.1.2" = self.by-version."graceful-fs"."4.1.2"; + "pify-2.3.0" = self.by-version."pify"."2.3.0"; + "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pify"."^2.0.0" = + self.by-version."pify"."2.3.0"; + by-version."pify"."2.3.0" = self.buildNodePackage { + name = "pify-2.3.0"; + version = "2.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + name = "pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pinkie"."^2.0.0" = + self.by-version."pinkie"."2.0.1"; + by-version."pinkie"."2.0.1" = self.buildNodePackage { + name = "pinkie-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"; + name = "pinkie-2.0.1.tgz"; + sha1 = "4236c86fc29f261c2045bbe81f78cbb2a5e8306c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pinkie-promise"."^2.0.0" = + self.by-version."pinkie-promise"."2.0.0"; + by-version."pinkie-promise"."2.0.0" = self.buildNodePackage { + name = "pinkie-promise-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz"; + name = "pinkie-promise-2.0.0.tgz"; + sha1 = "4c83538de1f6e660c29e0a13446844f7a7e88259"; + }; + deps = { + "pinkie-2.0.1" = self.by-version."pinkie"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."process-nextick-args"."~1.0.0" = + self.by-version."process-nextick-args"."1.0.6"; + by-version."process-nextick-args"."1.0.6" = self.buildNodePackage { + name = "process-nextick-args-1.0.6"; + version = "1.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"; + name = "process-nextick-args-1.0.6.tgz"; + sha1 = "0f96b001cea90b12592ce566edb97ec11e69bd05"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs"."0.4.x" = + self.by-version."qs"."0.4.2"; + by-version."qs"."0.4.2" = self.buildNodePackage { + name = "qs-0.4.2"; + version = "0.4.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; + name = "qs-0.4.2.tgz"; + sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs".">= 0.4.0" = + self.by-version."qs"."6.0.1"; + by-version."qs"."6.0.1" = self.buildNodePackage { + name = "qs-6.0.1"; + version = "6.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-6.0.1.tgz"; + name = "qs-6.0.1.tgz"; + sha1 = "ee8b7fcd64fcbe6e36c922bd2c464ee7c54766c3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."read-pkg"."^1.0.0" = + self.by-version."read-pkg"."1.1.0"; + by-version."read-pkg"."1.1.0" = self.buildNodePackage { + name = "read-pkg-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + name = "read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + deps = { + "load-json-file-1.1.0" = self.by-version."load-json-file"."1.1.0"; + "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5"; + "path-type-1.1.0" = self.by-version."path-type"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."read-pkg-up"."^1.0.1" = + self.by-version."read-pkg-up"."1.0.1"; + by-version."read-pkg-up"."1.0.1" = self.buildNodePackage { + name = "read-pkg-up-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + name = "read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + deps = { + "find-up-1.1.0" = self.by-version."find-up"."1.1.0"; + "read-pkg-1.1.0" = self.by-version."read-pkg"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."readable-stream"."*" = + self.by-version."readable-stream"."2.0.4"; + by-version."readable-stream"."2.0.4" = self.buildNodePackage { + name = "readable-stream-2.0.4"; + version = "2.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz"; + name = "readable-stream-2.0.4.tgz"; + sha1 = "2523ef27ffa339d7ba9da8603f2d0599d06edbd8"; + }; + deps = { + "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "process-nextick-args-1.0.6" = self.by-version."process-nextick-args"."1.0.6"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "util-deprecate-1.0.2" = self.by-version."util-deprecate"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."redent"."^1.0.0" = + self.by-version."redent"."1.0.0"; + by-version."redent"."1.0.0" = self.buildNodePackage { + name = "redent-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; + name = "redent-1.0.0.tgz"; + sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + }; + deps = { + "indent-string-2.1.0" = self.by-version."indent-string"."2.1.0"; + "strip-indent-1.0.1" = self.by-version."strip-indent"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."redis"."~0.10.3" = + self.by-version."redis"."0.10.3"; + by-version."redis"."0.10.3" = self.buildNodePackage { + name = "redis-0.10.3"; + version = "0.10.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; + name = "redis-0.10.3.tgz"; + sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."repeating"."^2.0.0" = + self.by-version."repeating"."2.0.0"; + by-version."repeating"."2.0.0" = self.buildNodePackage { + name = "repeating-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz"; + name = "repeating-2.0.0.tgz"; + sha1 = "fd27d6d264d18fbebfaa56553dd7b82535a5034e"; + }; + deps = { + "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."retry"."0.6.0" = + self.by-version."retry"."0.6.0"; + by-version."retry"."0.6.0" = self.buildNodePackage { + name = "retry-0.6.0"; + version = "0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; + name = "retry-0.6.0.tgz"; + sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sax".">=0.1.1" = + self.by-version."sax"."1.1.4"; + by-version."sax"."1.1.4" = self.buildNodePackage { + name = "sax-1.1.4"; + version = "1.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; + name = "sax-1.1.4.tgz"; + sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."schlock"."~0.2.1" = + self.by-version."schlock"."0.2.1"; + by-version."schlock"."0.2.1" = self.buildNodePackage { + name = "schlock-0.2.1"; + version = "0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/schlock/-/schlock-0.2.1.tgz"; + name = "schlock-0.2.1.tgz"; + sha1 = "2a9aaeaa209a5422eadc5dfc005e2c2f15241f99"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "schlock" = self.by-version."schlock"."0.2.1"; + by-spec."semver"."2 || 3 || 4 || 5" = + self.by-version."semver"."5.1.0"; + by-version."semver"."5.1.0" = self.buildNodePackage { + name = "semver-5.1.0"; + version = "5.1.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; + name = "semver-5.1.0.tgz"; + sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."set-immediate"."0.1.x" = + self.by-version."set-immediate"."0.1.1"; + by-version."set-immediate"."0.1.1" = self.buildNodePackage { + name = "set-immediate-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/set-immediate/-/set-immediate-0.1.1.tgz"; + name = "set-immediate-0.1.1.tgz"; + sha1 = "8986e4a773bf8ec165f24d579107673bfac141de"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "set-immediate" = self.by-version."set-immediate"."0.1.1"; + by-spec."set-immediate"."~0.1.1" = + self.by-version."set-immediate"."0.1.1"; + by-spec."showdown"."0.3.x" = + self.by-version."showdown"."0.3.4"; + by-version."showdown"."0.3.4" = self.buildNodePackage { + name = "showdown-0.3.4"; + version = "0.3.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/showdown/-/showdown-0.3.4.tgz"; + name = "showdown-0.3.4.tgz"; + sha1 = "b056fa0209d44ac55c90331b44a934774976ac55"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "showdown" = self.by-version."showdown"."0.3.4"; + by-spec."signal-exit"."^2.1.2" = + self.by-version."signal-exit"."2.1.2"; + by-version."signal-exit"."2.1.2" = self.buildNodePackage { + name = "signal-exit-2.1.2"; + version = "2.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"; + name = "signal-exit-2.1.2.tgz"; + sha1 = "375879b1f92ebc3b334480d038dc546a6d558564"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."simple-lru-cache"."0.0.x" = + self.by-version."simple-lru-cache"."0.0.2"; + by-version."simple-lru-cache"."0.0.2" = self.buildNodePackage { + name = "simple-lru-cache-0.0.2"; + version = "0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; + name = "simple-lru-cache-0.0.2.tgz"; + sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sockjs"."0.3.x" = + self.by-version."sockjs"."0.3.15"; + by-version."sockjs"."0.3.15" = self.buildNodePackage { + name = "sockjs-0.3.15"; + version = "0.3.15"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.15.tgz"; + name = "sockjs-0.3.15.tgz"; + sha1 = "e19b577e59e0fbdb21a0ae4f46203ca24cad8db8"; + }; + deps = { + "faye-websocket-0.9.4" = self.by-version."faye-websocket"."0.9.4"; + "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "sockjs" = self.by-version."sockjs"."0.3.15"; + by-spec."spdx-correct"."~1.0.0" = + self.by-version."spdx-correct"."1.0.2"; + by-version."spdx-correct"."1.0.2" = self.buildNodePackage { + name = "spdx-correct-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; + name = "spdx-correct-1.0.2.tgz"; + sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + }; + deps = { + "spdx-license-ids-1.1.0" = self.by-version."spdx-license-ids"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."spdx-exceptions"."^1.0.4" = + self.by-version."spdx-exceptions"."1.0.4"; + by-version."spdx-exceptions"."1.0.4" = self.buildNodePackage { + name = "spdx-exceptions-1.0.4"; + version = "1.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"; + name = "spdx-exceptions-1.0.4.tgz"; + sha1 = "220b84239119ae9045a892db81a83f4ce16f80fd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."spdx-expression-parse"."~1.0.0" = + self.by-version."spdx-expression-parse"."1.0.2"; + by-version."spdx-expression-parse"."1.0.2" = self.buildNodePackage { + name = "spdx-expression-parse-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz"; + name = "spdx-expression-parse-1.0.2.tgz"; + sha1 = "d52b14b5e9670771440af225bcb563122ac452f6"; + }; + deps = { + "spdx-exceptions-1.0.4" = self.by-version."spdx-exceptions"."1.0.4"; + "spdx-license-ids-1.1.0" = self.by-version."spdx-license-ids"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."spdx-license-ids"."^1.0.0" = + self.by-version."spdx-license-ids"."1.1.0"; + by-version."spdx-license-ids"."1.1.0" = self.buildNodePackage { + name = "spdx-license-ids-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"; + name = "spdx-license-ids-1.1.0.tgz"; + sha1 = "28694acdf39fe27de45143fff81f21f6c66d44ac"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."spdx-license-ids"."^1.0.2" = + self.by-version."spdx-license-ids"."1.1.0"; + by-spec."starttls"."0.2.1" = + self.by-version."starttls"."0.2.1"; + by-version."starttls"."0.2.1" = self.buildNodePackage { + name = "starttls-0.2.1"; + version = "0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/starttls/-/starttls-0.2.1.tgz"; + name = "starttls-0.2.1.tgz"; + sha1 = "b98d3e5e778d46f199c843a64f889f0347c6d19a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."step"."0.0.x" = + self.by-version."step"."0.0.6"; + by-version."step"."0.0.6" = self.buildNodePackage { + name = "step-0.0.6"; + version = "0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/step/-/step-0.0.6.tgz"; + name = "step-0.0.6.tgz"; + sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "step" = self.by-version."step"."0.0.6"; + by-spec."stream-to-buffer"."~0.0.1" = + self.by-version."stream-to-buffer"."0.0.1"; + by-version."stream-to-buffer"."0.0.1" = self.buildNodePackage { + name = "stream-to-buffer-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stream-to-buffer/-/stream-to-buffer-0.0.1.tgz"; + name = "stream-to-buffer-0.0.1.tgz"; + sha1 = "ab483d59a1ca71832de379a255f465b665af45c1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."string_decoder"."~0.10.x" = + self.by-version."string_decoder"."0.10.31"; + by-version."string_decoder"."0.10.31" = self.buildNodePackage { + name = "string_decoder-0.10.31"; + version = "0.10.31"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + name = "string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."strip-bom"."^2.0.0" = + self.by-version."strip-bom"."2.0.0"; + by-version."strip-bom"."2.0.0" = self.buildNodePackage { + name = "strip-bom-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + name = "strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + deps = { + "is-utf8-0.2.0" = self.by-version."is-utf8"."0.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."strip-indent"."^1.0.1" = + self.by-version."strip-indent"."1.0.1"; + by-version."strip-indent"."1.0.1" = self.buildNodePackage { + name = "strip-indent-1.0.1"; + version = "1.0.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; + name = "strip-indent-1.0.1.tgz"; + sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; + }; + deps = { + "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."through"."~2.3.1" = + self.by-version."through"."2.3.8"; + by-version."through"."2.3.8" = self.buildNodePackage { + name = "through-2.3.8"; + version = "2.3.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz"; + name = "through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."trim-newlines"."^1.0.0" = + self.by-version."trim-newlines"."1.0.0"; + by-version."trim-newlines"."1.0.0" = self.buildNodePackage { + name = "trim-newlines-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; + name = "trim-newlines-1.0.0.tgz"; + sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."underscore"."*" = + self.by-version."underscore"."1.8.3"; + by-version."underscore"."1.8.3" = self.buildNodePackage { + name = "underscore-1.8.3"; + version = "1.8.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; + name = "underscore-1.8.3.tgz"; + sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."underscore"."1.4.x" = + self.by-version."underscore"."1.4.4"; + by-version."underscore"."1.4.4" = self.buildNodePackage { + name = "underscore-1.4.4"; + version = "1.4.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + name = "underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "underscore" = self.by-version."underscore"."1.4.4"; + by-spec."underscore"."1.5.x" = + self.by-version."underscore"."1.5.2"; + by-version."underscore"."1.5.2" = self.buildNodePackage { + name = "underscore-1.5.2"; + version = "1.5.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + name = "underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."underscore"."1.6.x" = + self.by-version."underscore"."1.6.0"; + by-version."underscore"."1.6.0" = self.buildNodePackage { + name = "underscore-1.6.0"; + version = "1.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; + name = "underscore-1.6.0.tgz"; + sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."underscore".">=1.1.3" = + self.by-version."underscore"."1.8.3"; + by-spec."underscore"."^1.8.3" = + self.by-version."underscore"."1.8.3"; + by-spec."underscore-contrib"."0.1.x" = + self.by-version."underscore-contrib"."0.1.4"; + by-version."underscore-contrib"."0.1.4" = self.buildNodePackage { + name = "underscore-contrib-0.1.4"; + version = "0.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.1.4.tgz"; + name = "underscore-contrib-0.1.4.tgz"; + sha1 = "db40f37f2e66961d2e0326bf65fb76887a1ca1c6"; + }; + deps = { + "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "underscore-contrib" = self.by-version."underscore-contrib"."0.1.4"; + by-spec."util-deprecate"."~1.0.1" = + self.by-version."util-deprecate"."1.0.2"; + by-version."util-deprecate"."1.0.2" = self.buildNodePackage { + name = "util-deprecate-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + name = "util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."utml"."0.2.x" = + self.by-version."utml"."0.2.0"; + by-version."utml"."0.2.0" = self.buildNodePackage { + name = "utml-0.2.0"; + version = "0.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/utml/-/utml-0.2.0.tgz"; + name = "utml-0.2.0.tgz"; + sha1 = "6a546741823b2a9c17598a57e8eb4c08738dee48"; + }; + deps = { + "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "utml" = self.by-version."utml"."0.2.0"; + by-spec."validate-npm-package-license"."^3.0.1" = + self.by-version."validate-npm-package-license"."3.0.1"; + by-version."validate-npm-package-license"."3.0.1" = self.buildNodePackage { + name = "validate-npm-package-license-3.0.1"; + version = "3.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; + name = "validate-npm-package-license-3.0.1.tgz"; + sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; + }; + deps = { + "spdx-correct-1.0.2" = self.by-version."spdx-correct"."1.0.2"; + "spdx-expression-parse-1.0.2" = self.by-version."spdx-expression-parse"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."validator"."0.4.x" = + self.by-version."validator"."0.4.28"; + by-version."validator"."0.4.28" = self.buildNodePackage { + name = "validator-0.4.28"; + version = "0.4.28"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/validator/-/validator-0.4.28.tgz"; + name = "validator-0.4.28.tgz"; + sha1 = "311d439ae6cf3fbe6f85da6ebaccd0c7007986f4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "validator" = self.by-version."validator"."0.4.28"; + by-spec."vows"."0.7.x" = + self.by-version."vows"."0.7.0"; + by-version."vows"."0.7.0" = self.buildNodePackage { + name = "vows-0.7.0"; + version = "0.7.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/vows/-/vows-0.7.0.tgz"; + name = "vows-0.7.0.tgz"; + sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867"; + }; + deps = { + "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "diff-1.0.8" = self.by-version."diff"."1.0.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."webfinger"."~0.4.2" = + self.by-version."webfinger"."0.4.2"; + by-version."webfinger"."0.4.2" = self.buildNodePackage { + name = "webfinger-0.4.2"; + version = "0.4.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/webfinger/-/webfinger-0.4.2.tgz"; + name = "webfinger-0.4.2.tgz"; + sha1 = "3477a6d97799461896039fcffc650b73468ee76d"; + }; + deps = { + "step-0.0.6" = self.by-version."step"."0.0.6"; + "xml2js-0.1.14" = self.by-version."xml2js"."0.1.14"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "webfinger" = self.by-version."webfinger"."0.4.2"; + by-spec."websocket-driver".">=0.5.1" = + self.by-version."websocket-driver"."0.6.3"; + by-version."websocket-driver"."0.6.3" = self.buildNodePackage { + name = "websocket-driver-0.6.3"; + version = "0.6.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.3.tgz"; + name = "websocket-driver-0.6.3.tgz"; + sha1 = "fd21911bb46dee34ad85bdbc5676bf9024ed087b"; + }; + deps = { + "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."websocket-extensions".">=0.1.1" = + self.by-version."websocket-extensions"."0.1.1"; + by-version."websocket-extensions"."0.1.1" = self.buildNodePackage { + name = "websocket-extensions-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; + name = "websocket-extensions-0.1.1.tgz"; + sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."wordwrap"."~0.0.2" = + self.by-version."wordwrap"."0.0.3"; + by-version."wordwrap"."0.0.3" = self.buildNodePackage { + name = "wordwrap-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + name = "wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."xml2js"."0.1.x" = + self.by-version."xml2js"."0.1.14"; + by-version."xml2js"."0.1.14" = self.buildNodePackage { + name = "xml2js-0.1.14"; + version = "0.1.14"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz"; + name = "xml2js-0.1.14.tgz"; + sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; + }; + deps = { + "sax-1.1.4" = self.by-version."sax"."1.1.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; +} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index e872718a807..2916edd1ab3 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2108,11 +2108,11 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.17.2"; + name = "xorg-server-1.17.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.17.2.tar.bz2; - sha256 = "14vr4mm0x94a9bd3sfx9mdh8qhvk48zcml3i8q1wbwi84xhj04gn"; + url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2; + sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc"; }; buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; diff --git a/pkgs/servers/x11/xorg/fix_segfault.patch b/pkgs/servers/x11/xorg/fix_segfault.patch deleted file mode 100644 index b3a7d2ed5e0..00000000000 --- a/pkgs/servers/x11/xorg/fix_segfault.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 7cc7ffd25d5e50b54cb942d07d4cb160f20ff9c5 Mon Sep 17 00:00:00 2001 -From: Martin Peres -Date: Fri, 17 Jul 2015 17:21:26 +0300 -Subject: [PATCH] os: make sure the clientsWritable fd_set is initialized - before use - -In WaitForSomething(), the fd_set clientsWritable may be used unitialized when -the boolean AnyClientsWriteBlocked is set in the WakeupHandler(). This leads to -a crash in FlushAllOutput() after x11proto's commit -2c94cdb453bc641246cc8b9a876da9799bee1ce7. - -The problem did not manifest before because both the XFD_SIZE and the maximum -number of clients were set to 256. As the connectionTranslation table was -initalized for the 256 clients to 0, the test on the index not being 0 was -aborting before dereferencing the client #0. - -As of commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7 in x11proto, the XFD_SIZE -got bumped to 512. This lead the OutputPending fd_set to have any fd above 256 -to be uninitialized which in turns lead to reading an index after the end of -the ConnectionTranslation table. This index would then be used to find the -client corresponding to the fd marked as pending writes and would also result -to an out-of-bound access which would usually be the fatal one. - -Fix this by zeroing the clientsWritable fd_set at the beginning of -WaitForSomething(). In this case, the bottom part of the loop, which would -indirectly call FlushAllOutput, will not do any work but the next call to -select will result in the execution of the right codepath. This is exactly what -we want because we need to know the writable clients before handling them. In -the end, it also makes sure that the fds above MaxClient are initialized, -preventing the crash in FlushAllOutput(). - -Thanks to everyone involved in tracking this one down! - -Reported-by: Karol Herbst -Reported-by: Tobias Klausmann -Signed-off-by: Martin Peres -Tested-by: Martin Peres -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91316 -Cc: Ilia Mirkin -Cc: Martin Peres -Cc: Olivier Fourdan -Cc: Alan Coopersmith ---- - os/WaitFor.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/os/WaitFor.c b/os/WaitFor.c -index 431f1a6..993c14e 100644 ---- a/os/WaitFor.c -+++ b/os/WaitFor.c -@@ -158,6 +158,7 @@ WaitForSomething(int *pClientsReady) - Bool someReady = FALSE; - - FD_ZERO(&clientsReadable); -+ FD_ZERO(&clientsWritable); - - if (nready) - SmartScheduleStopTimer(); --- -2.4.5 - diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ac3a4a8d115..b03edff3fa7 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -378,7 +378,7 @@ in dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto ]; # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316 - commonPatches = [ ./xorgserver-xkbcomp-path.patch ./fix_segfault.patch ]; + commonPatches = [ ./xorgserver-xkbcomp-path.patch ]; # XQuartz requires two compilations: the first to get X / XQuartz, # and the second to get Xvfb, Xnest, etc. darwinOtherX = overrideDerivation xorgserver (oldAttrs: { diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 7b12ab7cab8..5ce686cb8fc 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.1.1"; + version = "5.2"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "0p99dr7kck0a6im1w9qiiz2ai78mgy53gbbn87bam9ya2885gf05"; + sha256 = "1r9r91gmrrflzl0yq10bib9gxbqyhycb09hcx28m2g3vv9skmccj"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "11shllzhq53fg8ngy3bgbmpf09fn2czifg7hsb41nxi3410mpvcl"; + sha256 = "0dsr450v8nydvpk8ry276fvbznlrjgddgp7zvhcw4cv69i9lr4ps"; }; buildInputs = [ ncurses coreutils pcre ]; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 0341cf483b7..de5a9404b65 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -12,6 +12,8 @@ let lib = import ../../../lib; in lib.makeOverridable ( , extraBuildInputs ? [] , __stdenvImpureHostDeps ? [] , __extraImpureHostDeps ? [] +, stdenvSandboxProfile ? "" +, extraSandboxProfile ? "" }: let @@ -101,6 +103,8 @@ let , outputs ? [ "out" ] , __impureHostDeps ? [] , __propagatedImpureHostDeps ? [] + , sandboxProfile ? "" + , propagatedSandboxProfile ? "" , ... } @ attrs: let pos' = @@ -123,10 +127,11 @@ let throw ("Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${errormsg}, refusing to evaluate." + (lib.strings.optionalString (reason != "blacklisted") '' - For `nixos-rebuild` you can set + a) For `nixos-rebuild` you can set { nixpkgs.config.allow${up reason} = true; } in configuration.nix to override this. - For `nix-env` you can add + + b) For `nix-env`, `nix-build` or any other Nix command you can add { allow${up reason} = true; } to ~/.nixpkgs/config.nix. '')); @@ -166,9 +171,13 @@ let lib.addPassthru (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs" "pos" - "__impureHostDeps" "__propagatedImpureHostDeps"]) + "__impureHostDeps" "__propagatedImpureHostDeps" + "sandboxProfile" "propagatedSandboxProfile"]) // (let - # TODO: remove lib.unique once nix has a list canonicalization primitive + computedSandboxProfile = + lib.concatMap (input: input.__propagatedSandboxProfile or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs); + computedPropagatedSandboxProfile = + lib.concatMap (input: input.__propagatedSandboxProfile or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs); computedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs)); computedPropagatedImpureHostDeps = @@ -190,6 +199,12 @@ let propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ (if crossConfig == null then propagatedBuildInputs else []); } // ifDarwin { + # TODO: remove lib.unique once nix has a list canonicalization primitive + __sandboxProfile = + let profiles = [ extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; + final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles)); + in final; + __propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]); __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ __extraImpureHostDeps ++ [ "/dev/zero" "/dev/random" @@ -233,6 +248,7 @@ let inherit preHook initialPath shell defaultNativeBuildInputs; } // ifDarwin { + __sandboxProfile = stdenvSandboxProfile; __impureHostDeps = __stdenvImpureHostDeps; }) diff --git a/pkgs/stdenv/pure-darwin/default.nix b/pkgs/stdenv/pure-darwin/default.nix index d13dc98cd74..bc3b433e922 100644 --- a/pkgs/stdenv/pure-darwin/default.nix +++ b/pkgs/stdenv/pure-darwin/default.nix @@ -5,18 +5,9 @@ }: let - # libSystem and its transitive dependencies. Get used to this; it's a recurring theme in darwin land - libSystemClosure = [ - "/usr/lib/libSystem.dylib" - "/usr/lib/libSystem.B.dylib" - "/usr/lib/libobjc.A.dylib" - "/usr/lib/libobjc.dylib" - "/usr/lib/libauto.dylib" - "/usr/lib/libc++abi.dylib" - "/usr/lib/libc++.1.dylib" - "/usr/lib/libDiagnosticMessagesClient.dylib" - "/usr/lib/system" - ]; + libSystemProfile = '' + (import "${./standard-sandbox.sb}") + ''; fetch = { file, sha256, executable ? true }: import { url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/4f07c88d467216d9692fefc951deb5cd3c4cc722/${file}"; @@ -46,7 +37,9 @@ in rec { ''; # The one dependency of /bin/sh :( - binShClosure = [ "/usr/lib/libncurses.5.4.dylib" ]; + binShClosure = '' + (allow file-read* (literal "/usr/lib/libncurses.5.4.dylib")) + ''; bootstrapTools = derivation rec { inherit system tarball; @@ -57,7 +50,7 @@ in rec { inherit (bootstrapFiles) mkdir bzip2 cpio; - __impureHostDeps = binShClosure ++ libSystemClosure; + __sandboxProfile = binShClosure + libSystemProfile; }; stageFun = step: last: {shell ? "${bootstrapTools}/bin/sh", @@ -100,8 +93,8 @@ in rec { }; # The stdenvs themselves don't use mkDerivation, so I need to specify this here - __stdenvImpureHostDeps = binShClosure ++ libSystemClosure; - __extraImpureHostDeps = binShClosure ++ libSystemClosure; + stdenvSandboxProfile = binShClosure + libSystemProfile; + extraSandboxProfile = binShClosure + libSystemProfile; extraAttrs = { inherit platform; }; overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; }; @@ -178,10 +171,14 @@ in rec { }; stage2 = with stage1; stageFun 2 stage1 { + extraPreHook = '' + export PATH_LOCALE=${pkgs.darwin.locale}/share/locale + ''; + allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ xz libcxx libcxxabi icu ]) ++ - (with pkgs.darwin; [ dyld Libsystem CF ]); + (with pkgs.darwin; [ dyld Libsystem CF locale ]); overrides = persistent1; }; @@ -196,7 +193,7 @@ in rec { darwin = orig.darwin // { inherit (darwin) - dyld Libsystem xnu configd libdispatch libclosure launchd libiconv; + dyld Libsystem xnu configd libdispatch libclosure launchd libiconv locale; }; }; @@ -209,10 +206,14 @@ in rec { # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first. extraInitialPath = [ pkgs.bash ]; + extraPreHook = '' + export PATH_LOCALE=${pkgs.darwin.locale}/share/locale + ''; + allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ icu bash libcxx libcxxabi ]) ++ - (with pkgs.darwin; [ dyld Libsystem ]); + (with pkgs.darwin; [ dyld Libsystem locale ]); overrides = persistent2; }; @@ -230,13 +231,16 @@ in rec { }; darwin = orig.darwin // { - inherit (darwin) dyld Libsystem libiconv; + inherit (darwin) dyld Libsystem libiconv locale; }; }; stage4 = with stage3; stageFun 4 stage3 { shell = "${pkgs.bash}/bin/bash"; extraInitialPath = [ pkgs.bash ]; + extraPreHook = '' + export PATH_LOCALE=${pkgs.darwin.locale}/share/locale + ''; overrides = persistent3; }; @@ -251,7 +255,7 @@ in rec { }; darwin = orig.darwin // { - inherit (darwin) dyld Libsystem cctools CF libiconv; + inherit (darwin) dyld Libsystem cctools libiconv; }; }; @@ -261,10 +265,12 @@ in rec { name = "stdenv-darwin"; - preHook = commonPreHook; + preHook = commonPreHook + '' + export PATH_LOCALE=${pkgs.darwin.locale}/share/locale + ''; - __stdenvImpureHostDeps = binShClosure ++ libSystemClosure; - __extraImpureHostDeps = binShClosure ++ libSystemClosure; + stdenvSandboxProfile = binShClosure + libSystemProfile; + extraSandboxProfile = binShClosure + libSystemProfile; initialPath = import ../common-path.nix { inherit pkgs; }; shell = "${pkgs.bash}/bin/bash"; @@ -292,7 +298,7 @@ in rec { coreutils ed diffutils gnutar gzip ncurses gnused bash gawk gnugrep llvmPackages.clang-unwrapped patch pcre binutils-raw binutils gettext ]) ++ (with pkgs.darwin; [ - dyld Libsystem CF cctools libiconv + dyld Libsystem CF cctools libiconv locale ]); overrides = orig: persistent4 orig // { diff --git a/pkgs/stdenv/pure-darwin/standard-sandbox.sb b/pkgs/stdenv/pure-darwin/standard-sandbox.sb new file mode 100644 index 00000000000..b87be89f35f --- /dev/null +++ b/pkgs/stdenv/pure-darwin/standard-sandbox.sb @@ -0,0 +1,72 @@ +(define TMPDIR (param "_GLOBAL_TMP_DIR")) + +; obvious +(allow process-fork) + +; allow reading system information like #CPUs, etc. +(allow sysctl-read) + +; IPC +(allow ipc-posix*) + +; Unix sockets +(allow system-socket) + +; all runtime dependencies of libSystem.dylib +(allow file-read* + (literal "/usr/lib/libSystem.dylib") + (literal "/usr/lib/libSystem.B.dylib") + (literal "/usr/lib/libobjc.A.dylib") + (literal "/usr/lib/libobjc.dylib") + (literal "/usr/lib/libauto.dylib") + (literal "/usr/lib/libc++abi.dylib") + (literal "/usr/lib/libc++.1.dylib") + (literal "/usr/lib/libDiagnosticMessagesClient.dylib") + (subpath "/usr/lib/system")) + +; tmp +(allow file* process-exec (literal "/tmp") (subpath TMPDIR)) + +; clang likes to read the system version +(allow file-read* (literal "/System/Library/CoreServices/SystemVersion.plist")) + +; used for bootstrap builders +(allow process-exec* (literal "/bin/sh")) + +; without this line clang cannot write to /dev/null, breaking some configure tests +(allow file-read-metadata (literal "/dev")) + +; standard devices +(allow file* + (literal "/dev/null") + (literal "/dev/random") + (literal "/dev/stdin") + (literal "/dev/stdout") + (literal "/dev/tty") + (literal "/dev/urandom") + (literal "/dev/zero") + (subpath "/dev/fd")) + +; does nothing, but reduces build noise +(allow file* (literal "/dev/dtracehelper")) + +; ICU data and zoneinfo data are hardcoded +; both are in libicucore and zoneinfo is in libsystem_c as well +(allow file-read* (subpath "/usr/share/icu") (subpath "/usr/share/zoneinfo")) + +; no idea what this is +(allow file-read-data (literal "/dev/autofs_nowait")) + +; lots of autoconf projects want to list this directory +(allow file-read-metadata (literal "/var") (literal "/private/var/tmp")) + +; send signals +(allow signal (target same-sandbox)) + +; allow getpwuid (for git and other packages) +(allow mach-lookup + (global-name "com.apple.system.notification_center") + (global-name "com.apple.system.opendirectoryd.libinfo")) + +; allow networking on localhost +(allow network* (local ip) (remote unix-socket)) diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index d314c7857ea..2206905aa3e 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -16,89 +16,63 @@ # # To use at startup, see hardware.bumblebee options. -# This nix expression supports for now only the native nvidia driver. -# It should not be hard to generalize this approach to support the -# nouveau driver as well (parameterize hostEnv, i686Env over the -# module package, and parameterize the two wrappers as well) - -{ stdenv, fetchurl, pkgconfig, help2man -, libX11, glibc, glib, libbsd -, makeWrapper, buildEnv, module_init_tools -, xorg, xkeyboard_config -, nvidia_x11, virtualgl +{ stdenv, lib, fetchurl, pkgconfig, help2man, makeWrapper +, glib, libbsd +, libX11, libXext, xorgserver, xkbcomp, module_init_tools, xkeyboard_config, xf86videonouveau +, nvidia_x11, virtualgl, primusLib # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. # TODO: Confusing. Perhaps use "SubArch" instead of i686? , nvidia_x11_i686 ? null -, virtualgl_i686 ? null +, primusLib_i686 ? null , useDisplayDevice ? false -, extraDeviceOptions ? "" +, extraNvidiaDeviceOptions ? "" +, extraNouveauDeviceOptions ? "" +, useNvidia ? true }: -with stdenv.lib; + let version = "3.2.1"; + + primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; + primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; + + primusLibs = lib.makeLibraryPath ([primus] ++ lib.optional (primusLib_i686 != null) primus_i686); + + nvidia_x11s = [nvidia_x11] ++ lib.optional (nvidia_x11_i686 != null) nvidia_x11_i686; + + nvidiaLibs = lib.makeLibraryPath nvidia_x11s; + + bbdPath = lib.makeSearchPath "bin" [ module_init_tools xorgserver ]; + bbdLibs = lib.makeLibraryPath [ libX11 libXext ]; + + xmodules = lib.concatStringsSep "," (map (x: "${x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); + +in stdenv.mkDerivation rec { name = "bumblebee-${version}"; - # Isolated X11 environment without the acceleration driver module. - # Includes the rest of the components needed for bumblebeed and - # optirun to spawn the second X server and to connect to it. - x11Env = buildEnv { - name = "bumblebee-env"; - paths = [ - module_init_tools - xorg.xorgserver - xorg.xrandr - xorg.xrdb - xorg.setxkbmap - xorg.libX11 - xorg.libXext - xorg.xf86inputevdev - ]; - }; - - # The environment for the host architecture. - hostEnv = buildEnv { - name = "bumblebee-x64-env"; - paths = [ - nvidia_x11 - virtualgl - ]; - }; - - # The environment for the sub architecture, i686, if there is one - i686Env = if virtualgl_i686 != null - then buildEnv { - name = "bumblebee-i686-env"; - paths = [ - nvidia_x11_i686 - virtualgl_i686 - ]; - } - else null; - - allEnvs = [hostEnv] ++ optional (i686Env != null) i686Env; - ldPathString = makeLibraryPath allEnvs; - - # By default we don't want to use a display device - deviceOptions = if useDisplayDevice - then "" - else '' - - # Disable display device - Option "UseEDID" "false" - Option "UseDisplayDevice" "none" - '' - + extraDeviceOptions; - -in stdenv.mkDerivation { - inherit name deviceOptions; - src = fetchurl { url = "http://bumblebee-project.org/${name}.tar.gz"; sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h"; }; - patches = [ ./xopts.patch ./nvidia-conf.patch]; + patches = [ ./nixos.patch ]; + + # By default we don't want to use a display device + nvidiaDeviceOptions = lib.optionalString (!useDisplayDevice) '' + # Disable display device + Option "UseEDID" "false" + Option "UseDisplayDevice" "none" + '' + extraNvidiaDeviceOptions; + + nouveauDeviceOptions = extraNouveauDeviceOptions; + + # the have() function is deprecated and not available to bash completions the + # way they are currently loaded in NixOS, so use _have. See #10936 + postPatch = '' + substituteInPlace scripts/bash_completion/bumblebee \ + --replace "have optirun" "_have optirun" + ''; preConfigure = '' # Substitute the path to the actual modinfo program in module.c. @@ -114,12 +88,16 @@ in stdenv.mkDerivation { # Apply configuration options substituteInPlace conf/xorg.conf.nvidia \ - --subst-var deviceOptions + --subst-var nvidiaDeviceOptions + + substituteInPlace conf/xorg.conf.nouveau \ + --subst-var nouveauDeviceOptions ''; # Build-time dependencies of bumblebeed and optirun. # Note that it has several runtime dependencies. - buildInputs = [ stdenv makeWrapper pkgconfig help2man libX11 glib libbsd ]; + buildInputs = [ libX11 glib libbsd ]; + nativeBuildInputs = [ makeWrapper pkgconfig help2man ]; # The order of LDPATH is very specific: First X11 then the host # environment then the optional sub architecture paths. @@ -130,33 +108,33 @@ in stdenv.mkDerivation { # include the sub architecture components. configureFlags = [ "--with-udev-rules=$out/lib/udev/rules.d" - "CONF_DRIVER=nvidia" - "CONF_DRIVER_MODULE_NVIDIA=nvidia" - "CONF_LDPATH_NVIDIA=${x11Env}/lib:${ldPathString}" - "CONF_MODPATH_NVIDIA=${hostEnv}/lib/xorg/modules,${x11Env}/lib/xorg/modules" + # see #10282 + #"CONF_PRIMUS_LD_PATH=${primusLibs}" + ] ++ lib.optionals useNvidia [ + "CONF_LDPATH_NVIDIA=${nvidiaLibs}" + "CONF_MODPATH_NVIDIA=${nvidia_x11}/lib/xorg/modules" + ]; + + CFLAGS = [ + "-DX_MODULE_APPENDS=\\\"${xmodules}\\\"" + "-DX_XKB_DIR=\\\"${xkeyboard_config}/etc/X11/xkb\\\"" ]; - # create a wrapper environment for bumblebeed and optirun postInstall = '' wrapProgram "$out/sbin/bumblebeed" \ - --prefix PATH : "${x11Env}/sbin:${x11Env}/bin:${hostEnv}/bin:\$PATH" \ - --prefix LD_LIBRARY_PATH : "${x11Env}/lib:${hostEnv}/lib:\$LD_LIBRARY_PATH" \ - --set FONTCONFIG_FILE "/etc/fonts/fonts.conf" \ - --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ - --set XKB_DIR "${xkeyboard_config}/etc/X11/xkb" + --set XKB_BINDIR "${xkbcomp}/bin" \ + --prefix PATH : "${bbdPath}" \ + --prefix LD_LIBRARY_PATH : "${bbdLibs}" wrapProgram "$out/bin/optirun" \ - --prefix PATH : "${hostEnv}/bin" - '' + (if i686Env == null - then "" - else '' - makeWrapper "$out/bin/.optirun-wrapped" "$out/bin/optirun32" \ - --prefix PATH : "${i686Env}/bin" - ''); + --prefix PATH : "${virtualgl}/bin" + ''; - meta = { + meta = with stdenv.lib; { homepage = http://github.com/Bumblebee-Project/Bumblebee; description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)"; - license = stdenv.lib.licenses.gpl3; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/tools/X11/bumblebee/nixos.patch b/pkgs/tools/X11/bumblebee/nixos.patch new file mode 100644 index 00000000000..00fb8ad7a53 --- /dev/null +++ b/pkgs/tools/X11/bumblebee/nixos.patch @@ -0,0 +1,81 @@ +diff --git a/conf/xorg.conf.nouveau b/conf/xorg.conf.nouveau +index 87e48cb..60d6eaf 100644 +--- a/conf/xorg.conf.nouveau ++++ b/conf/xorg.conf.nouveau +@@ -15,4 +15,5 @@ Section "Device" + # This Setting is needed on Ubuntu 13.04. + # BusID "PCI:01:00:0" + ++@nouveauDeviceOptions@ + EndSection +diff --git a/conf/xorg.conf.nvidia b/conf/xorg.conf.nvidia +index c3107f9..17072f4 100644 +--- a/conf/xorg.conf.nvidia ++++ b/conf/xorg.conf.nvidia +@@ -29,6 +29,6 @@ Section "Device" + Option "ProbeAllGpus" "false" + + Option "NoLogo" "true" +- Option "UseEDID" "false" +- Option "UseDisplayDevice" "none" ++ ++@nvidiaDeviceOptions@ + EndSection +diff --git a/src/bbsecondary.c b/src/bbsecondary.c +index 71a6b73..a682d8a 100644 +--- a/src/bbsecondary.c ++++ b/src/bbsecondary.c +@@ -145,6 +145,23 @@ bool start_secondary(bool need_secondary) { + } + + bb_log(LOG_INFO, "Starting X server on display %s.\n", bb_config.x_display); ++ const char mod_appends[] = X_MODULE_APPENDS; ++ ++ char *mod_path; ++ int pathlen = strlen(bb_config.mod_path); ++ if (pathlen == 0) { ++ mod_path = mod_appends; ++ } else { ++ mod_path = malloc(pathlen + 1 + sizeof(mod_appends)); ++ if (!mod_path) { ++ set_bb_error("Could not allocate memory for modules path\n"); ++ return false; ++ } ++ strcpy(mod_path, bb_config.mod_path); ++ mod_path[pathlen] = ','; ++ strcpy(mod_path + pathlen + 1, mod_appends); ++ } ++ + char *x_argv[] = { + XORG_BINARY, + bb_config.x_display, +@@ -153,24 +170,25 @@ bool start_secondary(bool need_secondary) { + "-sharevts", + "-nolisten", "tcp", + "-noreset", ++ "-logfile", "/var/log/X.bumblebee.log", ++ "-xkbdir", X_XKB_DIR, + "-verbose", "3", + "-isolateDevice", pci_id, +- "-modulepath", bb_config.mod_path, // keep last ++ "-modulepath", mod_path, + NULL + }; + enum {n_x_args = sizeof(x_argv) / sizeof(x_argv[0])}; +- if (!*bb_config.mod_path) { +- x_argv[n_x_args - 3] = 0; //remove -modulepath if not set +- } + //close any previous pipe, if it (still) exists + if (bb_status.x_pipe[0] != -1){close(bb_status.x_pipe[0]); bb_status.x_pipe[0] = -1;} + if (bb_status.x_pipe[1] != -1){close(bb_status.x_pipe[1]); bb_status.x_pipe[1] = -1;} + //create a new pipe + if (pipe2(bb_status.x_pipe, O_NONBLOCK | O_CLOEXEC)){ + set_bb_error("Could not create output pipe for X"); ++ if (pathlen > 0) free(mod_path); + return false; + } + bb_status.x_pid = bb_run_fork_ld_redirect(x_argv, bb_config.ld_path, bb_status.x_pipe[1]); ++ if (pathlen > 0) free(mod_path); + //close the end of the pipe that is not ours + if (bb_status.x_pipe[1] != -1){close(bb_status.x_pipe[1]); bb_status.x_pipe[1] = -1;} + } diff --git a/pkgs/tools/X11/bumblebee/nvidia-conf.patch b/pkgs/tools/X11/bumblebee/nvidia-conf.patch deleted file mode 100644 index f5535c417cf..00000000000 --- a/pkgs/tools/X11/bumblebee/nvidia-conf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bumblebee-3.2.1/conf/xorg.conf.nvidia -+++ bumblebee-3.2.1/conf/xorg.conf.nvidia -@@ -29,6 +29,5 @@ Section "Device" - Option "ProbeAllGpus" "false" - - Option "NoLogo" "true" -- Option "UseEDID" "false" -- Option "UseDisplayDevice" "none" -+@deviceOptions@ - EndSection - diff --git a/pkgs/tools/X11/bumblebee/xopts.patch b/pkgs/tools/X11/bumblebee/xopts.patch deleted file mode 100644 index 6fd3a6a0483..00000000000 --- a/pkgs/tools/X11/bumblebee/xopts.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bumblebee-3.2.1/src/bbsecondary.c 2012-02-05 00:03:06.003439638 +0100 -+++ bumblebee-3.2.1/src/bbsecondary.c 2012-02-05 00:46:38.017382619 +0100 -@@ -149,6 +149,8 @@ - "-sharevts", - "-nolisten", "tcp", - "-noreset", -+ "-xkbdir", getenv("XKB_DIR"), -+ "-logfile", "/var/log/X.bumblebee.log", - "-verbose", "3", - "-isolateDevice", pci_id, - "-modulepath", diff --git a/pkgs/tools/X11/primus/builder.sh b/pkgs/tools/X11/primus/builder.sh deleted file mode 100644 index 3c6b6afdc09..00000000000 --- a/pkgs/tools/X11/primus/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -source $stdenv/setup - -cp -r $src src -cd src - -export LIBDIR=$out/lib -export PRIMUS_libGLa=$nvidia/lib/libGL.so -export PRIMUS_libGLd=$mesa/lib/libGL.so -export PRIMUS_LOAD_GLOBAL=$mesa/lib/libglapi.so - -make -ln -s $LIBDIR/libGL.so.1 $LIBDIR/libGL.so diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index 1aa7909a43d..f0a971dde18 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -5,31 +5,18 @@ # Other distributions do the same. { stdenv , primusLib -, writeScript +, writeScriptBin , primusLib_i686 ? null +, useNvidia ? true }: -with stdenv.lib; + let - version = "1.0.0748176"; - ldPath = makeLibraryPath ([primusLib] ++ optional (primusLib_i686 != null) primusLib_i686); - primusrun = writeScript "primusrun" -'' + primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; + primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; + ldPath = stdenv.lib.makeLibraryPath ([primus] ++ stdenv.lib.optional (primusLib_i686 != null) primus_i686); + +in writeScriptBin "primusrun" '' + #!${stdenv.shell} export LD_LIBRARY_PATH=${ldPath}:$LD_LIBRARY_PATH exec "$@" -''; -in -stdenv.mkDerivation { - name = "primus-${version}"; - builder = writeScript "builder" - '' - source $stdenv/setup - mkdir -p $out/bin - cp ${primusrun} $out/bin/primusrun - ''; - - meta = { - homepage = https://github.com/amonakov/primus; - description = "Faster OpenGL offloading for Bumblebee"; - maintainers = with maintainers; [ coconnor ]; - }; -} +'' diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index 96a4ac16c9b..ce805933109 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,20 +1,35 @@ { stdenv, fetchgit , xlibsWrapper, mesa -, nvidia +, nvidia_x11 ? null +, libX11 }: -let - version = "1.0.0748176"; -in + stdenv.mkDerivation { - name = "primus-lib-${version}"; + name = "primus-lib-20151204"; + src = fetchgit { url = git://github.com/amonakov/primus.git; - rev = "074817614c014e3a99259388cb18fd54648b659a"; - sha256 = "0mrh432md6zrm16avxyk57mgszrqpgwdjahspchvlaccqxp3x82v"; + rev = "d1afbf6fce2778c0751eddf19db9882e04f18bfd"; + sha256 = "8f095b5e2030cdb155a42a49873832843c1e4dc3087a6fb94d198de982609923"; }; - inherit nvidia mesa; + buildInputs = [ libX11 mesa ]; - buildInputs = [ xlibsWrapper mesa ]; - builder = ./builder.sh; + makeFlags = [ "LIBDIR=$(out)/lib" + "PRIMUS_libGLa=${if nvidia_x11 == null then mesa else nvidia_x11}/lib/libGL.so" + "PRIMUS_libGLd=${mesa}/lib/libGL.so" + "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so" + ]; + + installPhase = '' + ln -s $out/lib/libGL.so.1 $out/lib/libGL.so + ''; + + meta = with stdenv.lib; { + description = "Low-overhead client-side GPU offloading"; + homepage = https://github.com/amonakov/primus; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; } diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index ceeadbaafaa..7203229c47b 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -1,33 +1,22 @@ -{ stdenv, fetchurl, mesa, libX11, openssl, libXext -, libjpeg_turbo, cmake }: +{ lib, buildEnv +, virtualglLib +, virtualglLib_i686 ? null +}: -let - version = "2.3.2"; -in -stdenv.mkDerivation { - name = "virtualgl-${version}"; - src = fetchurl { - url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; - sha256 = "062lrhd8yr13ch4wpgzxdabqs92j4q7fcl3a0c3sdlav4arspqmy"; - }; +buildEnv { + name = "virtualgl-${lib.getVersion virtualglLib}"; - patches = [ ./xshm.patch ./fixturbopath.patch ]; + paths = [ virtualglLib ]; - prePatch = '' - sed -i s,LD_PRELOAD=lib,LD_PRELOAD=$out/lib/lib, server/vglrun + postBuild = lib.optionalString (virtualglLib_i686 != null) '' + rm $out/fakelib + # workaround for #4621 + rm $out/bin + mkdir $out/bin + for i in ${virtualglLib}/bin/*; do + ln -s $i $out/bin + done + ln -s ${virtualglLib}/bin/.vglrun.vars64 $out/bin + ln -s ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin ''; - - cmakeFlags = [ "-DTJPEG_LIBRARY=${libjpeg_turbo}/lib/libturbojpeg.so" ]; - - preInstall = '' - export makeFlags="prefix=$out" - ''; - - buildInputs = [ cmake mesa libX11 openssl libXext libjpeg_turbo ]; - - meta = { - homepage = http://www.virtualgl.org/; - description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; - license = stdenv.lib.licenses.free; # many parts under different free licenses - }; } diff --git a/pkgs/tools/X11/virtualgl/fixturbopath.patch b/pkgs/tools/X11/virtualgl/fixturbopath.patch deleted file mode 100644 index 2177555e33a..00000000000 --- a/pkgs/tools/X11/virtualgl/fixturbopath.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- VirtualGL-2.3/cmakescripts/FindTurboJPEG.cmake.orig 2012-02-02 17:33:49.496283001 +0100 -+++ VirtualGL-2.3/cmakescripts/FindTurboJPEG.cmake 2012-02-02 17:44:18.772483239 +0100 -@@ -40,8 +40,11 @@ - endif() - endif() - --set(TJPEG_LIBRARY ${DEFAULT_TJPEG_LIBRARY} CACHE PATH -- "TurboJPEG library path (default: ${DEFAULT_TJPEG_LIBRARY})") -+if(NOT TJPEG_LIBRARY) -+ message(STATUS "TJPEG_LIBRARY environment variable not set") -+ set(TJPEG_LIBRARY ${DEFAULT_TJPEG_LIBRARY} CACHE PATH -+ "TurboJPEG library path (default: ${DEFAULT_TJPEG_LIBRARY})") -+endif() - - if(WIN32) - set(CMAKE_REQUIRED_DEFINITIONS -MT) diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix new file mode 100644 index 00000000000..5c4456f6348 --- /dev/null +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, cmake, mesa, libX11, libXv, libjpeg_turbo, fltk }: + +let + version = "2.4.1"; +in +stdenv.mkDerivation { + name = "virtualgl-lib-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; + sha256 = "0bngb4hrl0kn19qb3sa6mg6dbaahfk09gx2ng18l00xm6pmwd298"; + }; + + cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo}/lib/libturbojpeg.so" ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libjpeg_turbo mesa fltk libX11 libXv ]; + + meta = with stdenv.lib; { + homepage = http://www.virtualgl.org/; + description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; + license = licenses.free; # many parts under different free licenses + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/tools/X11/virtualgl/xshm.patch b/pkgs/tools/X11/virtualgl/xshm.patch deleted file mode 100644 index 2ca81b559ea..00000000000 --- a/pkgs/tools/X11/virtualgl/xshm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/util/fbx.c b/util/fbx.c -index 06ea835..0d89842 100644 ---- a/util/fbx.c -+++ b/util/fbx.c -@@ -15,6 +15,8 @@ - // This library abstracts fast frame buffer access - #include - #include -+#include -+#include - #include "fbx.h" - - #define MINWIDTH 160 diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index fe95b2b685e..7ea43b1c1f2 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, buildPythonPackage, pythonPackages , python, cython, pkgconfig -, xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo +, xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk, pycairo , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config -, ffmpeg, x264, libvpx, pil, libwebp +, ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: buildPythonPackage rec { @@ -29,8 +29,8 @@ buildPythonPackage rec { makeWrapper ]; - propagatedBuildInputs = [ - pil pygtk pygobject pythonPackages.rencode + propagatedBuildInputs = with pythonPackages; [ + pillow pygtk pygobject ]; postPatch = '' diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix deleted file mode 100644 index c4de8090e05..00000000000 --- a/pkgs/tools/admin/awscli/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, groff }: - -pythonPackages.buildPythonPackage rec { - name = "awscli-${version}"; - version = "1.7.47"; - namePrefix = ""; - - src = fetchFromGitHub { - owner = "aws"; - repo = "aws-cli"; - rev = version; - sha256 = "1955y1ar2mqzqgfngpwp8pc78wphh1qdgwwy0gs6i352jaqzkvwi"; - }; - - propagatedBuildInputs = [ - pythonPackages.botocore_1_1_10 - pythonPackages.bcdoc - pythonPackages.six - pythonPackages.colorama - pythonPackages.docutils - pythonPackages.rsa - pythonPackages.pyasn1 - groff - ]; - - postInstall = '' - mkdir -p $out/etc/bash_completion.d - echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli - mkdir -p $out/share/zsh/site-functions - mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions - rm $out/bin/aws.cmd - ''; - - meta = { - homepage = https://aws.amazon.com/cli/; - description = "Unified tool to manage your AWS services"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ muflax ]; - }; -} diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix index 8e818aee9cf..2c74a677b91 100644 --- a/pkgs/tools/admin/letsencrypt/default.nix +++ b/pkgs/tools/admin/letsencrypt/default.nix @@ -1,27 +1,13 @@ { stdenv, pythonPackages, fetchurl, dialog }: -let +pythonPackages.buildPythonPackage rec { + version = "0.1.0"; + name = "letsencrypt-${version}"; + src = fetchurl { url = "https://github.com/letsencrypt/letsencrypt/archive/v${version}.tar.gz"; - sha256 = "00p94pmli4lr5l3vqi11374p9jxiqir1ygx89zgfm4db47srx41z"; + sha256 = "056y5bsmpc4ya5xxals4ypzsm927j6n5kwby3bjc03sy3sscf6hw"; }; - version = "0.0.0.dev20151123"; - acme = pythonPackages.buildPythonPackage rec { - name = "acme-${version}"; - inherit src version; - - propagatedBuildInputs = with pythonPackages; [ - cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock - ndg-httpsclient - ]; - - buildInputs = with pythonPackages; [ nose ]; - - sourceRoot = "letsencrypt-${version}/acme"; - }; -in pythonPackages.buildPythonPackage rec { - name = "letsencrypt-${version}"; - inherit src version; propagatedBuildInputs = with pythonPackages; [ zope_interface zope_component six requests2 pytz pyopenssl psutil mock acme diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix new file mode 100644 index 00000000000..5f945309aac --- /dev/null +++ b/pkgs/tools/admin/simp_le/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "simp_le-20151205"; + + src = fetchFromGitHub { + owner = "kuba"; + repo = "simp_le"; + rev = "976a33830759e66610970f92f6ec1a656a2c8335"; + sha256 = "0bfa5081rmjjg9sii6pn2dskd1wh0dgrf9ic9hpisawrk0y0739i"; + }; + + propagatedBuildInputs = with pythonPackages; [ acme cryptography pytz requests2 ]; + + meta = with stdenv.lib; { + homepage = https://github.com/kuba/simp_le; + description = "Simple Let's Encrypt client"; + license = licenses.gpl3; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index e0716a1b1d3..27fd7c8c1d7 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { description = "Utility for RAR archives"; homepage = http://www.rarlab.com/; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix index bc3eaf9bf53..4875ebf504b 100644 --- a/pkgs/tools/audio/dir2opus/default.nix +++ b/pkgs/tools/audio/dir2opus/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/ehmry/dir2opus; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; license = licenses.gpl2; }; } \ No newline at end of file diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 859fe4bb183..eeebea5d747 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Swiss-army knife for multimedia streaming"; homepage = http://liquidsoap.fm/; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = ocaml.meta.platforms; }; diff --git a/pkgs/tools/backup/backup/Gemfile b/pkgs/tools/backup/backup/Gemfile new file mode 100644 index 00000000000..2f1825b590e --- /dev/null +++ b/pkgs/tools/backup/backup/Gemfile @@ -0,0 +1,23 @@ +source "https://rubygems.org" + +gem 'backup' +gem 'thor' +gem 'open4' +gem 'fog' +gem 'unf' +gem 'dropbox-sdk', '= 1.5.1' # patched +gem 'net-ssh' +gem 'net-scp' +gem 'net-sftp' +gem 'mail', '= 2.5.4' # patched +gem 'pagerduty' +gem 'twitter' +gem 'hipchat' +gem 'flowdock' +gem 'json' +gem 'dogapi' +gem 'aws-ses' +gem 'rspec' +gem 'fuubar' +gem 'mocha' +gem 'timecop' diff --git a/pkgs/tools/backup/backup/Gemfile.lock b/pkgs/tools/backup/backup/Gemfile.lock new file mode 100644 index 00000000000..0725ded8add --- /dev/null +++ b/pkgs/tools/backup/backup/Gemfile.lock @@ -0,0 +1,276 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (2.3.1) + addressable (2.3.5) + atomic (1.1.14) + aws-ses (0.5.0) + builder + mail (> 2.2.5) + mime-types + xml-simple + backup (4.2.2) + CFPropertyList (= 2.3.1) + addressable (= 2.3.5) + atomic (= 1.1.14) + aws-ses (= 0.5.0) + buftok (= 0.2.0) + builder (= 3.2.2) + descendants_tracker (= 0.0.3) + dogapi (= 1.11.0) + dropbox-sdk (= 1.5.1) + equalizer (= 0.0.9) + excon (= 0.44.4) + faraday (= 0.8.8) + fission (= 0.5.0) + flowdock (= 0.4.0) + fog (= 1.28.0) + fog-atmos (= 0.1.0) + fog-aws (= 0.1.1) + fog-brightbox (= 0.7.1) + fog-core (= 1.29.0) + fog-ecloud (= 0.0.2) + fog-json (= 1.0.0) + fog-profitbricks (= 0.0.2) + fog-radosgw (= 0.0.3) + fog-riakcs (= 0.1.0) + fog-sakuracloud (= 1.0.0) + fog-serverlove (= 0.1.1) + fog-softlayer (= 0.4.1) + fog-storm_on_demand (= 0.1.0) + fog-terremark (= 0.0.4) + fog-vmfusion (= 0.0.1) + fog-voxel (= 0.0.2) + fog-xml (= 0.1.1) + formatador (= 0.2.5) + hipchat (= 1.0.1) + http (= 0.5.0) + http_parser.rb (= 0.6.0) + httparty (= 0.12.0) + inflecto (= 0.0.2) + ipaddress (= 0.8.0) + json (= 1.8.2) + mail (= 2.5.4) + memoizable (= 0.4.0) + mime-types (= 1.25.1) + mini_portile (= 0.6.2) + multi_json (= 1.10.1) + multi_xml (= 0.5.5) + multipart-post (= 1.2.0) + net-scp (= 1.2.1) + net-sftp (= 2.1.2) + net-ssh (= 2.9.2) + nokogiri (= 1.6.6.2) + open4 (= 1.3.0) + pagerduty (= 2.0.0) + polyglot (= 0.3.3) + simple_oauth (= 0.2.0) + thor (= 0.18.1) + thread_safe (= 0.1.3) + treetop (= 1.4.15) + twitter (= 5.5.0) + unf (= 0.1.3) + unf_ext (= 0.0.6) + xml-simple (= 1.1.4) + buftok (0.2.0) + builder (3.2.2) + descendants_tracker (0.0.3) + diff-lcs (1.2.5) + dogapi (1.11.0) + json (>= 1.5.1) + dropbox-sdk (1.5.1) + json + equalizer (0.0.9) + excon (0.44.4) + faraday (0.8.8) + multipart-post (~> 1.2.0) + fission (0.5.0) + CFPropertyList (~> 2.2) + flowdock (0.4.0) + httparty (~> 0.7) + multi_json + fog (1.28.0) + fog-atmos + fog-aws (~> 0.0) + fog-brightbox (~> 0.4) + fog-core (~> 1.27, >= 1.27.3) + fog-ecloud + fog-json + fog-profitbricks + fog-radosgw (>= 0.0.2) + fog-riakcs + fog-sakuracloud (>= 0.0.4) + fog-serverlove + fog-softlayer + fog-storm_on_demand + fog-terremark + fog-vmfusion + fog-voxel + fog-xml (~> 0.1.1) + ipaddress (~> 0.5) + nokogiri (~> 1.5, >= 1.5.11) + fog-atmos (0.1.0) + fog-core + fog-xml + fog-aws (0.1.1) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-brightbox (0.7.1) + fog-core (~> 1.22) + fog-json + inflecto (~> 0.0.2) + fog-core (1.29.0) + builder + excon (~> 0.38) + formatador (~> 0.2) + mime-types + net-scp (~> 1.1) + net-ssh (>= 2.1.3) + fog-ecloud (0.0.2) + fog-core + fog-xml + fog-json (1.0.0) + multi_json (~> 1.0) + fog-profitbricks (0.0.2) + fog-core + fog-xml + nokogiri + fog-radosgw (0.0.3) + fog-core (>= 1.21.0) + fog-json + fog-xml (>= 0.0.1) + fog-riakcs (0.1.0) + fog-core + fog-json + fog-xml + fog-sakuracloud (1.0.0) + fog-core + fog-json + fog-serverlove (0.1.1) + fog-core + fog-json + fog-softlayer (0.4.1) + fog-core + fog-json + fog-storm_on_demand (0.1.0) + fog-core + fog-json + fog-terremark (0.0.4) + fog-core + fog-xml + fog-vmfusion (0.0.1) + fission + fog-core + fog-voxel (0.0.2) + fog-core + fog-xml + fog-xml (0.1.1) + fog-core + nokogiri (~> 1.5, >= 1.5.11) + formatador (0.2.5) + fuubar (2.0.0) + rspec (~> 3.0) + ruby-progressbar (~> 1.4) + hipchat (1.0.1) + httparty + http (0.5.0) + http_parser.rb + http_parser.rb (0.6.0) + httparty (0.12.0) + json (~> 1.8) + multi_xml (>= 0.5.2) + inflecto (0.0.2) + ipaddress (0.8.0) + json (1.8.2) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + memoizable (0.4.0) + thread_safe (~> 0.1.3) + metaclass (0.0.4) + mime-types (1.25.1) + mini_portile (0.6.2) + mocha (1.1.0) + metaclass (~> 0.0.1) + multi_json (1.10.1) + multi_xml (0.5.5) + multipart-post (1.2.0) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.9.2) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) + open4 (1.3.0) + pagerduty (2.0.0) + json (>= 1.7.7) + polyglot (0.3.3) + rspec (3.4.0) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-core (3.4.1) + rspec-support (~> 3.4.0) + rspec-expectations (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-mocks (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-support (3.4.1) + ruby-progressbar (1.7.5) + simple_oauth (0.2.0) + thor (0.18.1) + thread_safe (0.1.3) + atomic + timecop (0.8.0) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + twitter (5.5.0) + addressable (~> 2.3) + buftok (~> 0.2.0) + descendants_tracker (~> 0.0.3) + equalizer (~> 0.0.9) + faraday (>= 0.8, < 0.10) + http (~> 0.5.0) + http_parser.rb (~> 0.6.0) + json (~> 1.8) + memoizable (~> 0.4.0) + simple_oauth (~> 0.2.0) + unf (0.1.3) + unf_ext + unf_ext (0.0.6) + xml-simple (1.1.4) + +PLATFORMS + ruby + +DEPENDENCIES + aws-ses + backup + dogapi + dropbox-sdk (= 1.5.1) + flowdock + fog + fuubar + hipchat + json + mail (= 2.5.4) + mocha + net-scp + net-sftp + net-ssh + open4 + pagerduty + rspec + thor + timecop + twitter + unf + +BUNDLED WITH + 1.10.6 diff --git a/pkgs/tools/backup/backup/default.nix b/pkgs/tools/backup/backup/default.nix new file mode 100644 index 00000000000..1890e8121c1 --- /dev/null +++ b/pkgs/tools/backup/backup/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, bundlerEnv, ruby_2_1, curl }: + +bundlerEnv { + name = "backup_v4"; + + ruby = ruby_2_1; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + buildInputs = [ curl ]; + + meta = with lib; { + description = "Easy full stack backup operations on UNIX-like systems"; + homepage = http://backup.github.io/backup/v4/; + license = licenses.mit; + maintainers = [ maintainers.palo ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/backup/backup/gemset.nix b/pkgs/tools/backup/backup/gemset.nix new file mode 100644 index 00000000000..e2de995996e --- /dev/null +++ b/pkgs/tools/backup/backup/gemset.nix @@ -0,0 +1,778 @@ +{ + "CFPropertyList" = { + version = "2.3.1"; + source = { + type = "gem"; + sha256 = "1wnk3gxnhfafbhgp0ic7qhzlx3lhv04v8nws2s31ii5s8135hs6k"; + }; + }; + "addressable" = { + version = "2.3.5"; + source = { + type = "gem"; + sha256 = "11hv69v6h39j7m4v51a4p7my7xwjbhxbsg3y7ja156z7by10wkg7"; + }; + }; + "atomic" = { + version = "1.1.14"; + source = { + type = "gem"; + sha256 = "09dzi1gxr5yj273s6s6ss7l2sq4ayavpg95561kib3n4kzvxrhk4"; + }; + }; + "aws-ses" = { + version = "0.5.0"; + source = { + type = "gem"; + sha256 = "1kpfcdnakngypgkzn1f8cl8p4jg1rvmx3ag4ggcl0c7gs91ki8k3"; + }; + dependencies = [ + "builder" + "mail" + "mime-types" + "xml-simple" + ]; + }; + "backup" = { + version = "4.2.2"; + source = { + type = "gem"; + sha256 = "0fj5jq6s1kpgp4bl1sr7qw1dgyc9zk0afh6mrfgbscg82irfxi1p"; + }; + dependencies = [ + "CFPropertyList" + "addressable" + "atomic" + "aws-ses" + "buftok" + "builder" + "descendants_tracker" + "dogapi" + "dropbox-sdk" + "equalizer" + "excon" + "faraday" + "fission" + "flowdock" + "fog" + "fog-atmos" + "fog-aws" + "fog-brightbox" + "fog-core" + "fog-ecloud" + "fog-json" + "fog-profitbricks" + "fog-radosgw" + "fog-riakcs" + "fog-sakuracloud" + "fog-serverlove" + "fog-softlayer" + "fog-storm_on_demand" + "fog-terremark" + "fog-vmfusion" + "fog-voxel" + "fog-xml" + "formatador" + "hipchat" + "http" + "http_parser.rb" + "httparty" + "inflecto" + "ipaddress" + "json" + "mail" + "memoizable" + "mime-types" + "mini_portile" + "multi_json" + "multi_xml" + "multipart-post" + "net-scp" + "net-sftp" + "net-ssh" + "nokogiri" + "open4" + "pagerduty" + "polyglot" + "simple_oauth" + "thor" + "thread_safe" + "treetop" + "twitter" + "unf" + "unf_ext" + "xml-simple" + ]; + }; + "buftok" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs"; + }; + }; + "builder" = { + version = "3.2.2"; + source = { + type = "gem"; + sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; + }; + }; + "descendants_tracker" = { + version = "0.0.3"; + source = { + type = "gem"; + sha256 = "0819j80k85j62qjg90v8z8s3h4nf3v6afxxz73hl6iqxr2dhgmq1"; + }; + }; + "diff-lcs" = { + version = "1.2.5"; + source = { + type = "gem"; + sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; + }; + }; + "dogapi" = { + version = "1.11.0"; + source = { + type = "gem"; + sha256 = "01v5jphxbqdn8h0pifgl97igcincd1pjwd177a80ig9fpwndd19d"; + }; + dependencies = [ + "json" + ]; + }; + "dropbox-sdk" = { + version = "1.5.1"; + source = { + type = "gem"; + sha256 = "1zrzxzjfgwkdnn5vjvkhhjh10azyy28982hpkw5xv0kwrqg07axj"; + }; + dependencies = [ + "json" + ]; + }; + "equalizer" = { + version = "0.0.9"; + source = { + type = "gem"; + sha256 = "1i6vfh2lzyrvvm35qa9cf3xh2gxj941x0v78pp0c7bwji3f5hawr"; + }; + }; + "excon" = { + version = "0.44.4"; + source = { + type = "gem"; + sha256 = "062ynrdazix4w1lz6n8qgm3dasi2837sfn88ma96pbp4sk11gbp5"; + }; + }; + "faraday" = { + version = "0.8.8"; + source = { + type = "gem"; + sha256 = "1cnyj5japrnv6wvl01la5amf7hikckfznh8234ad21n730b2wci4"; + }; + dependencies = [ + "multipart-post" + ]; + }; + "fission" = { + version = "0.5.0"; + source = { + type = "gem"; + sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh"; + }; + dependencies = [ + "CFPropertyList" + ]; + }; + "flowdock" = { + version = "0.4.0"; + source = { + type = "gem"; + sha256 = "1myza5n6wqk550ky3ld4np89cd491prndqy0l1fqsddxpap6pp60"; + }; + dependencies = [ + "httparty" + "multi_json" + ]; + }; + "fog" = { + version = "1.28.0"; + source = { + type = "gem"; + sha256 = "12b03r77vdicbsc7j6by2gysm16wij32z65qp6bkrxkfba9yb37h"; + }; + dependencies = [ + "fog-atmos" + "fog-aws" + "fog-brightbox" + "fog-core" + "fog-ecloud" + "fog-json" + "fog-profitbricks" + "fog-radosgw" + "fog-riakcs" + "fog-sakuracloud" + "fog-serverlove" + "fog-softlayer" + "fog-storm_on_demand" + "fog-terremark" + "fog-vmfusion" + "fog-voxel" + "fog-xml" + "ipaddress" + "nokogiri" + ]; + }; + "fog-atmos" = { + version = "0.1.0"; + source = { + type = "gem"; + sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9"; + }; + dependencies = [ + "fog-core" + "fog-xml" + ]; + }; + "fog-aws" = { + version = "0.1.1"; + source = { + type = "gem"; + sha256 = "17a3sspf81bgvkrrrmwx7aci7fjy1m7b3w61ljc2mpqbafz80v7i"; + }; + dependencies = [ + "fog-core" + "fog-json" + "fog-xml" + "ipaddress" + ]; + }; + "fog-brightbox" = { + version = "0.7.1"; + source = { + type = "gem"; + sha256 = "1cpa92q2ls51gidxzn407x53f010k0hmrl94ipw7rdzdapp8c4cn"; + }; + dependencies = [ + "fog-core" + "fog-json" + "inflecto" + ]; + }; + "fog-core" = { + version = "1.29.0"; + source = { + type = "gem"; + sha256 = "0ayv9j3i7jy2d1l4gw6sfchgb8l62590a6fpvpr7qvdjc79mvm3p"; + }; + dependencies = [ + "builder" + "excon" + "formatador" + "mime-types" + "net-scp" + "net-ssh" + ]; + }; + "fog-ecloud" = { + version = "0.0.2"; + source = { + type = "gem"; + sha256 = "0lhxjp6gi48zanqmkblyhxjp0lknl1akifgfk5lq3j3vj2d3pnr8"; + }; + dependencies = [ + "fog-core" + "fog-xml" + ]; + }; + "fog-json" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "1517sm8bl0bmaw2fbaf5ra6midq3wzgkpm55lb9rw6jm5ys23lyw"; + }; + dependencies = [ + "multi_json" + ]; + }; + "fog-profitbricks" = { + version = "0.0.2"; + source = { + type = "gem"; + sha256 = "0hk290cw99qx727sxfhxlmczv9kv15hlnrflh00wfprqxk4r8rd4"; + }; + dependencies = [ + "fog-core" + "fog-xml" + "nokogiri" + ]; + }; + "fog-radosgw" = { + version = "0.0.3"; + source = { + type = "gem"; + sha256 = "1fbpi0sfff5f5hrn4f7ish260cykzcqvzwmvm61i6mprfrfnx10r"; + }; + dependencies = [ + "fog-core" + "fog-json" + "fog-xml" + ]; + }; + "fog-riakcs" = { + version = "0.1.0"; + source = { + type = "gem"; + sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm"; + }; + dependencies = [ + "fog-core" + "fog-json" + "fog-xml" + ]; + }; + "fog-sakuracloud" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "1805m44x2pclhjyvdrpj6zg8l9dldgnc20h0g61r7hqxpydz066x"; + }; + dependencies = [ + "fog-core" + "fog-json" + ]; + }; + "fog-serverlove" = { + version = "0.1.1"; + source = { + type = "gem"; + sha256 = "094plkkr6xiss8k85fp66g7z544kxgfx1ck0f3sqndk27miw26jk"; + }; + dependencies = [ + "fog-core" + "fog-json" + ]; + }; + "fog-softlayer" = { + version = "0.4.1"; + source = { + type = "gem"; + sha256 = "1cf6y6xxjjpjglz31kf6jmmyh687x7sxhn4bx3hlr1nb1hcy19sq"; + }; + dependencies = [ + "fog-core" + "fog-json" + ]; + }; + "fog-storm_on_demand" = { + version = "0.1.0"; + source = { + type = "gem"; + sha256 = "0rrfv37x9y07lvdd03pbappb8ybvqb6g8rxzwvgy3mmbmbc6l6d2"; + }; + dependencies = [ + "fog-core" + "fog-json" + ]; + }; + "fog-terremark" = { + version = "0.0.4"; + source = { + type = "gem"; + sha256 = "0bxznlc904zaw3qaxhkvhqqbrv9n6nf5idih8ra9dihvacifwhvc"; + }; + dependencies = [ + "fog-core" + "fog-xml" + ]; + }; + "fog-vmfusion" = { + version = "0.0.1"; + source = { + type = "gem"; + sha256 = "0x1vxc4a627g7ambcprhxiqvywy64li90145r96b2ig9z23hmy7g"; + }; + dependencies = [ + "fission" + "fog-core" + ]; + }; + "fog-voxel" = { + version = "0.0.2"; + source = { + type = "gem"; + sha256 = "0by7cs0c044b8dkcmcf3pjzydnrakj8pnbcxzhw8hwlgqr0jfqgn"; + }; + dependencies = [ + "fog-core" + "fog-xml" + ]; + }; + "fog-xml" = { + version = "0.1.1"; + source = { + type = "gem"; + sha256 = "0kgxjwz0mzyp7bgj1ycl9jyfmzfqc1fjdz9sm57fgj5w31jfvxw5"; + }; + dependencies = [ + "fog-core" + "nokogiri" + ]; + }; + "formatador" = { + version = "0.2.5"; + source = { + type = "gem"; + sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; + }; + }; + "fuubar" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "0xwqs24y8s73aayh39si17kccsmr0bjgmi6jrjyfp7gkjb6iyhpv"; + }; + dependencies = [ + "rspec" + "ruby-progressbar" + ]; + }; + "hipchat" = { + version = "1.0.1"; + source = { + type = "gem"; + sha256 = "1khcb6cxrr1qn104rl87wq85anigykf45x7knxnyqfpwnbda2nh1"; + }; + dependencies = [ + "httparty" + ]; + }; + "http" = { + version = "0.5.0"; + source = { + type = "gem"; + sha256 = "1vw10xxs0i7kn90lx3b2clfkm43nb59jjph902bafpsaarqsai8d"; + }; + dependencies = [ + "http_parser.rb" + ]; + }; + "http_parser.rb" = { + version = "0.6.0"; + source = { + type = "gem"; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + }; + }; + "httparty" = { + version = "0.12.0"; + source = { + type = "gem"; + sha256 = "10y3znh7s1fx88lbnbsmyx5zri6jr1gi48zzzq89wir8q9zlp28c"; + }; + dependencies = [ + "json" + "multi_xml" + ]; + }; + "inflecto" = { + version = "0.0.2"; + source = { + type = "gem"; + sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4"; + }; + }; + "ipaddress" = { + version = "0.8.0"; + source = { + type = "gem"; + sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir"; + }; + }; + "json" = { + version = "1.8.2"; + source = { + type = "gem"; + sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; + }; + }; + "mail" = { + version = "2.5.4"; + source = { + type = "gem"; + sha256 = "0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4"; + }; + dependencies = [ + "mime-types" + "treetop" + ]; + }; + "memoizable" = { + version = "0.4.0"; + source = { + type = "gem"; + sha256 = "0xhg8c9qw4y35qp1k8kv20snnxk6rlyilx354n1d72r0y10s7qcr"; + }; + dependencies = [ + "thread_safe" + ]; + }; + "metaclass" = { + version = "0.0.4"; + source = { + type = "gem"; + sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5"; + }; + }; + "mime-types" = { + version = "1.25.1"; + source = { + type = "gem"; + sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8"; + }; + }; + "mini_portile" = { + version = "0.6.2"; + source = { + type = "gem"; + sha256 = "0h3xinmacscrnkczq44s6pnhrp4nqma7k056x5wv5xixvf2wsq2w"; + }; + }; + "mocha" = { + version = "1.1.0"; + source = { + type = "gem"; + sha256 = "107nmnngbv8lq2g7hbjpn5kplb4v2c8gs9lxrg6vs8gdbddkilzi"; + }; + dependencies = [ + "metaclass" + ]; + }; + "multi_json" = { + version = "1.10.1"; + source = { + type = "gem"; + sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c"; + }; + }; + "multi_xml" = { + version = "0.5.5"; + source = { + type = "gem"; + sha256 = "0i8r7dsz4z79z3j023l8swan7qpbgxbwwz11g38y2vjqjk16v4q8"; + }; + }; + "multipart-post" = { + version = "1.2.0"; + source = { + type = "gem"; + sha256 = "12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc"; + }; + }; + "net-scp" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + }; + dependencies = [ + "net-ssh" + ]; + }; + "net-sftp" = { + version = "2.1.2"; + source = { + type = "gem"; + sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y"; + }; + dependencies = [ + "net-ssh" + ]; + }; + "net-ssh" = { + version = "2.9.2"; + source = { + type = "gem"; + sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r"; + }; + }; + "nokogiri" = { + version = "1.6.6.2"; + source = { + type = "gem"; + sha256 = "1j4qv32qjh67dcrc1yy1h8sqjnny8siyy4s44awla8d6jk361h30"; + }; + dependencies = [ + "mini_portile" + ]; + }; + "open4" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "12jyp97p7pq29q1zmkdrhzvg5cg2x3hlfdbq6asnb9nqlkx6vhf2"; + }; + }; + "pagerduty" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "1ads8bj2swm3gbhr6193ls83pnwsy39xyh3i8sw6rl8fxfdf717v"; + }; + dependencies = [ + "json" + ]; + }; + "polyglot" = { + version = "0.3.3"; + source = { + type = "gem"; + sha256 = "082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v"; + }; + }; + "rspec" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "12axhz2nj2m0dy350lxym76m36m1hq48hc59mf00z9dajbpnj78s"; + }; + dependencies = [ + "rspec-core" + "rspec-expectations" + "rspec-mocks" + ]; + }; + "rspec-core" = { + version = "3.4.1"; + source = { + type = "gem"; + sha256 = "0zl4fbrzl4gg2bn3fhv910q04sm2jvzdidmvd71gdgqwbzk0zngn"; + }; + dependencies = [ + "rspec-support" + ]; + }; + "rspec-expectations" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "07pz570glwg87zpyagxxal0daa1jrnjkiksnn410s6846884fk8h"; + }; + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + }; + "rspec-mocks" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "0iw9qvpawj3cfcg3xipi1v4y11g9q4f5lvmzgksn6f0chf97sjy1"; + }; + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + }; + "rspec-support" = { + version = "3.4.1"; + source = { + type = "gem"; + sha256 = "0l6zzlf22hn3pcwnxswsjsiwhqjg7a8mhvm680k5vq98307bkikr"; + }; + }; + "ruby-progressbar" = { + version = "1.7.5"; + source = { + type = "gem"; + sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi"; + }; + }; + "simple_oauth" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "1vsjhxybif9r53jx4dhhwf80qjkg7gbwpfmskjqns223qrhwsxig"; + }; + }; + "thor" = { + version = "0.18.1"; + source = { + type = "gem"; + sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3"; + }; + }; + "thread_safe" = { + version = "0.1.3"; + source = { + type = "gem"; + sha256 = "0f2w62x5nx95d2c2lrn9v4g60xhykf8zw7jaddkrgal913dzifgq"; + }; + dependencies = [ + "atomic" + ]; + }; + "timecop" = { + version = "0.8.0"; + source = { + type = "gem"; + sha256 = "0zf46hkd36y2ywysjfgkvpcc5v04s2rwlg2k7k8j23bh7k8sgiqs"; + }; + }; + "treetop" = { + version = "1.4.15"; + source = { + type = "gem"; + sha256 = "1zqj5y0mvfvyz11nhsb4d5ch0i0rfcyj64qx19mw4qhg3hh8z9pz"; + }; + dependencies = [ + "polyglot" + "polyglot" + ]; + }; + "twitter" = { + version = "5.5.0"; + source = { + type = "gem"; + sha256 = "0yl1im3s4svl4hxxsyc60mm7cxvwz538amc9y0vzw6lkiii5f197"; + }; + dependencies = [ + "addressable" + "buftok" + "descendants_tracker" + "equalizer" + "faraday" + "http" + "http_parser.rb" + "json" + "memoizable" + "simple_oauth" + ]; + }; + "unf" = { + version = "0.1.3"; + source = { + type = "gem"; + sha256 = "1f2q8mxxngg8q608r6xajpharp9zz1ia3336y1lsg1asn2ach2sm"; + }; + dependencies = [ + "unf_ext" + ]; + }; + "unf_ext" = { + version = "0.0.6"; + source = { + type = "gem"; + sha256 = "07zbmkzcid6pzdqgla3456ipfdka7j1v4hsx1iaa8rbnllqbmkdg"; + }; + }; + "xml-simple" = { + version = "1.1.4"; + source = { + type = "gem"; + sha256 = "0x5c3mqhahh8hzqqq41659bxj0wn3n6bhj5p6b4hsia2k4akzg6s"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 928c0494a1c..9aea0c80c6f 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -1,18 +1,19 @@ -{stdenv, fetchurl +{stdenv, fetchFromGitHub , pkgconfig, libuuid -, e2fsprogs +, e2fsprogs, automake, autoconf }: stdenv.mkDerivation { name = "partclone-stable"; enableParallelBuilding = true; - src = fetchurl { - url = https://codeload.github.com/Thomas-Tsai/partclone/legacy.tar.gz/stable; - sha256 = "12bnhljc4n4951p5c05gc7z5qwdsjpx867ad1npmgsm8d9w941sn"; - name = "Thomas-Tsai-partclone-stable-20150722.tar.gz"; + src = fetchFromGitHub { + owner = "Thomas-Tsai"; + repo = "partclone"; + rev = "stable"; + sha256 = "0q3brjmnldpr89nhbiajxg3gncz0nagc34n7q2723lpz7bn28w3z"; }; - buildInputs = [e2fsprogs pkgconfig libuuid]; + buildInputs = [e2fsprogs pkgconfig libuuid automake autoconf]; installPhase = ''make INSTPREFIX=$out install''; diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index bacfbdfe1ca..f46a2c20de4 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -16,10 +16,11 @@ let patch = writeText "rsnapshot-config.patch" '' ''; in stdenv.mkDerivation rec { - name = "rsnapshot-1.3.1"; + name = "rsnapshot-1.4.1"; + src = fetchurl { - url = "mirror://sourceforge/rsnapshot/${name}.tar.gz"; - sha256 = "0pn7vlg3yxl7xrvfwmp4zlrg3cckmlldq6qr5bs3b2b281zcgdll"; + url = "http://rsnapshot.org/downloads/${name}.tar.gz"; + sha256 = "1s28wkpqajgmwi88n3xs3qsa4b7yxd6lkl4zfi0mr06klwli2jpv"; }; propagatedBuildInputs = [perl openssh rsync logger]; diff --git a/pkgs/tools/backup/rsnapshot/git.nix b/pkgs/tools/backup/rsnapshot/git.nix deleted file mode 100644 index d1025a11d29..00000000000 --- a/pkgs/tools/backup/rsnapshot/git.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ fetchFromGitHub, stdenv, writeText, perl, openssh, rsync, logger, - configFile ? "/etc/rsnapshot.conf" }: - -let patch = writeText "rsnapshot-config.patch" '' ---- rsnapshot-program.pl 2013-10-05 20:31:08.715991442 +0200 -+++ rsnapshot-program.pl 2013-10-05 20:31:42.496193633 +0200 -@@ -383,7 +383,7 @@ - } - - # set global variable -- $config_file = $default_config_file; -+ $config_file = '${configFile}'; - } - - # accepts no args -''; -in -stdenv.mkDerivation rec { - name = "rsnapshot-1.4git"; - src = fetchFromGitHub { - owner = "DrHyde"; - repo = "rsnapshot"; - rev = "1047cbb57937c29233388e2fcd847fecd3babe74"; - sha256 = "173y9q89dp4zf7nysqhjp3i2m086n7qdpawb9vx0ml5zha6mxf2p"; - }; - - propagatedBuildInputs = [perl openssh rsync logger]; - - patchPhase = '' - substituteInPlace "Makefile.in" --replace \ - "/usr/bin/pod2man" "${perl}/bin/pod2man" - patch -p0 <${patch} - ''; - - # I still think this is a good idea, but it currently fails in the chroot because it checks - # that things are writable and so on. - #checkPhase = '' - # if [ -f "${configFile}" ] - # then - # ${perl}/bin/perl -w ./rsnapshot configtest - # else - # echo File "${configFile}" does not exist, not checking - # fi - #''; - - meta = with stdenv.lib; { - description = "A filesystem snapshot utility for making backups of local and remote systems"; - homepage = http://rsnapshot.org/; - license = stdenv.lib.licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 48f4c4fe3c3..675a44b838b 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, linkStatic ? false }: +{ stdenv, fetchurl, libtool, autoconf, automake, gnum4, linkStatic ? false }: let version = "1.0.6"; @@ -15,14 +15,26 @@ in stdenv.mkDerivation { }; crossAttrs = { - patchPhase = '' + buildInputs = [ libtool autoconf automake gnum4 ]; + patches = [ + # original upstream for the autoconf patch is here: + # http://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6-autoconfiscated.patch + # but we get the mingw-builds version of the patch, which fixes + # a few more issues + (fetchurl { + url = "https://raw.githubusercontent.com/niXman/mingw-builds/17ae841dcf6e72badad7941a06d631edaf687436/patches/bzip2/bzip2-1.0.6-autoconfiscated.patch"; + sha256 = "1flbd3i8vg9kzq0a712qcg9j2c4ymnqvgd0ldyafpzvbqj1iicnp"; + }) + ]; + patchFlags = "-p0"; + postPatch = '' sed -i -e '//s|\\|/|' bzip2.c - sed -i -e 's/CC=gcc/CC=${stdenv.cross.config}-gcc/' \ - -e 's/AR=ar/AR=${stdenv.cross.config}-ar/' \ - -e 's/RANLIB=ranlib/RANLIB=${stdenv.cross.config}-ranlib/' \ - -e 's/bzip2recover test/bzip2recover/' \ - Makefile* ''; + preConfigure = "sh ./autogen.sh"; + # clear native hooks that are not needed with autoconf + preBuild = ""; + preInstall = ""; + postInstall = ""; }; outputs = [ "dev" "bin" "static" ] ++ stdenv.lib.optional sharedLibrary "out"; diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index f8fa5cc264d..073dc585e74 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Userland tools for the f2fs filesystem"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ emery jagajaga ]; + maintainers = with maintainers; [ ehmry jagajaga ]; }; } diff --git a/pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch b/pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch index 86eb6f81869..c74b75b7e43 100644 --- a/pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch +++ b/pkgs/tools/filesystems/xfsprogs/4.2.0-sharedlibs.patch @@ -78,3 +78,23 @@ ifeq ($(HAVE_BUILDDEFS), yes) +--- xfsprogs-4.2.0/quota/Makefile ++++ xfsprogs-4.2.0/quota/Makefile +@@ -16,7 +16,6 @@ LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g") + + LLDLIBS = $(LIBXCMD) + LTDEPENDENCIES = $(LIBXCMD) +-LLDFLAGS = -static + + ifeq ($(ENABLE_READLINE),yes) + LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP) +--- xfsprogs-4.2.0/mdrestore/Makefile ++++ xfsprogs-4.2.0/mdrestore/Makefile +@@ -10,7 +10,6 @@ CFILES = xfs_mdrestore.c + + LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) $(LIBUUID) + LTDEPENDENCIES = $(LIBXFS) +-LLDFLAGS = -static + + default: depend $(LTCOMMAND) + diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 13f9e30c8da..a4184fd9514 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pil, djvulibre +{stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pillow, djvulibre , optipng, unrar}: stdenv.mkDerivation { @@ -15,6 +15,8 @@ stdenv.mkDerivation { buildInputs = [ unzip python makeWrapper ]; + broken = true; # Not found. + phases = "unpackPhase patchPhase installPhase"; unpackPhase = '' @@ -36,7 +38,7 @@ stdenv.mkDerivation { mkdir -p $PYDIR cp -R *.py pylrs $PYDIR - wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pil}/$LIBSUFFIX/PIL:$PYDIR \ + wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \ --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre.bin}/bin:${unrar}/bin:${optipng}/bin ''; diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 3be824d9a40..85bd21f9b72 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0fadfssvj9klj4dq9wdrzys1k2a1z2j0p6kgnfgbjv0n1bq6h4cy"; }; + patches = + [ (fetchurl { + url = "https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-misc/bfr/files/bfr-1.6-perl.patch?revision=1.1"; + sha256 = "1pk9jm3c1qzs727lh0bw61w3qbykaqg4jblywf9pvq5bypk88qfj"; + }) + ]; + buildInputs = [ perl ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 40ebf2174ae..4d9adc6c688 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -2,6 +2,7 @@ , aclSupport ? false, acl ? null , selinuxSupport? false, libselinux ? null, libsepol ? null , autoconf, automake114x, texinfo +, withPrefix ? false }: assert aclSupport -> acl != null; @@ -39,6 +40,8 @@ let outputs = [ "out" "info" ]; nativeBuildInputs = [ perl xz.bin ]; + configureFlags = optionalString stdenv.isSunOS "ac_cv_func_inotify_init=no"; + buildInputs = [ gmp ] ++ optional aclSupport acl ++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ] # due to patch @@ -82,9 +85,21 @@ let enableParallelBuilding = false; NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; + FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1"; makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; + # e.g. ls -> gls; grep -> ggrep + postFixup = # feel free to simplify on a mass rebuild + if withPrefix then + '' + ( + cd "$out/bin" + find * -type f -executable -exec mv {} g{} \; + ) + '' + else null; + meta = { homepage = http://www.gnu.org/software/coreutils/; description = "The basic file, shell and text manipulation utilities of the GNU operating system"; @@ -105,6 +120,3 @@ let }; in self - // stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux" || stdenv.isSunOS) { - FORCE_UNSAFE_CONFIGURE = 1; - } diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index 22006310780..4b4eb87b0ea 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Multi-algo CPUMiner"; homepage = https://github.com/wolf9466/cpuminer-multi; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index ec9458e70ae..e4c161b2e51 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { { description = "Network boot firmware"; homepage = http://ipxe.org/; license = licenses.gpl2; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index af8a0dd7d81..75e00635320 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.greenwoodsoftware.com/less/; description = "A more advanced file pager than ‘more’"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index ab02c7dc3d1..15bb44a0e47 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out - cp -r {Gemfile*,vendor,lib} $out - cp bin/logstash $out/logstash - cp bin/plugin $out/logstash-plugin + cp -r {Gemfile*,vendor,lib,bin} $out + mv $out/bin/plugin $out/bin/logstash-plugin ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/tools/misc/makebootfat/default.nix index 03c913b7224..dc66976720d 100644 --- a/pkgs/tools/misc/makebootfat/default.nix +++ b/pkgs/tools/misc/makebootfat/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { description = "Create bootable USB disks using the FAT filesystem and syslinux"; homepage = "http://advancemame.sourceforge.net/boot-readme.html"; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 1d5da633061..dafc30bd647 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "0.20.2015.10.25"; + version = "0.20.2015.11.29"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0azai5clc96lhsx4kj5rvp5bhiq4bwgl51r49b9x4i5s1bhfaz40"; + sha256 = "10y0qxyyfw9kxiax3b0gdd38yz2y3lii75mgvlq6q6h77r3wham4"; }; pythonPaths = [ pycrypto requests2 ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 52d79a9bd5d..d21b4fb2f3f 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, perl, systemd, iw, rfkill, hdparm, ethtool, inetutils -, kmod, pciutils, smartmontools, x86_energy_perf_policy +, module_init_tools, pciutils, smartmontools, x86_energy_perf_policy , enableRDW ? false, networkmanager }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation { buildInputs = [ perl ]; paths = lib.makeSearchPath "bin" - ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools + ([ iw rfkill hdparm ethtool inetutils systemd module_init_tools pciutils smartmontools x86_energy_perf_policy ] ++ lib.optional enableRDW networkmanager diff --git a/pkgs/tools/misc/xapian-omega/default.nix b/pkgs/tools/misc/xapian-omega/default.nix new file mode 100644 index 00000000000..68241ac0e90 --- /dev/null +++ b/pkgs/tools/misc/xapian-omega/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib }: + +stdenv.mkDerivation rec { + name = "xapian-omega-${version}"; + version = "1.2.21"; + + src = fetchurl { + url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; + sha256 = "0zjjr4ypanwrjkcpgi37d72v2jjcfwnw8lgddv0i7z2jf1fklbc6"; + }; + + buildInputs = [ pkgconfig xapian perl pcre zlib ]; + + meta = with stdenv.lib; { + description = "Indexer and CGI search front-end built on Xapian library"; + homepage = http://xapian.org/; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 049fc1b5f3f..f6b61de2a98 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "mptre"; repo = "yank"; rev = "v${meta.version}"; - sha256 = "066nsm8b5785r2zaajihf8g6x9hc4n8kpk3j2n1slp5alnhx93mx"; + sha256 = "0v1imwjp851gz86p9m3x1dd8bi649gr8j99xz6ask1pbkxvji73c"; inherit name; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "0.4.1"; + version = "0.6.0"; maintainers = [ maintainers.dochang ]; }; diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index ea4fc519b18..8f335d7cf58 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-navigation-tools-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "psprint"; repo = "zsh-navigation-tools"; rev = "v${version}"; - sha256 = "1akkmjxv04rfqpx49hdwfwjp2842xpk0q7w5ymywzl0w4ldm2lmc"; + sha256 = "1xj1jakcrf0sfkiq6l1drg6vzylhkk0kmhs7nz08dv18pgx9jy36"; }; dontBuild = true; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 45155cf306f..a3719570e89 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { homepage = https://github.com/cjdelisle/cjdns; description = "Encrypted networking for regular people"; license = licenses.gpl3; - maintainers = with maintainers; [ viric emery ]; + maintainers = with maintainers; [ viric ehmry ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index f890bdddb69..efd2c17a43e 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, which}: -stdenv.mkDerivation { - name = "cntlm-0.35.1"; +stdenv.mkDerivation rec { + name = "cntlm-${version}"; + version = "0.92.3"; src = fetchurl { - url = mirror://sourceforge/cntlm/cntlm-0.35.1.tar.gz; - sha256 = "7b3fb7184e72cc3f1743bb8e503a5305e96458bc630a7e1ebfc9f3c07ffa6c5e"; + url = "mirror://sourceforge/cntlm/${name}.tar.gz"; + sha256 = "1632szz849wasvh5sm6rm1zbvbrkq35k7kcyvx474gyl4h4x2flw"; }; buildInputs = [ which ]; @@ -16,10 +17,15 @@ stdenv.mkDerivation { mkdir -p $out/man/; cp doc/cntlm.1 $out/man/; ''; - meta = { + meta = with stdenv.lib; { description = "NTLM/NTLMv2 authenticating HTTP proxy"; homepage = http://cntlm.sourceforge.net/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.qknight ]; + license = licenses.gpl2; + maintainers = + [ + maintainers.qknight + maintainers.markWot + ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/tools/networking/corkscrew/default.nix new file mode 100644 index 00000000000..96747e82cee --- /dev/null +++ b/pkgs/tools/networking/corkscrew/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "corkscrew-2.0"; + + src = fetchurl { + url = "http://agroman.net/corkscrew/${name}.tar.gz"; + sha256 = "0d0fcbb41cba4a81c4ab494459472086f377f9edb78a2e2238ed19b58956b0be"; + }; + + meta = with stdenv.lib; { + homepage = http://agroman.net/corkscrew/; + description = "A tool for tunneling SSH through HTTP proxies"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 8fe3b85d633..5e283943baf 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ + "--disable-manual" ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) ( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 0e905bb6547..35cd7ae4661 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -29,9 +29,15 @@ stdenv.mkDerivation rec { "LOCALEDIR=$(out)/share/locale" ]; + postBuild = '' + make -C contrib/wrt + ''; + postInstall = '' install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf + install -Dm755 contrib/wrt/dhcp_lease_time $out/bin/dhcp_lease_time + install -Dm755 contrib/wrt/dhcp_release $out/bin/dhcp_release mkdir -p $out/share/dbus-1/system-services cat < $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 6b4c1f55643..0ec0f35f1bd 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-2015.70"; + name = "dropbear-2015.71"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "0mzj1gwamxmk8rab4xmcvldcxdvs5zczim2hdza3dwfhy4ywra32"; + sha256 = "1bw3lzmisn6gs6zy9vcqbfnicl437ydskqcayklpw60fkhb18qip"; }; dontDisableStatic = enableStatic; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index de8488ab3a8..f6201b44b3e 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, openssl }: +{ stdenv, pkgs, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { majorVersion = "1.5"; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { sha256 = "16cg1jmy2d8mq2ypwifsvhbyp4pyrj0zm0r818sx0r4hchwdsrcm"; }; - buildInputs = [ openssl ]; + buildInputs = [ openssl zlib ]; # TODO: make it work on darwin/bsd as well preConfigure = '' - export makeFlags="TARGET=linux2628 PREFIX=$out USE_OPENSSL=yes" + export makeFlags="TARGET=${if stdenv.isSunOS then "solaris" else "linux2628"} PREFIX=$out USE_OPENSSL=yes USE_ZLIB=yes" ''; meta = { diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 5b439eb8f3f..0829fed1d5e 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,10 +1,10 @@ { stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: stdenv.mkDerivation rec { - name = "i2p-0.9.22"; + name = "i2p-0.9.23"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "0y21dx5d95gq1i6ip56nmawr19974zawzwa315dm8lmz32bj8g6n"; + sha256 = "1vjyki86r6v8z2pil7s6r74yf6h8w000ypxxngimw3kfff121swp"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 298e2251368..e3e31e5408b 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,13 +1,13 @@ { pkgs, fetchurl, buildPythonPackage, sqlite3 }: buildPythonPackage rec { - version = "6.5.7"; + version = "6.6.0"; name = "offlineimap-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz"; - sha256 = "18whwc4f8nk8gi3mjw9153c9cvwd3i9i7njmpdbhcplrv33m5pmp"; + sha256 = "1x33zxjm3y2p54lbcsgflrs6v2zq785y2k0xi6xia6akrvjmh4n4"; }; doCheck = false; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index e780865ab3b..f90370edf51 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { --enable-systemd --enable-iproute2 IPROUTE=${iproute}/sbin/ip - '' + optionalString stdenv.isDarwin '' - --disable-plugin-auth-pam ''; postInstall = '' diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 421e0b205db..4f8c493a0f0 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -1,21 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libsigcxx, zlib }: +{ stdenv, fetchFromGitHub, pkgconfig +, libtool, autoconf, automake, cppunit +, openssl, libsigcxx, zlib }: stdenv.mkDerivation rec { name = "libtorrent-${version}"; version = "0.13.6"; - src = fetchurl { - url = "http://rtorrent.net/downloads/${name}.tar.gz"; - sha256 = "012s1nwcvz5m5r4d2z9klgy2n34kpgn9kgwgzxm97zgdjs6a0f18"; + src = fetchFromGitHub rec { + owner = "rakshasa"; + repo = "libtorrent"; + rev = "${version}"; + sha256 = "1rvrxgb131snv9r6ksgzmd74rd9z7q46bhky0zazz7dwqqywffcp"; }; - buildInputs = [ pkgconfig openssl libsigcxx zlib ]; + buildInputs = [ pkgconfig libtool autoconf automake cppunit openssl libsigcxx zlib ]; + + preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - homepage = https://github.com/rakshasa/libtorrent/; + homepage = http://www.libtorrent.org/; description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; platforms = platforms.unix; - maintainers = with maintainers; [ simons ebzzry ]; + maintainers = with maintainers; [ simons ebzzry codyopel ]; }; } diff --git a/pkgs/tools/networking/p2p/libtorrent/git.nix b/pkgs/tools/networking/p2p/libtorrent/git.nix deleted file mode 100644 index e187a96dc0a..00000000000 --- a/pkgs/tools/networking/p2p/libtorrent/git.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, autoconf, automake, cppunit, fetchFromGitHub, pkgconfig, openssl, libsigcxx, libtool, zlib }: - -stdenv.mkDerivation { - name = "libtorrent-git-2014-08-20"; - - src = fetchFromGitHub rec { - owner = "rakshasa"; - repo = "libtorrent"; - rev = "c60d2b9475804e41649356fa0301e9f770798f8d"; - sha256 = "1x78g5yd4q0ksdsw91awz2a1ax8zyfy5b53gbbil4fpjy96vb577"; - }; - - buildInputs = [ autoconf automake cppunit pkgconfig openssl libsigcxx libtool zlib ]; - - configureFlags = "--disable-dependency-tracking --enable-aligned"; - - preConfigure = '' - ./autogen.sh - ''; - - meta = with stdenv.lib; { - homepage = "http://libtorrent.rakshasa.no/"; - description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ codyopel ]; - }; -} diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index d702e3b9700..0d676795ab8 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -1,30 +1,50 @@ -{ stdenv, fetchurl, libtorrent, ncurses, pkgconfig, libsigcxx, curl +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig +, libtool, autoconf, automake, cppunit +, libtorrent, ncurses, libsigcxx, curl , zlib, openssl, xmlrpc_c + +# This no longer works +, colorSupport ? false }: stdenv.mkDerivation rec { name = "rtorrent-${version}"; version = "0.9.6"; - src = fetchurl { - url = "http://rtorrent.net/downloads/${name}.tar.gz"; - sha256 = "03jvzw9pi2mhcm913h8qg0qw9gwjqc6lhwynb1yz1y163x7w4s8y"; + src = fetchFromGitHub { + owner = "rakshasa"; + repo = "rtorrent"; + rev = "${version}"; + sha256 = "0iyxmjr1984vs7hrnxkfwgrgckacqml0kv4bhj185w9bhjqvgfnf"; }; - buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl xmlrpc_c ]; - configureFlags = "--with-xmlrpc-c"; + buildInputs = [ + pkgconfig libtool autoconf automake cppunit + libtorrent ncurses libsigcxx curl zlib openssl xmlrpc_c + ]; - # postInstall = '' - # mkdir -p $out/share/man/man1 $out/share/rtorrent - # mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 - # mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc - # ''; + # Optional patch adds support for custom configurable colors + # https://github.com/Chlorm/chlorm_overlay/blob/master/net-p2p/rtorrent/README.md + patches = stdenv.lib.optional colorSupport (fetchurl { + url = "https://gist.githubusercontent.com/codyopel/a816c2993f8013b5f4d6/raw/b952b32da1dcf14c61820dfcf7df00bc8918fec4/rtorrent-color.patch"; + sha256 = "00gcl7yq6261rrfzpz2k8bd7mffwya0ifji1xqcvhfw50syk8965"; + }); + + preConfigure = "./autogen.sh"; + + configureFlags = [ "--with-xmlrpc-c" "--with-posix-fallocate" ]; + + postInstall = '' + mkdir -p $out/share/man/man1 $out/share/doc/rtorrent + mv doc/old/rtorrent.1 $out/share/man/man1/rtorrent.1 + mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc + ''; meta = with stdenv.lib; { - homepage = https://github.com/rakshasa/rtorrent/; + inherit (src.meta) homepage; description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; platforms = platforms.unix; - maintainers = with maintainers; [ simons ebzzry ]; + maintainers = with maintainers; [ simons ebzzry codyopel ]; }; } diff --git a/pkgs/tools/networking/p2p/rtorrent/git.nix b/pkgs/tools/networking/p2p/rtorrent/git.nix deleted file mode 100644 index dcdd2e68e15..00000000000 --- a/pkgs/tools/networking/p2p/rtorrent/git.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, autoconf, automake, cppunit, curl, fetchFromGitHub -, fetchurl, libsigcxx, libtool, libtorrent-git, ncurses, openssl -, pkgconfig, zlib, xmlrpc_c -, colorSupport ? false -}: - -# NOTICE: changes since 0.9.4 break the current configuration syntax, an -# example configuration file using the latest changes can be found at -# https://github.com/codyopel/dotfiles/blob/master/dotfiles/rtorrent.rc - -stdenv.mkDerivation { - name = "rtorrent-git-2014-07-02"; - - src = fetchFromGitHub { - owner = "rakshasa"; - repo = "rtorrent"; - rev = "7537a3c2a91d0915f1c4c89b01cd583629dc5fd4"; - sha256 = "1xnyjjff575jfq9c542yq3rr9q03z5x6xbg84d000wkjphbq7h7q"; - }; - - buildInputs = [ - autoconf - automake - cppunit - libtorrent-git - ncurses - pkgconfig - libsigcxx - libtool - curl - zlib - openssl - xmlrpc_c - ]; - - configureFlags = "--with-xmlrpc-c"; - - # Optional patch adds support for custom configurable colors - # https://github.com/Chlorm/chlorm_overlay/blob/master/net-p2p/rtorrent/README.md - - patches = stdenv.lib.optional colorSupport (fetchurl { - url = "https://gist.githubusercontent.com/codyopel/a816c2993f8013b5f4d6/raw/b952b32da1dcf14c61820dfcf7df00bc8918fec4/rtorrent-color.patch"; - sha256 = "00gcl7yq6261rrfzpz2k8bd7mffwya0ifji1xqcvhfw50syk8965"; - }); - - preConfigure = '' - ./autogen.sh - ''; - - # postInstall = '' - # mkdir -p $out/share/man/man1 $out/share/rtorrent - # mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 - # mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc - # ''; - - meta = with stdenv.lib; { - homepage = "http://libtorrent.rakshasa.no/"; - description = "An ncurses client for libtorrent, ideal for use with screen or dtach"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ codyopel ]; - }; -} diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabbswitch/default.nix similarity index 52% rename from pkgs/tools/networking/snabb/default.nix rename to pkgs/tools/networking/snabbswitch/default.nix index 9ca8b56491d..f7cd1a4300a 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabbswitch/default.nix @@ -1,16 +1,30 @@ -{stdenv, fetchurl}: +{ stdenv, lib, fetchurl, bash, makeWrapper, git, mariadb, diffutils }: stdenv.mkDerivation rec { - name = "snabb-2015.10"; + name = "snabb-${version}"; + version = "2015.12"; src = fetchurl { - url = "https://github.com/SnabbCo/snabbswitch/archive/v2015.10.tar.gz"; - sha256 = "15cmw7k2siy9m7s1383l1h8kix8cwb143yvwhxdahbnx4lfnzfz8"; + url = "https://github.com/SnabbCo/snabbswitch/archive/v${version}.tar.gz"; + sha256 = "1949a6d3hqdr2hdfmrr1na9gvjdwdahadbhmvz2pg7azmpq6ssmr"; }; + buildInputs = [ makeWrapper ]; + + patchPhase = '' + patchShebangs . + + # some hardcodeism + for f in $(find src/program/snabbnfv/ -type f); do + substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash" + done + ''; + installPhase = '' mkdir -p $out/bin cp src/snabb $out/bin + + wrapProgram $out/bin/snabb --prefix PATH : "${ lib.makeBinPath [ git mariadb diffutils ]}" ''; meta = with stdenv.lib; { @@ -26,7 +40,7 @@ stdenv.mkDerivation rec { ''; platforms = [ "x86_64-linux" ]; license = licenses.asl20; - maintainers = [ maintainers.lukego ]; + maintainers = [ maintainers.lukego maintainers.iElectric ]; }; } diff --git a/pkgs/tools/networking/statsd/default.nix b/pkgs/tools/networking/statsd/default.nix index 1143d55269f..6f909a915ae 100644 --- a/pkgs/tools/networking/statsd/default.nix +++ b/pkgs/tools/networking/statsd/default.nix @@ -3,7 +3,7 @@ let self = recurseIntoAttrs ( - callPackage { + callPackage ../../../top-level/node-packages.nix { inherit nodejs self; generated = callPackage ./node-packages.nix { inherit self; }; overrides = { diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index c15b7a99fe1..51b7285e3e8 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Validating, recursive, and caching DNS resolver"; license = licenses.bsd3; homepage = http://www.unbound.net; - maintainers = [ maintainers.emery ]; - platforms = platforms.unix; + maintainers = [ stdenv.lib.maintainers.ehmry ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index b447272871f..f315ca47876 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -1,40 +1,52 @@ -{ stdenv, makeWrapper, +{ stdenv, makeWrapper, buildEnv, git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused, coreutils }: -stdenv.mkDerivation { - name = "nix-prefetch-scripts"; - buildInputs = [ makeWrapper ]; +let mkPrefetchScript = tool: src: deps: + stdenv.mkDerivation { + name = "nix-prefetch-${tool}"; + + buildInputs = [ makeWrapper ]; + + phases = [ "installPhase" "fixupPhase" ]; + installPhase = '' + mkdir -p $out/bin - phases = [ "installPhase" "fixupPhase" ]; - installPhase = '' - mkdir -p $out/bin - function copyScript { - local name=nix-prefetch-$1; - local src=$2; local wrapArgs="" - cp $src $out/bin/$name; - for dep in ''${@:3}; do + cp ${src} $out/bin/$name; + for dep in ${stdenv.lib.concatStringsSep " " deps}; do wrapArgs="$wrapArgs --prefix PATH : $dep/bin" done wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin" wrapArgs="$wrapArgs --set HOME : /homeless-shelter" wrapProgram $out/bin/$name $wrapArgs - } + ''; - copyScript "hg" ${../../../build-support/fetchhg/nix-prefetch-hg} ${mercurial} - copyScript "git" ${../../../build-support/fetchgit/nix-prefetch-git} ${git} ${coreutils} - copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion.out} - copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar} - copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs} - copyScript "zip" ${../../../build-support/fetchzip/nix-prefetch-zip} ${unzip} ${curl.bin} - ''; + preferLocalBuild = true; - meta = with stdenv.lib; { - description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes"; - maintainers = with maintainers; [ bennofs ]; - platforms = with stdenv.lib.platforms; unix; - # Quicker to build than to download, I hope - hydraPlatforms = []; + meta = with stdenv.lib; { + description = "Script used to obtain source hashes for fetch${tool}"; + maintainers = with maintainers; [ bennofs ]; + platforms = stdenv.lib.platforms.unix; + }; + }; +in rec { + nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [bazaar]; + nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [cvs]; + nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [git coreutils]; + nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [mercurial]; + nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [subversion.out]; + nix-prefetch-zip = mkPrefetchScript "zip" ../../../build-support/fetchzip/nix-prefetch-zip [unzip curl.bin]; + + nix-prefetch-scripts = buildEnv { + name = "nix-prefetch-scripts"; + + paths = [ nix-prefetch-bzr nix-prefetch-cvs nix-prefetch-git nix-prefetch-hg nix-prefetch-svn nix-prefetch-zip ]; + + meta = with stdenv.lib; { + description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes"; + maintainers = with maintainers; [ bennofs ]; + platforms = stdenv.lib.platforms.unix; + }; }; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 364032b70e9..9006785c3fc 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null +{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium , storeDir ? "/nix/store" , stateDir ? "/nix/var" @@ -13,8 +13,8 @@ let nativeBuildInputs = [ perl pkgconfig ]; - buildInputs = [ curl openssl sqlite ] ++ - lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium; + buildInputs = [ curl openssl sqlite xz ] + ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium; propagatedBuildInputs = [ boehmgc ]; @@ -97,10 +97,10 @@ in rec { }; nixUnstable = lib.lowPrio (common rec { - name = "nix-1.11pre4273_71039be"; + name = "nix-1.11pre4334_7431932"; src = fetchurl { - url = "http://hydra.nixos.org/build/27061065/download/4/${name}.tar.xz"; - sha256 = "4a1bc541868c317708fc8b532e22f5ead8d9759eee6a2680719584841cf897af"; + url = "http://hydra.nixos.org/build/28747184/download/4/${name}.tar.xz"; + sha256 = "ccb0c5be03b9af1bf89e79758868b0cd62c79fd7a0f0791cdb99df86e4240fc4"; }; }); diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 2a9d167cfcd..d89d4c58af3 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl }: +{ stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl +, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.3.0"; + version = "0.3.1"; name = "opkg-${version}"; src = fetchurl { url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "13wqai7lgyfjlqvly0bz786wk9frl16a9yzrn27p3wwfvcf5swvz"; + sha256 = "1pw7igmb4miyxl11sj9g8p8pgxg9nmn1h2hzi8b23v44hcmc1inj"; }; - buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl ]; + buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl + autoreconfHook ]; meta = with stdenv.lib; { description = "A lightweight package management system based upon ipkg"; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 5e06d2f32e2..7823a9e0307 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, nssTools, pcsclite , pkgconfig }: -let version = "4.1.8"; in +let version = "4.1.9"; in stdenv.mkDerivation { name = "eid-mw-${version}"; src = fetchFromGitHub { - sha256 = "1nmw4c2gvbpkrgjxyd2g0lbh85lb2czbgqplqrv69fr6azaddyyk"; + sha256 = "03hf3bkawhr4kpjcv71xhja3d947qvxmjf0lkyjmv7i3fw3j8jqs"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; }; - buildInputs = [ gtk2 pcsclite ]; + buildInputs = [ gtk3 pcsclite ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; postPatch = '' sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac ''; + configureFlags = [ "--enable-dialogs=yes" ]; + enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 5fbd6e83970..9390207e14a 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -13,16 +13,16 @@ with stdenv.lib; assert x11Support -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-2.1.9"; + name = "gnupg-2.1.10"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1dpp555glln6fldk72ad7lkrn8h3cr2bg714z5kfn2qrawx67dqw"; + sha256 = "1ybcsazjm21i2ys1wh49cz4azmqz7ghx5rb6hm4gm93i2zc5igck"; }; postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c - ''; + ''; #" fix Emacs syntax highlighting :-( buildInputs = [ pkgconfig libgcrypt libassuan libksba libiconv npth diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/tools/security/mbox/default.nix index 732cf704661..24a7ea51a82 100644 --- a/pkgs/tools/security/mbox/default.nix +++ b/pkgs/tools/security/mbox/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Lightweight sandboxing mechanism that any user can use without special privileges"; homepage = http://pdos.csail.mit.edu/mbox/; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix new file mode 100644 index 00000000000..94dca5dca68 --- /dev/null +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchgit +, pass, rofi, coreutils, utillinux, xdotool, gnugrep, pwgen, findutils +, makeWrapper }: + +stdenv.mkDerivation rec { + name = "rofi-pass-${version}"; + version = "1.3.1"; + + src = fetchgit { + url = "https://github.com/carnager/rofi-pass"; + rev = "refs/tags/${version}"; + sha256 = "1r206fq96avhlgkf2fzf8j2a25dav0s945qv66hwvqwhxq74frrv"; + }; + + buildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp -a $src/rofi-pass $out/bin/rofi-pass + + mkdir -p $out/share/doc/rofi-pass/ + cp -a $src/config.example $out/share/doc/rofi-pass/config.example + ''; + + wrapperPath = with stdenv.lib; makeSearchPath "bin/" [ + coreutils + findutils + gnugrep + pass + pwgen + rofi + utillinux + xdotool + ]; + + fixupPhase = '' + patchShebangs $out/bin + + wrapProgram $out/bin/rofi-pass \ + --prefix PATH : "${wrapperPath}" + ''; + + meta = { + description = "A script to make rofi work with password-store"; + homepage = https://github.com/carnager/rofi-pass; + maintainers = with stdenv.lib.maintainers; [ hiberno the-kenny ]; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 4c96c947f57..41c10685435 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -11,18 +11,18 @@ stdenv.mkDerivation rec { configureFlags = [ # The OS should care on preparing the drivers into this location "--enable-usbdropdir=/var/lib/pcsc/drivers" - "--with-systemdsystemunitdir=\${out}/etc/systemd/system" "--enable-confdir=/etc" - ]; + ] ++ stdenv.lib.optional stdenv.isLinux + "--with-systemdsystemunitdir=\${out}/etc/systemd/system"; nativeBuildInputs = [ pkgconfig perl python2 ]; - buildInputs = [ udev dbus_libs ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus_libs ]; meta = with stdenv.lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; homepage = http://pcsclite.alioth.debian.org/; license = licenses.bsd3; maintainers = with maintainers; [ viric wkennington ]; - platforms = platforms.linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 30d717c7bc1..8ccf1ba7ccd 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -10,11 +10,11 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "pinentry-0.9.5"; + name = "pinentry-0.9.6"; src = fetchurl { url = "mirror://gnupg/pinentry/${name}.tar.bz2"; - sha256 = "1338hj1h3sh34897120y30x12b64wyj3xjzzk5asm2hdzhxgsmva"; + sha256 = "0rhyw1vk28kgasjp22myf7m2q8kycw82d65pr9kgh93z17lj849a"; }; buildInputs = [ libgpgerror libassuan libcap gtk2 ncurses qt4 ]; diff --git a/pkgs/tools/security/pinentry/qt5.nix b/pkgs/tools/security/pinentry/qt5.nix new file mode 100644 index 00000000000..d0811cdd11a --- /dev/null +++ b/pkgs/tools/security/pinentry/qt5.nix @@ -0,0 +1,47 @@ +{ fetchurl, stdenv, pkgconfig +, libgpgerror, libassuan +, qtbase +, libcap ? null +}: + +let + mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; + mkEnable = mkFlag "enable" "disable"; + mkWith = mkFlag "with" "without"; +in +with stdenv.lib; +stdenv.mkDerivation rec { + name = "pinentry-0.9.6"; + + src = fetchurl { + url = "mirror://gnupg/pinentry/${name}.tar.bz2"; + sha256 = "0rhyw1vk28kgasjp22myf7m2q8kycw82d65pr9kgh93z17lj849a"; + }; + + buildInputs = [ libgpgerror libassuan libcap qtbase ]; + + # configure cannot find moc on its own + preConfigure = '' + export QTDIR="${qtbase}" + export MOC="${qtbase}/bin/moc" + ''; + + configureFlags = [ + (mkWith (libcap != null) "libcap") + (mkEnable true "pinentry-qt") + ]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = { + homepage = "http://gnupg.org/aegypten2/"; + description = "GnuPG's interface to passphrase input"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.all; + longDescription = '' + Pinentry provides a console and (optional) GTK+ and Qt GUIs allowing users + to enter a passphrase when `gpg' or `gpg2' is run and needs it. + ''; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 34e1731778f..6720c737866 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.14p3"; + name = "sudo-1.8.15"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "0dqj1bq2jr4jxqfrd5yg0i42a6268scd0l28jic9118kn75rg9m8"; + sha256 = "0263gi6i19fyzzc488n0qw3m518i39f6a7qmrfvahk9j10bkh5j3"; }; configureFlags = [ diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 525259bdb02..9e73c7d4053 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib, torsocks, libseccomp }: stdenv.mkDerivation rec { - name = "tor-0.2.6.10"; + name = "tor-0.2.7.5"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d"; + sha256 = "0pxayvcab4cb107ynbpzx4g0qyr1mjfba2an76wdx6dxn56rwakx"; }; # Note: torsocks is specified as a dependency, as the distributed diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix deleted file mode 100644 index ab5cea30873..00000000000 --- a/pkgs/tools/system/ansible/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ windowsSupport ? true, stdenv, fetchurl, pythonPackages, python }: - -pythonPackages.buildPythonPackage rec { - version = "1.9.4"; - name = "ansible-${version}"; - namePrefix = ""; - - src = fetchurl { - url = "https://releases.ansible.com/ansible/${name}.tar.gz"; - sha256 = "1qvgzb66nlyc2ncmgmqhzdk0x0p2px09967p1yypf5czwjn2yb4p"; - }; - - prePatch = '' - sed -i "s,/usr/,$out," lib/ansible/constants.py - ''; - - doCheck = false; - dontStrip = true; - dontPatchELF = true; - dontPatchShebangs = true; - - pythonPath = with pythonPackages; [ - paramiko jinja2 pyyaml httplib2 boto six - ] ++ stdenv.lib.optional windowsSupport pywinrm; - - meta = with stdenv.lib; { - homepage = "http://www.ansible.com"; - description = "A simple automation tool"; - license = licenses.gpl3; - maintainers = [ maintainers.joamaki ]; - platforms = platforms.linux ++ [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 872dbf0c20e..b63d60633c3 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libewf, afflib, openssl, zlib }: stdenv.mkDerivation rec { - version = "4.1.3"; + version = "4.2.0"; name = "sleuthkit-${version}"; src = fetchurl { url = "mirror://sourceforge/sleuthkit/${name}.tar.gz"; - sha256 = "09q3ky4rpv18jasf5gc2hlivzadzl70jy4nnk23db1483aix5yb7"; + sha256 = "08s7c1jwn2rjq2jm8859ywaiq12adrl02m61hc04iblqjzqqgcli"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 89bbd862dad..9b041ae4b2b 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl /*, xmlto */}: -stdenv.mkDerivation { - name = "colordiff-1.0.15"; +stdenv.mkDerivation rec { + name = "colordiff-1.0.16"; src = fetchurl { - url = http://www.colordiff.org/colordiff-1.0.15.tar.gz; - sha256 = "0icx4v2h1gy08vhh3qqi2qfyfjp37vgj27hq1fnjz83bg7ly8pjr"; + url = "http://www.colordiff.org/${name}.tar.gz"; + sha256 = "12qkkw13261dra8pg7mzx4r8p9pb0ajb090bib9j1s6hgphwzwga"; }; buildInputs = [ perl /* xmlto */ ]; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index e62b18a4c43..4556f12af63 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { doCheck = !( stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1 || stdenv.isDarwin # XXX: `locale' segfaults + || stdenv.isSunOS # XXX: `_backsmalls1' fails, locale stuff? ); buildInputs = [ xz.bin ] diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index d0259362df6..c2e47211e15 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ pcre libiconv ]; # cygwin: FAIL: multibyte-white-space - doCheck = !stdenv.isDarwin && !stdenv.isCygwin; + doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin; # On Mac OS X, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken. diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 3337fa62a28..67d2df10363 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { { description = "Interpreter for the AWK Programming Language"; homepage = http://invisible-island.net/mawk/mawk.html; license = licenses.gpl2; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; }; } \ No newline at end of file diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 7c58c480a79..96e1f532bff 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -1,22 +1,24 @@ -{ fetchurl, stdenv, python, texinfo }: +{ fetchurl, stdenv, python, pythonPackages, texinfo }: stdenv.mkDerivation rec { - name = "rubber-1.1"; + name = "rubber-1.3"; src = fetchurl { - url = "http://ebeffara.free.fr/pub/${name}.tar.gz"; - sha256 = "1xbkv8ll889933gyi2a5hj7hhh216k04gn8fwz5lfv5iz8s34gbq"; + url = "https://launchpad.net/rubber/trunk/1.3/+download/rubber-1.3.tar.gz"; + sha256 = "09715apfd6a0haz1mqsxgm8sj4rwzi38gcz2kz020zxk5rh0dksh"; }; buildInputs = [ python texinfo ]; + nativeBuildInputs = [ pythonPackages.wrapPython ]; - patchPhase = "substituteInPlace configure --replace which \"type -P\""; + patchPhase = '' + substituteInPlace configure --replace which "type -P" + ''; - postInstall = "rm $out/share/rubber/modules/etex.rub"; + postInstall = "wrapPythonPrograms"; meta = { description = "Wrapper for LaTeX and friends"; - longDescription = '' Rubber is a program whose purpose is to handle all tasks related to the compilation of LaTeX documents. This includes compiling @@ -26,9 +28,8 @@ stdenv.mkDerivation rec { produce PostScript documents is also included, as well as usage of pdfLaTeX to produce PDF documents. ''; - license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.pps.jussieu.fr/~beffara/soft/rubber/; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; } diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 8624fdf96af..6723526ff62 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation ( rec { pname = "auctex"; - version = "11.88"; + version = "11.89"; name = "${pname}-${version}"; meta = { @@ -12,7 +12,7 @@ stdenv.mkDerivation ( rec { src = fetchurl { url = "mirror://gnu/${pname}/${name}.tar.gz"; - sha256 = "0gy89nzha20p6m7kpv2nl1fnsfka9scc3mw1lz66fp6czganfs3i"; + sha256 = "1cf9fkkmzjxa4jvk6c01zgxdikr4zzb5pcx8i4r0hwdk0xljkbwq"; }; buildInputs = [ emacs texLive ]; diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index 223f72c6785..5cd5515400d 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -10,24 +10,29 @@ rec { , extraFiles ? [] , compressBlanksInIndex ? true , packages ? [] + , texPackages ? {} , copySources ? false }: assert generatePDF -> !generatePS; - + + let + tex = pkgs.texlive.combine texPackages; + in + pkgs.stdenv.mkDerivation { name = "doc"; - + builder = ./run-latex.sh; copyIncludes = ./copy-includes.pl; - + inherit rootFile generatePDF generatePS extraFiles compressBlanksInIndex copySources; includes = map (x: [x.key (baseNameOf (toString x.key))]) (findLaTeXIncludes {inherit rootFile;}); - - buildInputs = [ pkgs.tetex pkgs.perl ] ++ packages; + + buildInputs = [ tex pkgs.perl ] ++ packages; }; @@ -41,7 +46,7 @@ rec { builtins.genericClosure { startSet = [{key = rootFile;}]; - + operator = {key, ...}: @@ -72,7 +77,7 @@ rec { in pkgs.lib.fold foundDeps [] deps; }; - + findLhs2TeXIncludes = { rootFile @@ -80,7 +85,7 @@ rec { builtins.genericClosure { startSet = [{key = rootFile;}]; - + operator = {key, ...}: @@ -103,10 +108,10 @@ rec { builder = ./dot2pdf.sh; inherit dotGraph fontsConf; buildInputs = [ - pkgs.perl pkgs.tetex pkgs.graphviz + pkgs.perl pkgs.graphviz ]; }; - + dot2ps = { dotGraph @@ -117,7 +122,7 @@ rec { builder = ./dot2ps.sh; inherit dotGraph; buildInputs = [ - pkgs.perl pkgs.tetex pkgs.graphviz pkgs.ghostscript + pkgs.perl pkgs.graphviz pkgs.ghostscript ]; }; @@ -132,7 +137,7 @@ rec { includes = map (x: [x.key (baseNameOf (toString x.key))]) (findLhs2TeXIncludes {rootFile = source;}); }; - + animateDot = dotGraph: nrFrames: pkgs.stdenv.mkDerivation { name = "dot-frames"; builder = ./animatedot.sh; @@ -163,7 +168,7 @@ rec { # Convert a Postscript file to a PNG image, trimming it so that - # there is no unnecessary surrounding whitespace. + # there is no unnecessary surrounding whitespace. postscriptToPNG = { postscript }: @@ -173,7 +178,7 @@ rec { inherit postscript; buildInputs = [pkgs.imagemagick pkgs.ghostscript]; - + buildCommand = '' if test -d $postscript; then input=$(ls $postscript/*.ps) @@ -240,5 +245,5 @@ rec { "${pkgs.ghostscript}/share/ghostscript/fonts" ]; }; - + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03c384e1e87..22f2a52ea77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16,6 +16,7 @@ # outside of the store. Thus, GCC, GFortran, & co. must always look for # files in standard system directories (/usr/include, etc.) noSysDirs ? (system != "x86_64-freebsd" && system != "i686-freebsd" + && system != "x86_64-solaris" && system != "x86_64-kfreebsd-gnu") # More flags for the bootstrapping of stdenv. @@ -273,13 +274,15 @@ let }; buildFHSChrootEnv = args: chrootFHSEnv { - env = buildFHSEnv args; + env = buildFHSEnv (removeAttrs args [ "extraInstallCommands" ]); + extraInstallCommands = args.extraInstallCommands or ""; }; buildFHSUserEnv = args: userFHSEnv { - env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" ]); + env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" ]); runScript = args.runScript or "bash"; extraBindMounts = args.extraBindMounts or []; + extraInstallCommands = args.extraInstallCommands or ""; }; buildMaven = callPackage ../build-support/build-maven.nix {}; @@ -519,6 +522,8 @@ let airfield = callPackage ../tools/networking/airfield { }; + aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; + analog = callPackage ../tools/admin/analog {}; apktool = callPackage ../development/tools/apktool { @@ -563,6 +568,7 @@ let asymptote = callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; }; + gsl = gsl_1; }; atomicparsley = callPackage ../tools/video/atomicparsley { }; @@ -571,7 +577,7 @@ let avfs = callPackage ../tools/filesystems/avfs { }; - awscli = callPackage ../tools/admin/awscli { }; + awscli = pythonPackages.awscli; ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; @@ -652,6 +658,8 @@ let azureus = callPackage ../tools/networking/p2p/azureus { }; + backup = callPackage ../tools/backup/backup { }; + basex = callPackage ../tools/text/xml/basex { }; babeld = callPackage ../tools/networking/babeld { }; @@ -670,9 +678,7 @@ let bchunk = callPackage ../tools/cd-dvd/bchunk { }; - bfr = callPackage ../tools/misc/bfr { - perl = perl516; # Docs fail to build with newer versions - }; + bfr = callPackage ../tools/misc/bfr { }; bibtool = callPackage ../tools/misc/bibtool { }; @@ -759,6 +765,8 @@ let gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; + certificate-transparency = callPackage ../servers/certificate-transparency { }; + image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; ccnet = callPackage ../tools/networking/ccnet { }; @@ -927,6 +935,7 @@ let asciidoc = callPackage ../tools/typesetting/asciidoc { inherit (pythonPackages) matplotlib numpy aafigure recursivePthLoader; + w3m = w3m-batch; enableStandardFeatures = false; }; @@ -1149,6 +1158,10 @@ let aclSupport = stdenv.isLinux; }; + coreutils-prefixed = coreutils.override { withPrefix = true; }; + + corkscrew = callPackage ../tools/networking/corkscrew { }; + cpio = callPackage ../tools/archivers/cpio { }; crackxls = callPackage ../tools/security/crackxls { }; @@ -1498,6 +1511,8 @@ let withGTK = true; }; + fontmatrix = callPackage ../applications/graphics/fontmatrix {}; + foremost = callPackage ../tools/system/foremost { }; forktty = callPackage ../os-specific/linux/forktty {}; @@ -1561,7 +1576,7 @@ let garmintools = callPackage ../development/libraries/garmintools {}; gawk = callPackage ../tools/text/gawk { - locale = darwin.adv_cmds; + inherit (darwin) locale; }; gawkInteractive = appendToName "interactive" @@ -1596,13 +1611,15 @@ let gitinspector = callPackage ../applications/version-management/gitinspector { }; gitlab = callPackage ../applications/version-management/gitlab { - ruby = ruby_2_1_3; + ruby = ruby_2_2_2; }; gitlab-shell = callPackage ../applications/version-management/gitlab-shell { - ruby = ruby_2_1_3; + ruby = ruby_2_2_2; }; + gitlab-git-http-server = callPackage ../applications/version-management/gitlab-git-http-server { }; + glusterfs = callPackage ../tools/filesystems/glusterfs { }; glmark2 = callPackage ../tools/graphics/glmark2 { }; @@ -2001,7 +2018,7 @@ let kpcli = callPackage ../tools/security/kpcli { }; - kst = callPackage ../tools/graphics/kst { }; + kst = callPackage ../tools/graphics/kst { gsl = gsl_1; }; leocad = callPackage ../applications/graphics/leocad { }; @@ -2055,12 +2072,12 @@ let ninka = callPackage ../development/tools/misc/ninka { }; - nodejs-5_0 = callPackage ../development/web/nodejs/v5_0.nix { + nodejs-5_x = callPackage ../development/web/nodejs/v5.nix { libtool = darwin.cctools; openssl = openssl_1_0_2; }; - nodejs-4_2 = callPackage ../development/web/nodejs { + nodejs-4_x = callPackage ../development/web/nodejs/v4.nix { libtool = darwin.cctools; openssl = openssl_1_0_2; }; @@ -2073,16 +2090,18 @@ let nodejs = if stdenv.system == "armv5tel-linux" then nodejs-0_10 else - nodejs-4_2; + nodejs-4_x; - nodePackages_4_2 = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_2; nodejs = nodejs-4_2; }); + nodePackages_5_x = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_5_x; nodejs = nodejs-5_x; }); + + nodePackages_4_x = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_x; nodejs = nodejs-4_x; }); nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; }; nodePackages = if stdenv.system == "armv5tel-linux" then nodePackages_0_10 else - nodePackages_4_2; + nodePackages_4_x; npm2nix = nodePackages.npm2nix; @@ -2126,8 +2145,6 @@ let libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; - libtorrent-git = callPackage ../tools/networking/p2p/libtorrent/git.nix { }; - libiberty = callPackage ../development/libraries/libiberty { }; libibverbs = callPackage ../development/libraries/libibverbs { }; @@ -2571,7 +2588,14 @@ let otpw = callPackage ../os-specific/linux/otpw { }; - owncloud = callPackage ../servers/owncloud { }; + owncloud = owncloud70; + + inherit (callPackages ../servers/owncloud { }) + owncloud705 + owncloud70 + owncloud80 + owncloud81 + owncloud82; owncloudclient = callPackage ../applications/networking/owncloud-client { }; @@ -2610,8 +2634,10 @@ let parted = callPackage ../tools/misc/parted { hurd = null; }; pitivi = callPackage ../applications/video/pitivi { - gst = gst_all_1; - clutter-gtk = clutter_gtk; + gst = gst_all_1 // + { gst-plugins-bad = gst_all_1.gst-plugins-bad.overrideDerivation + (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ gtk3 ]; }); + }; }; p0f = callPackage ../tools/security/p0f { }; @@ -2658,7 +2684,9 @@ let jbig2enc = callPackage ../tools/graphics/jbig2enc { }; - pdfread = callPackage ../tools/graphics/pdfread { }; + pdfread = callPackage ../tools/graphics/pdfread { + inherit (pythonPackages) pillow; + }; briss = callPackage ../tools/graphics/briss { }; @@ -2688,6 +2716,18 @@ let qt4 = null; }; + pinentry_ncurses = pinentry.override { + gtk2 = null; + }; + + pinentry_qt4 = pinentry_ncurses.override { + inherit qt4; + }; + + pinentry_qt5 = qt55Libs.callPackage ../tools/security/pinentry/qt5.nix { + libcap = if stdenv.isDarwin then null else libcap; + }; + pius = callPackage ../tools/security/pius { }; pk2cmd = callPackage ../tools/misc/pk2cmd { }; @@ -2774,7 +2814,7 @@ let pyatspi = callPackage ../development/python-modules/pyatspi { }; - pycangjie = callPackage ../development/python-modules/pycangjie { }; + pycangjie = pythonPackages.pycangjie; pydb = callPackage ../development/tools/pydb { }; @@ -2782,7 +2822,7 @@ let pythonDBus = dbus_python; - pythonIRClib = callPackage ../development/python-modules/irclib { }; + pythonIRClib = pythonPackages.pythonIRClib; pythonSexy = builderDefsPackage (callPackage ../development/python-modules/libsexy) { }; @@ -2891,16 +2931,10 @@ let rng_tools = callPackage ../tools/security/rng-tools { }; rsnapshot = callPackage ../tools/backup/rsnapshot { - perl = perl516; # fails to create docs: POD document had syntax errors # For the `logger' command, we can use either `utillinux' or # GNU Inetutils. The latter is more portable. - logger = inetutils; + logger = if stdenv.isLinux then utillinux else inetutils; }; - rsnapshotGit = lowPrio (callPackage ../tools/backup/rsnapshot/git.nix { - # For the `logger' command, we can use either `utillinux' or - # GNU Inetutils. The latter is more portable. - logger = inetutils; - }); rlwrap = callPackage ../tools/misc/rlwrap { }; @@ -2920,8 +2954,6 @@ let rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; - rtorrent-git = callPackage ../tools/networking/p2p/rtorrent/git.nix { }; - rubber = callPackage ../tools/typesetting/rubber { }; rxp = callPackage ../tools/text/xml/rxp { }; @@ -3027,7 +3059,7 @@ let smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; - snabb = callPackage ../tools/networking/snabb { } ; + snabbswitch = callPackage ../tools/networking/snabbswitch { } ; sng = callPackage ../tools/graphics/sng { libpng = libpng12; @@ -3148,7 +3180,9 @@ let stricat = callPackage ../tools/security/stricat { }; - privoxy = callPackage ../tools/networking/privoxy { }; + privoxy = callPackage ../tools/networking/privoxy { + w3m = w3m-batch; + }; swaks = callPackage ../tools/networking/swaks { }; @@ -3170,11 +3204,9 @@ let tcpflow = callPackage ../tools/networking/tcpflow { }; - teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer/10.nix { }; - - teamviewer8 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/8.nix { }); - - teamviewer9 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/9.nix { }); + teamviewer = callPackage ../applications/networking/remote/teamviewer { + stdenv = stdenv_32bit; + }; telnet = callPackage ../tools/networking/telnet { }; @@ -3602,12 +3634,12 @@ let xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { }; xmlto = callPackage ../tools/typesetting/xmlto { - w3m = w3m.override { graphicsSupport = false; }; + w3m = w3m-batch; }; xmltv = callPackage ../tools/misc/xmltv { }; - xmpppy = callPackage ../development/python-modules/xmpppy { }; + xmpppy = pythonPackages.xmpppy; xorriso = callPackage ../tools/cd-dvd/xorriso { }; @@ -3915,7 +3947,7 @@ let inherit noSysDirs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion - profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + profiledCompiler = with stdenv; (!isSunOS && !isDarwin && (isi686 || isx86_64)); # When building `gcc.crossDrv' (a "Canadian cross", with host == target # and host != build), `cross' must be null but the cross-libc must still @@ -4217,6 +4249,8 @@ let openblas = openblasCompat; }; + kotlin = callPackage ../development/compilers/kotlin { }; + lazarus = callPackage ../development/compilers/fpc/lazarus.nix { fpc = fpc; }; @@ -4723,6 +4757,10 @@ let vg = callPackage ../development/ocaml-modules/vg { }; + why3 = callPackage ../development/ocaml-modules/why3 { + why3 = pkgs.why3; + }; + x509 = callPackage ../development/ocaml-modules/x509 { }; xmlm = callPackage ../development/ocaml-modules/xmlm { }; @@ -4781,7 +4819,11 @@ let rtags = callPackage ../development/tools/rtags/default.nix {}; rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; - rustc = callPackage ../development/compilers/rustc {}; + rustc = callPackage ../development/compilers/rustc { + callPackage = newScope ({ + procps = if stdenv.isDarwin then darwin.ps else procps; + }); + }; rustPlatform = rustStable; @@ -5096,8 +5138,6 @@ let ocropus = callPackage ../applications/misc/ocropus { }; - perl516 = callPackage ../development/interpreters/perl/5.16 { }; - perl520 = callPackage ../development/interpreters/perl/5.20 { fetchurl = fetchurlBoot; }; @@ -5221,15 +5261,15 @@ let inherit (callPackage ../development/interpreters/ruby {}) ruby_1_9_3 ruby_2_0_0 - ruby_2_1_0 ruby_2_1_1 ruby_2_1_2 ruby_2_1_3 ruby_2_1_6 - ruby_2_2_0 ruby_2_2_2; + ruby_2_1_0 ruby_2_1_1 ruby_2_1_2 ruby_2_1_3 ruby_2_1_6 ruby_2_1_7 + ruby_2_2_0 ruby_2_2_2 ruby_2_2_3; # Ruby aliases ruby = ruby_2_2; ruby_1_9 = ruby_1_9_3; ruby_2_0 = ruby_2_0_0; - ruby_2_1 = ruby_2_1_6; - ruby_2_2 = ruby_2_2_2; + ruby_2_1 = ruby_2_1_7; + ruby_2_2 = ruby_2_2_3; rubygemsFun = ruby: builderDefsPackage (callPackage ../development/interpreters/ruby/rubygems.nix) { inherit ruby; @@ -5343,7 +5383,9 @@ let augeas = callPackage ../tools/system/augeas { }; - ansible = callPackage ../tools/system/ansible { }; + ansible = pythonPackages.ansible; + + ansible2 = pythonPackages.ansible2; antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; @@ -5501,12 +5543,12 @@ let cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { wantPS = stdenv.isDarwin; - ps = if stdenv.isDarwin then darwin.adv_cmds else null; + inherit (darwin) ps; }; cmake = callPackage ../development/tools/build-managers/cmake { wantPS = stdenv.isDarwin; - ps = if stdenv.isDarwin then darwin.adv_cmds else null; + inherit (darwin) ps; }; cmakeCurses = cmake.override { useNcurses = true; }; @@ -5627,8 +5669,7 @@ let jdepend = callPackage ../development/tools/analysis/jdepend { }; flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; - flex_2_5_39 = callPackage ../development/tools/parsing/flex/2.5.39.nix { }; - flex = flex_2_5_39; + flex = callPackage ../development/tools/parsing/flex/default.nix { }; flexcpp = callPackage ../development/tools/parsing/flexc++ { }; @@ -5736,6 +5777,8 @@ let mk = callPackage ../development/tools/build-managers/mk { }; + multi-ghc-travis = callPackage ../development/tools/haskell/multi-ghc-travis { }; + neoload = callPackage ../development/tools/neoload { licenseAccepted = (config.neoload.accept_license or false); fontsConf = makeFontsConf { @@ -6209,9 +6252,7 @@ let dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; dbus_glib = callPackage ../development/libraries/dbus-glib { }; dbus_java = callPackage ../development/libraries/java/dbus-java { }; - dbus_python = callPackage ../development/python-modules/dbus { - isPyPy = python.executable == "pypy"; - }; + dbus_python = pythonPackages.dbus; # Should we deprecate these? Currently there are many references. dbus_tools = pkgs.dbus.out; @@ -6316,6 +6357,7 @@ let fftw = callPackage ../development/libraries/fftw { }; fftwSinglePrec = fftw.override { precision = "single"; }; fftwFloat = fftwSinglePrec; # the configure option is just an alias + fftwLongDouble = fftw.override { precision = "long-double"; }; filter-audio = callPackage ../development/libraries/filter-audio {}; @@ -6506,7 +6548,9 @@ let gperftools = callPackage ../development/libraries/gperftools { }; - gst_all_1 = recurseIntoAttrs (callPackage ../development/libraries/gstreamer { }); + gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { + callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; }); + }); gst_all = { inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer; @@ -6579,6 +6623,8 @@ let gsl = callPackage ../development/libraries/gsl { }; + gsl_1 = callPackage ../development/libraries/gsl/gsl-1_16.nix { }; + gsm = callPackage ../development/libraries/gsm {}; gsoap = callPackage ../development/libraries/gsoap { }; @@ -6784,6 +6830,8 @@ let jsoncpp = callPackage ../development/libraries/jsoncpp { }; + jsonnet = callPackage ../development/compilers/jsonnet { }; + libjson = callPackage ../development/libraries/libjson { }; judy = callPackage ../development/libraries/judy { }; @@ -7502,6 +7550,8 @@ let libstartup_notification = callPackage ../development/libraries/startup-notification { }; + libstroke = callPackage ../development/libraries/libstroke { }; + libstrophe = callPackage ../development/libraries/libstrophe { }; libspatialindex = callPackage ../development/libraries/libspatialindex { }; @@ -7713,6 +7763,8 @@ let lzo = callPackage ../development/libraries/lzo { }; + mapnik = callPackage ../development/libraries/mapnik { }; + matio = callPackage ../development/libraries/matio { }; mbedtls = callPackage ../development/libraries/mbedtls { }; @@ -7833,7 +7885,7 @@ let muparser = callPackage ../development/libraries/muparser { }; - mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + mygpoclient = pythonPackages.mygpoclient; mygui = callPackage ../development/libraries/mygui {}; @@ -8335,6 +8387,8 @@ let simgear = callPackage ../development/libraries/simgear { }; + simp_le = callPackage ../tools/admin/simp_le { }; + sfml = callPackage ../development/libraries/sfml { }; signon = callPackage ../development/libraries/signon/old.nix {}; @@ -8672,6 +8726,8 @@ let xapianBindings10 = callPackage ../development/libraries/xapian/bindings/1.0.x.nix { # TODO perl php Java, tcl, C#, python }; + xapian-omega = callPackage ../tools/misc/xapian-omega {}; + xavs = callPackage ../development/libraries/xavs { }; Xaw3d = callPackage ../development/libraries/Xaw3d { }; @@ -8967,17 +9023,11 @@ let self = pypyPackages; }); - foursuite = callPackage ../development/python-modules/4suite { }; + foursuite = pythonPackages.foursuite; - bsddb3 = callPackage ../development/python-modules/bsddb3 { }; + bsddb3 = pythonPackages.bsddb3; - ecdsa = callPackage ../development/python-modules/ecdsa { }; - - numeric = callPackage ../development/python-modules/numeric { }; - - pil = pythonPackages.pil; - - psyco = callPackage ../development/python-modules/psyco { }; + ecdsa = pythonPackages.ecdsa; pycairo = pythonPackages.pycairo; @@ -8985,11 +9035,11 @@ let pycrypto = pythonPackages.pycrypto; - pycups = callPackage ../development/python-modules/pycups { }; + pycups = pythonPackages.pycups; pyexiv2 = callPackage ../development/python-modules/pyexiv2 { }; - pygame = callPackage ../development/python-modules/pygame { }; + pygame = pythonPackages.pygame; pygobject = pythonPackages.pygobject; @@ -8997,37 +9047,35 @@ let pygtk = pythonPackages.pygtk; - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; + pygtksourceview = pythonPackages.pygtksourceview; pyGtkGlade = pythonPackages.pyGtkGlade; - pylint = callPackage ../development/python-modules/pylint { }; + pylint = pythonPackages.pylint; pyopenssl = pythonPackages.pyopenssl; rhpl = callPackage ../development/python-modules/rhpl { }; - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { }; + pyqt4 = pythonPackages.pyqt4; - pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; + pysideApiextractor = pythonPackages.pysideApiextractor; - pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; + pysideGeneratorrunner = pythonPackages.pysideGeneratorrunner; - pyside = callPackage ../development/python-modules/pyside { }; + pyside = pythonPackages.pyside; - pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + pysideTools = pythonPackages.pysideTools; - pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { }; - - pyx = callPackage ../development/python-modules/pyx { }; + pysideShiboken = pythonPackages.pysideShiboken; pyxml = callPackage ../development/python-modules/pyxml { }; - rbtools = callPackage ../development/python-modules/rbtools { }; + rbtools = pythonPackages.rbtools; setuptools = pythonPackages.setuptools; - slowaes = callPackage ../development/python-modules/slowaes { }; + slowaes = pythonPackages.slowaes; wxPython = pythonPackages.wxPython; wxPython28 = pythonPackages.wxPython28; @@ -9245,7 +9293,7 @@ let mpd = callPackage ../servers/mpd { aacSupport = config.mpd.aacSupport or true; - clientSupport = config.mpd.clientSupport or false; + clientSupport = config.mpd.clientSupport or true; ffmpegSupport = config.mpd.ffmpegSupport or true; opusSupport = config.mpd.opusSupport or true; @@ -9431,6 +9479,8 @@ let psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; + pumpio = callPackage ../servers/web-apps/pump.io { }; + pyIRCt = builderDefsPackage (callPackage ../servers/xmpp/pyIRCt) {}; pyMAILt = builderDefsPackage (callPackage ../servers/xmpp/pyMAILt) {}; @@ -10293,6 +10343,10 @@ let gocode = goPackages.gocode.bin // { outputs = [ "bin" ]; }; + kgocode = callPackage ../applications/misc/kgocode { + inherit (pkgs.kde4) kdelibs; + }; + gotags = goPackages.gotags.bin // { outputs = [ "bin" ]; }; golint = goPackages.lint.bin // { outputs = [ "bin" ]; }; @@ -10685,6 +10739,8 @@ let dina-font = callPackage ../data/fonts/dina { }; + dina-font-pcf = callPackage ../data/fonts/dina-pcf { }; + docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { }; docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { }; @@ -10727,6 +10783,8 @@ let freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; + font-droid = callPackage ../data/fonts/droid { }; + freepats = callPackage ../data/misc/freepats { }; gentium = callPackage ../data/fonts/gentium {}; @@ -10784,7 +10842,7 @@ let marathi-cursive = callPackage ../data/fonts/marathi-cursive { }; - manpages = callPackage ../data/documentation/man-pages { }; + man-pages = callPackage ../data/documentation/man-pages { }; meslo-lg = callPackage ../data/fonts/meslo-lg {}; @@ -10831,10 +10889,6 @@ let proggyfonts = callPackage ../data/fonts/proggyfonts { }; - pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { - perl = perl516; # syntax error at troffprepro line 49, near "do subst(" - }; - sampradaya = callPackage ../data/fonts/sampradaya { }; shared_mime_info = callPackage ../data/misc/shared-mime-info { }; @@ -10843,6 +10897,8 @@ let signwriting = callPackage ../data/fonts/signwriting { }; + soundfont-fluid = callPackage ../data/soundfonts/fluid { }; + stdmanpages = callPackage ../data/documentation/std-man-pages { }; stix-otf = callPackage ../data/fonts/stix-otf { }; @@ -11228,7 +11284,12 @@ let pulseSupport = config.pulseaudio or true; }; - cmus = callPackage ../applications/audio/cmus { }; + cmus = callPackage ../applications/audio/cmus { + libjack = libjack2; + libcdio = libcdio082; + + pulseaudioSupport = config.pulseaudio or false; + }; CompBus = callPackage ../applications/audio/CompBus { }; @@ -11279,6 +11340,8 @@ let cvs2svn = callPackage ../applications/version-management/cvs2svn { }; + cwm = callPackage ../applications/window-managers/cwm { }; + cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; d4x = callPackage ../applications/misc/d4x { }; @@ -11402,7 +11465,7 @@ let imagemagick = null; acl = null; gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; }; emacs24-nox = lowPrio (appendToName "nox" (emacs24.override { @@ -11584,7 +11647,7 @@ let emacsPackagesNgGen = emacs: callPackage ./emacs-packages.nix { overrides = (config.emacsPackageOverrides or (p: {})) pkgs; - inherit emacs; + inherit emacs elpaPackages; trivialBuild = callPackage ../build-support/emacs/trivial.nix { inherit emacs; @@ -11603,6 +11666,10 @@ let emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24); + elpaPackages = + let imported = import ../applications/editors/emacs-modes/elpa-packages.nix pkgs; + in recurseIntoAttrs (imported.override (super: self: { inherit emacs; })); + emacsWithPackages = callPackage ../build-support/emacs/wrapper.nix { }; emacs24WithPackages = emacsWithPackages.override { emacs = emacs24; }; @@ -11830,6 +11897,10 @@ let python = python27; }; + git-review = callPackage ../applications/version-management/git-review { + python = python27; + }; + gitolite = callPackage ../applications/version-management/gitolite { }; inherit (gnome3) gitg; @@ -12027,6 +12098,8 @@ let xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; + i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { }; + i3lock = callPackage ../applications/window-managers/i3/lock.nix { cairo = cairo.override { xcbSupport = true; }; }; @@ -12083,6 +12156,7 @@ let impressive = callPackage ../applications/office/impressive { # XXX These are the PyOpenGL dependencies, which we need here. inherit (pythonPackages) pyopengl; + inherit (pythonPackages) pillow; }; inferno = callPackage_i686 ../applications/inferno { }; @@ -12096,7 +12170,7 @@ let lua = lua5; }; - ipe = callPackage ../applications/graphics/ipe { }; + ipe = qt5Libs.callPackage ../applications/graphics/ipe { }; iptraf = callPackage ../applications/networking/iptraf { }; @@ -12372,7 +12446,10 @@ let mimms = callPackage ../applications/audio/mimms {}; - mirage = callPackage ../applications/graphics/mirage {}; + mirage = callPackage ../applications/graphics/mirage { + inherit (pythonPackages) pygtk; + inherit (pythonPackages) pillow; + }; mixxx = callPackage ../applications/audio/mixxx { inherit (vamp) vampSDK; @@ -12515,7 +12592,9 @@ let inherit (ocamlPackages) findlib cryptokit yojson; }; - playonlinux = callPackage ../applications/misc/playonlinux { }; + playonlinux = callPackage ../applications/misc/playonlinux { + stdenv = stdenv_32bit; + }; shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; }; @@ -12648,7 +12727,7 @@ let opusTools = callPackage ../applications/audio/opus-tools { }; - orpie = callPackage ../applications/misc/orpie { }; + orpie = callPackage ../applications/misc/orpie { gsl = gsl_1; }; osmo = callPackage ../applications/office/osmo { }; @@ -12887,7 +12966,7 @@ let automake = automake114x; }; - rofi-pass = callPackage ../applications/misc/rofi/pass.nix { }; + rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; rstudio = callPackage ../applications/editors/rstudio { }; @@ -13013,6 +13092,8 @@ let }) ); + swingsane = callPackage ../applications/graphics/swingsane { }; + sxiv = callPackage ../applications/graphics/sxiv { }; bittorrentSync = bittorrentSync14; @@ -13050,7 +13131,9 @@ let printrun = callPackage ../applications/misc/printrun { }; - sddm = qt5Libs.callPackage ../applications/display-managers/sddm { }; + sddm = qt5Libs.callPackage ../applications/display-managers/sddm { + themes = []; # extra themes, etc. + }; slim = callPackage ../applications/display-managers/slim { libpng = libpng12; @@ -13275,6 +13358,8 @@ let github-release = callPackage ../development/tools/github/github-release { }; + tudu = callPackage ../applications/office/tudu { }; + tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; twister = callPackage ../applications/networking/p2p/twister { }; @@ -13384,17 +13469,23 @@ let virtinst = callPackage ../applications/virtualization/virtinst {}; - virtualgl = callPackage ../tools/X11/virtualgl { }; + virtualglLib = callPackage ../tools/X11/virtualgl/lib.nix { + fltk = fltk13; + }; + + virtualgl = callPackage ../tools/X11/virtualgl { + virtualglLib_i686 = if system == "x86_64-linux" + then pkgsi686Linux.virtualglLib + else null; + }; + + primusLib = callPackage ../tools/X11/primus/lib.nix { + nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; + }; primus = callPackage ../tools/X11/primus { - primusLib = callPackage ../tools/X11/primus/lib.nix { - nvidia = linuxPackages.nvidia_x11; - }; - primusLib_i686 = if system == "x86_64-linux" - then callPackage_i686 ../tools/X11/primus/lib.nix { - nvidia = pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; }; - } + then pkgsi686Linux.primusLib else null; }; @@ -13403,17 +13494,11 @@ let nvidia_x11_i686 = if system == "x86_64-linux" then pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; } else null; - virtualgl = virtualgl; - virtualgl_i686 = if system == "x86_64-linux" - then pkgsi686Linux.virtualgl + primusLib_i686 = if system == "x86_64-linux" + then pkgsi686Linux.primusLib else null; }; - # use if you intend to connect the nvidia card to a monitor - bumblebee_display = bumblebee.override { - useDisplayDevice = true; - }; - vkeybd = callPackage ../applications/audio/vkeybd {}; vlc = callPackage ../applications/video/vlc { @@ -13437,8 +13522,21 @@ let vym = callPackage ../applications/misc/vym { }; - w3m = callPackage ../applications/networking/browsers/w3m { + w3m = callPackage ../applications/networking/browsers/w3m { }; + + # Should always be the version with the most features + w3m-full = w3m; + + # Version without X11 + w3m-nox = w3m.override { + x11Support = false; + }; + + # Version for batch text processing, not a good browser + w3m-batch = w3m.override { graphicsSupport = false; + x11Support = false; + mouseSupport = false; }; weechat = callPackage ../applications/networking/irc/weechat { @@ -13568,6 +13666,7 @@ let ++ optional (config.kodi.enableGenesis or false) genesis ++ optional (config.kodi.enableSVTPlay or false) svtplay ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher + ++ optional (config.kodi.enablePVRHTS or false) pvr-hts ); }; @@ -13642,14 +13741,16 @@ let xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; - xdg_utils = callPackage ../tools/X11/xdg-utils { }; + xdg_utils = callPackage ../tools/X11/xdg-utils { + w3m = w3m-batch; + }; xdotool = callPackage ../tools/X11/xdotool { }; xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { }; - xen_4_5_1 = callPackage ../applications/virtualization/xen/4.5.1.nix { }; + xen_4_5_2 = callPackage ../applications/virtualization/xen/4.5.2.nix { }; xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; }; - xen = xen_4_5_1; + xen = xen_4_5_2; win-spice = callPackage ../applications/virtualization/driver/win-spice { }; win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; @@ -13875,8 +13976,6 @@ let bzflag = callPackage ../games/bzflag { }; - castle_combat = callPackage ../games/castle-combat { }; - cataclysm-dda = callPackage ../games/cataclysm-dda { }; chessdb = callPackage ../games/chessdb { }; @@ -14216,8 +14315,6 @@ let tome4 = callPackage ../games/tome4 { }; - tpm = callPackage ../games/thePenguinMachine { }; - trackballs = callPackage ../games/trackballs { debug = false; guile = guile_1_8; @@ -14466,7 +14563,9 @@ let kvirc = callPackage ../applications/networking/irc/kvirc { }; - krename = callPackage ../applications/misc/krename { }; + krename = callPackage ../applications/misc/krename { + taglib = taglib_1_9; + }; krusader = callPackage ../applications/misc/krusader { }; @@ -14589,7 +14688,6 @@ let redshift = callPackage ../applications/misc/redshift { inherit (python3Packages) python pygobject3 pyxdg; - geoclue = geoclue2; }; orion = callPackage ../misc/themes/orion {}; @@ -14822,6 +14920,8 @@ let coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; + flocq = callPackage ../development/coq-modules/flocq {}; + mathcomp = callPackage ../development/coq-modules/mathcomp { }; ssreflect = callPackage ../development/coq-modules/ssreflect { }; @@ -14943,7 +15043,7 @@ let ### SCIENCE / ELECTRONICS - eagle = callPackage_i686 ../applications/science/electronics/eagle { }; + eagle = callPackage ../applications/science/electronics/eagle { }; caneda = callPackage ../applications/science/electronics/caneda { }; @@ -15036,10 +15136,7 @@ let simgrid = callPackage ../applications/science/misc/simgrid { }; - spyder = callPackage ../applications/science/spyder { - inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended - inherit (pythonPackages) ipython pep8; # optional - }; + spyder = pythonPackages.spyder; stellarium = callPackage ../applications/science/astronomy/stellarium { }; @@ -15239,7 +15336,14 @@ let nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; - nix-prefetch-scripts = callPackage ../tools/package-management/nix-prefetch-scripts { }; + inherit (callPackages ../tools/package-management/nix-prefetch-scripts { }) + nix-prefetch-bzr + nix-prefetch-cvs + nix-prefetch-git + nix-prefetch-hg + nix-prefetch-svn + nix-prefetch-zip + nix-prefetch-scripts; nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; @@ -15454,6 +15558,8 @@ let tvheadend = callPackage ../servers/tvheadend { }; + ums = callPackage ../servers/ums { }; + urbit = callPackage ../misc/urbit { }; utf8proc = callPackage ../development/libraries/utf8proc { }; @@ -15543,6 +15649,10 @@ let }; }; + yabause = callPackage ../misc/emulators/yabause { + qt = qt4; + }; + yafc = callPackage ../applications/networking/yafc { }; yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; @@ -15650,6 +15760,7 @@ aliases = with self; rec { youtubeDL = youtube-dl; # added 2014-10-26 pidginlatexSF = pidginlatex; # added 2014-11-02 tftp_hpa = tftp-hpa; # added 2015-04-03 + manpages = man-pages; # added 2015-12-06 }; tweakAlias = _n: alias: with lib; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 98da54879f3..3882153d8e0 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -35,7 +35,7 @@ , lib, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg -, emacs +, emacs, elpaPackages , trivialBuild , melpaBuild @@ -44,11 +44,9 @@ with lib.licenses; -let self = _self // overrides; - callPackage = lib.callPackageWith (self // removeAttrs args ["overrides" "external"]); - _self = with self; { +let packagesFun = super: self: with self; { - inherit emacs; + inherit emacs melpaBuild trivialBuild; ## START HERE @@ -315,12 +313,12 @@ let self = _self // overrides; bind-key = melpaBuild { pname = "bind-key"; - version = "20150317"; + version = "20150321"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "b836266ddfbc835efdb327ecb389ff9e081d7c55"; - sha256 = "187wnqqm5g43cg8b6a9rbd9ncqad5fhjb96wjszbinjh1mjxyh7i"; + rev = "77a77c8b03044f0279e00cadd6a6d1a7ae97b01"; + sha256 = "14v6wzqn2jhjdbr7nwqilxy9l79m1f2rdrz2c6c6pcla5yjpd1k0"; }; files = [ "bind-key.el" ]; meta = { @@ -691,6 +689,23 @@ let self = _self // overrides; }; }; + f = melpaBuild rec { + pname = "f"; + version = "20151113"; + src = fetchFromGitHub { + owner = "rejeep"; + repo = "f.el"; + rev = "e0259ee060ff9a3f12204adcc8630869080acd68"; + sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1"; + }; + fileSpecs = [ "f.el" ]; + packageRequires = [ dash s ]; + meta = { + description = "Emacs library for working with files and directories"; + license = gpl3Plus; + }; + }; + find-file-in-project = melpaBuild rec { pname = "find-file-in-project"; version = "3.5"; @@ -1014,22 +1029,6 @@ let self = _self // overrides; }; }; - helm-swoop = melpaBuild rec { - pname = "helm-swoop"; - version = "20141224"; - src = fetchFromGitHub { - owner = "ShingoFukuyama"; - repo = pname; - rev = "06a251f7d7fce2a5719e0862e5855972cd8ab1ae"; - sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m"; - }; - packageRequires = [ helm ]; - meta = { - description = "An Emacs mode which constructs an editable grep for a buffer"; - license = gpl3Plus; - }; - }; - helm = melpaBuild rec { pname = "helm"; version = "20150105"; @@ -1046,6 +1045,38 @@ let self = _self // overrides; }; }; + helm-bibtex = melpaBuild rec { + pname = "helm-bibtex"; + version = "20151125"; + src = fetchFromGitHub { + owner = "tmalsburg"; + repo = pname; + rev = "bfcd5064dcc7c0ac62c46985832b2a73082f96e0"; + sha256 = "1nvc4ha9wj5j47qg7hdbv1xpjy8a8idc9vc2myl3xa33ywllwdwi"; + }; + packageRequires = [ dash f helm parsebib s ]; + meta = { + description = "Bibliography Manager for Emacs"; + license = gpl2; + }; + }; + + helm-swoop = melpaBuild rec { + pname = "helm-swoop"; + version = "20141224"; + src = fetchFromGitHub { + owner = "ShingoFukuyama"; + repo = pname; + rev = "06a251f7d7fce2a5719e0862e5855972cd8ab1ae"; + sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m"; + }; + packageRequires = [ helm ]; + meta = { + description = "An Emacs mode which constructs an editable grep for a buffer"; + license = gpl3Plus; + }; + }; + hi2 = melpaBuild rec { pname = "hi2"; version = "1.0"; @@ -1444,6 +1475,21 @@ let self = _self // overrides; }; }; + parsebib = melpaBuild rec { + pname = "parsebib"; + version = "20151006"; + src = fetchFromGitHub { + owner = "joostkremers"; + repo = pname; + rev = "9a1f60bed2814dfb5cec2b92efb5951a4b465cce"; + sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml"; + }; + meta = { + description = "Emacs library for reading .bib files"; + license = bsd3; + }; + }; + perspective = melpaBuild rec { pname = "perspective"; version = "1.12"; @@ -1642,12 +1688,12 @@ let self = _self // overrides; s = melpaBuild rec { pname = "s"; - version = "20140910"; + version = "20151023"; src = fetchFromGitHub { owner = "magnars"; repo = "${pname}.el"; - rev = "1f85b5112f3f68169ddaa2911fcfa030f979eb4d"; - sha256 = "9d871ea84f98c51099528a03eddf47218cf70f1431d4c35c19c977d9e73d421f"; + rev = "372e94c1a28031686d75d6c52bfbe833a118a72a"; + sha256 = "1zn8n3mv0iscs242dbkf5vmkkizfslq5haw9z0d0g3wknq18286h"; }; meta = { description = "String manipulation library for Emacs"; @@ -1838,12 +1884,12 @@ let self = _self // overrides; use-package = melpaBuild rec { pname = "use-package"; - version = "20150317"; + version = "20151112"; src = fetchFromGitHub { owner = "jwiegley"; repo = pname; - rev = "b836266ddfbc835efdb327ecb389ff9e081d7c55"; - sha256 = "187wnqqm5g43cg8b6a9rbd9ncqad5fhjb96wjszbinjh1mjxyh7i"; + rev = "77a77c8b03044f0279e00cadd6a6d1a7ae97b01"; + sha256 = "14v6wzqn2jhjdbr7nwqilxy9l79m1f2rdrz2c6c6pcla5yjpd1k0"; }; packageRequires = [ bind-key diminish ]; files = [ "use-package.el" ]; @@ -1977,4 +2023,6 @@ let self = _self // overrides; }; }; -}; in self +}; + +in elpaPackages.override packagesFun diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 5b7a254cc58..d20f4ae7549 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -846,6 +846,14 @@ let sha256 = "1nyg6sckwd0iafs9vcmgbga2k3hid2q0avhwj29qbdhj3l78xi47"; }; + gocryptfs = buildFromGitHub { + rev = "v0.5"; + owner = "rfjakob"; + repo = "gocryptfs"; + sha256 = "0jsdz8y7a1fkyrfwg6353c9r959qbqnmf2cjh57hp26w1za5bymd"; + buildInputs = [ crypto go-fuse openssl-spacemonkey ]; + }; + gocheck = buildGoPackage rec { rev = "87"; name = "gocheck-${rev}"; @@ -1688,6 +1696,13 @@ let disabled = isGo14; }; + json2csv = buildFromGitHub{ + rev = "d82e60e6dc2a7d3bcf15314d1ecbebeffaacf0c6"; + owner = "jehiah"; + repo = "json2csv"; + sha256 = "1fw0qqaz2wj9d4rj2jkfj7rb25ra106p4znfib69p4d3qibfjcsn"; + }; + ldap = buildGoPackage rec { rev = "83e65426fd1c06626e88aa8a085e5bfed0208e29"; name = "ldap-${stdenv.lib.strings.substring 0 7 rev}"; @@ -2124,6 +2139,18 @@ let ''; }; + # reintroduced for gocrytpfs as I don't understand the 10gen/spacemonkey split + openssl-spacemonkey = buildFromGitHub rec { + rev = "71f9da2a482c2b7bc3507c3fabaf714d6bb8b75d"; + name = "openssl-${stdenv.lib.strings.substring 0 7 rev}"; + owner = "spacemonkeygo"; + repo = "openssl"; + sha256 = "1byxwiq4mcbsj0wgaxqmyndp6jjn5gm8fjlsxw9bg0f33a3kn5jk"; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ pkgs.openssl ]; + propagatedBuildInputs = [ spacelog ]; + }; + opsgenie-go-sdk = buildFromGitHub { rev = "c6e1235dfed2126eb9b562c4d776baf55ccd23e3"; date = "2015-08-24"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 72386f12894..9b3f3e66854 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -37,6 +37,9 @@ rec { ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); + ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix ({ ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + libiconv = pkgs.darwin.libiconv; + }); ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); @@ -294,6 +297,9 @@ rec { lts-3_15 = packages.ghc7102.override { packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.15.nix { }; }; + lts-3_16 = packages.ghc7102.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.16.nix { }; + }; }; } diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 341e9ec81d6..fdd8fb0ef7d 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -30,12 +30,21 @@ releaseTools.sourceTarball rec { checkPhase = '' export NIX_DB_DIR=$TMPDIR export NIX_STATE_DIR=$TMPDIR + export NIX_PATH=nixpkgs=$TMPDIR/barf.nix nix-store --init + echo 'abort "Illegal use of in Nixpkgs."' > $TMPDIR/barf.nix + + # Make sure that Nixpkgs does not use + if grep -r ' to refer to itself." + exit 1 + fi + # Make sure that derivation paths do not depend on the Nixpkgs path. mkdir $TMPDIR/foo ln -s $(readlink -f .) $TMPDIR/foo/bar - p1=$(nix-instantiate pkgs/top-level/all-packages.nix --dry-run -A firefox) + p1=$(nix-instantiate pkgs/top-level/all-packages.nix --dry-run -A firefox --show-trace) p2=$(nix-instantiate $TMPDIR/foo/bar/pkgs/top-level/all-packages.nix --dry-run -A firefox) if [ "$p1" != "$p2" ]; then echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!" @@ -51,19 +60,19 @@ releaseTools.sourceTarball rec { # Check that all-packages.nix evaluates on a number of platforms without any warnings. for platform in i686-linux x86_64-linux x86_64-darwin; do - header "checking pkgs/top-level/all-packages.nix on $platform" + header "checking Nixpkgs on $platform" - NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \ + NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \ --show-trace --argstr system "$platform" \ -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log if [ -s eval-warnings.log ]; then - echo "pkgs/top-level/all-packages.nix on $platform evaluated with warnings, aborting" + echo "Nixpkgs on $platform evaluated with warnings, aborting" exit 1 fi rm eval-warnings.log - NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \ + NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \ --show-trace --argstr system "$platform" \ -qa --drv-path --system-filter \* --system --meta --xml > /dev/null stopNest diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 00dbee64cac..7ca2a82f1ea 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -310,7 +310,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://metacpan.org/release/Attribute-Params-Validate; description = "Define validation through subroutine attributes"; - license = "artistic_2"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -587,7 +587,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Lists of reserved barewords and symbol names"; - license = "unknown"; + license = with stdenv.lib.licenses; [ artistic1 gpl2 ]; }; }; @@ -707,7 +707,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Perl client for B, in C language"; - license = "unknown"; + license = "perl"; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -1479,7 +1479,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestDeep ]; meta = { description = "Build structures from CGI data"; - license = "bsd"; + license = stdenv.lib.licenses.bsd2; }; }; @@ -2740,7 +2740,7 @@ let self = _self // overrides; _self = with self; { sha256 = "29a1926314ce1681a312d6155c29590c771ddacf91b7485873ce449ef209dd04"; }; meta = { - license = "unknown"; + license = with stdenv.lib.licenses; [ artistic1 gpl2Plus ]; }; }; @@ -2767,7 +2767,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime DateTimeEventRecurrence ]; meta = { description = "DateTime rfc2445 recurrences"; - license = "unknown"; + license = "perl"; }; }; @@ -2950,7 +2950,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DateTime SetInfinite ]; meta = { description = "DateTime set objects"; - license = "unknown"; + license = "perl"; }; }; @@ -3150,6 +3150,7 @@ let self = _self // overrides; _self = with self; { patches = [ # Fix test error inside t/52leaks.t ../development/perl-modules/dbix-class-fix-52leaks.patch + ../development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch ]; meta = { homepage = http://www.dbix-class.org/; @@ -4883,7 +4884,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils MooXlate ]; meta = { description = "Verify solutions for solitaire games"; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; @@ -5064,10 +5065,10 @@ let self = _self // overrides; _self = with self; { }; Gtk2 = buildPerlPackage rec { - name = "Gtk2-1.2496"; + name = "Gtk2-1.2497"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "1avn77m5hrdyy4k5sqgf870nsmykf6zlcn1haj8arjjl9yaxwic6"; + sha256 = "0j5wm290ihpkx91gbk55qrrb0jhbh5fanbj5fjvs0d2xv6yyh921"; }; buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Pango pkgs.gtk2 ]; meta = { @@ -5218,23 +5219,21 @@ let self = _self // overrides; _self = with self; { }; HTMLFormFu = buildPerlPackage rec { - name = "HTML-FormFu-0.09010"; + name = "HTML-FormFu-2.01"; src = fetchurl { url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; - sha256 = "08hf6z35yhfd1521ip8x5hpwb7h09k643s9sqf6ddmi9yvqini1k"; + sha256 = "0fvilng85wc65pna898x7mp4hx73mhahl7j2s10gj76avmxdizsw"; + }; + buildInputs = [ FileShareDirInstall TestAggregate TestException ]; + propagatedBuildInputs = [ Clone ConfigAny DataVisitor DateTime + DateTimeFormatBuilder DateTimeFormatNatural DateTimeFormatStrptime + DateTimeLocale EmailValid FileShareDir HTMLScrubber HTMLTokeParserSimple + HTTPMessage HashFlatten ListMoreUtils ModulePluggable Moose MooseXAliases + NumberFormat PathClass Readonly RegexpCommon TaskWeaken YAMLLibYAML ]; + meta = { + description = "HTML Form Creation, Rendering and Validation Framework"; + license = "perl"; }; - buildInputs = [ CGISimple ]; - propagatedBuildInputs = - [ ClassAccessorChained Clone ConfigAny - DateCalc ListMoreUtils EmailValid - DataVisitor DateTime DateTimeFormatBuilder - DateTimeFormatStrptime DateTimeFormatNatural - Readonly YAMLLibYAML NumberFormat HashFlatten - HTMLTokeParserSimple RegexpCommon - CaptchaReCAPTCHA HTMLScrubber FileShareDir - TemplateToolkit CryptCBC CryptDES PathClass - MooseXAttributeChained MooseXAliases MooseXSetOnce - ]; }; HTMLFormHandler = buildPerlPackage { @@ -5296,20 +5295,20 @@ let self = _self // overrides; _self = with self; { }; }; - HTMLScrubber = buildPerlPackage { - name = "HTML-Scrubber-0.08"; + HTMLScrubber = buildPerlPackage rec { + name = "HTML-Scrubber-0.15"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/PODMASTER/HTML-Scrubber-0.08.tar.gz; + url = "mirror://cpan/authors/id/P/PO/PODMASTER/${name}.tar.gz"; sha256 = "0xb5zj67y2sjid9bs3yfm81rgi91fmn38wy1ryngssw6vd92ijh2"; }; - propagatedBuildInputs = [HTMLParser]; + propagatedBuildInputs = [ HTMLParser ]; }; - HTMLTableExtract = buildPerlPackage { - name = "HTML-TableExtract-2.11"; + HTMLTableExtract = buildPerlPackage rec { + name = "HTML-TableExtract-2.13"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.11.tar.gz; - sha256 = "1861d55a2aa1728ef56ea2d08d630b9a008456f1106994e4e49e76f56e4955ee"; + url = "mirror://cpan/authors/id/M/MS/MSISK/${name}.tar.gz"; + sha256 = "01jimmss3q68a89696wmclvqwb2ybz6xgabpnbp6mm6jcni82z8a"; }; propagatedBuildInputs = [ HTMLElementExtended HTMLParser ]; }; @@ -6116,7 +6115,7 @@ let self = _self // overrides; _self = with self; { ''; doCheck = false; # test would need to start apache httpd meta = { - license = "open_source"; + license = stdenv.lib.licenses.asl20; }; }; @@ -6553,7 +6552,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "The World-Wide Web library for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.illumos; }; }; @@ -6789,7 +6788,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/dist/Math-Random-ISAAC; description = "Perl interface to the ISAAC PRNG algorithm"; - license = "unrestricted"; + license = with stdenv.lib.licenses; [ publicDomain mit artistic2 gpl3 ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; @@ -7234,7 +7233,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ IPCRun ]; meta = { description = "Module signature file manipulation"; - license = "cc0"; + license = stdenv.lib.licenses.cc0; }; }; @@ -8041,7 +8040,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Mozilla's CA cert bundle in PEM format"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; }; }; @@ -9296,7 +9295,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Modules for parsing/translating POD format documents"; - license = "unknown"; + license = stdenv.lib.licenses.artistic1; }; }; @@ -9508,7 +9507,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://wiki.github.com/toddr/Regexp-Parser; description = "Base class for parsing regexes"; - license = "unknown"; + license = "perl"; }; }; @@ -9978,7 +9977,7 @@ let self = _self // overrides; _self = with self; { sha256 = "a566b792112bbba21131ec1d7a2bf78170c648484895283ae53c7f0c3dc2f0be"; }; meta = { - license = "unknown"; + license = "perl"; }; }; @@ -10572,7 +10571,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ TemplateToolkit ]; meta = { description = "Rudimentary profiling for Template Toolkit"; - license = "null"; + license = with stdenv.lib.licenses; [ artistic2 gpl3 ]; }; }; @@ -10908,7 +10907,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CaptureTiny TextDiff ]; meta = { description = "Test strings and data structures and show differences if not ok"; - license = "unknown"; + license = "perl"; }; }; @@ -11207,7 +11206,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Make sure you didn't emit any warnings while testing"; - license = "open_source"; + license = stdenv.lib.licenses.lgpl21; }; }; @@ -11864,7 +11863,7 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://www.shlomifish.org/open-source/projects/docmake/; description = "Organize Data in Tables"; - license = "bsd"; + license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.linux; }; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 96c4ab06a51..02ff5a3653e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -115,11 +115,11 @@ let self = with self; { composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.0.0-alpha10"; + version = "1.0.0-alpha11"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0a26zlsr2jffcqlz8z6l8s6c6nlyfj2gxqfgx76knx5wch1psb4z"; + sha256 = "1b41ad352p4296c2j7cdq27wp06w28080bjxnjpmw536scb7yd27"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6cb1ad5df16..2b85f2932ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -85,6 +85,8 @@ in modules // { blivet = callPackage ../development/python-modules/blivet { }; + pylint = callPackage ../development/python-modules/pylint { }; + dbus = callPackage ../development/python-modules/dbus { dbus = pkgs.dbus; }; @@ -138,14 +140,20 @@ in modules // { pycairo = callPackage ../development/python-modules/pycairo { }; + pycangjie = if isPy3k then callPackage ../development/python-modules/pycangjie { } else throw "pycangjie not supported for interpreter ${python.executable}"; + pycrypto = callPackage ../development/python-modules/pycrypto { }; + pygame = callPackage ../development/python-modules/pygame { }; + pygobject = callPackage ../development/python-modules/pygobject { }; pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { }; pygtk = callPackage ../development/python-modules/pygtk { libglade = null; }; + pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; + pyGtkGlade = self.pygtk.override { libglade = pkgs.gnome.libglade; }; @@ -161,6 +169,16 @@ in modules // { qt5 = pkgs.qt5; }; + pyside = callPackage ../development/python-modules/pyside { }; + + pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; + + pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; + + pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { }; + + pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + sip = callPackage ../development/python-modules/sip { }; sip_4_16 = callPackage ../development/python-modules/sip/4.16.nix { }; @@ -200,6 +218,48 @@ in modules // { }; }; + acd_cli = buildPythonPackage rec { + name = pname + "-" + version; + pname = "acd_cli"; + version = "0.3.1"; + + disabled = !isPy3k; + doCheck = !isPy3k; + + src = pkgs.fetchFromGitHub { + owner = "yadayada"; + repo = pname; + rev = version; + sha256 = "1ywimbisgb5g7xl9nrfwcm7dv3j8fsrjfp7bxb3l58zbsrzj6z2s"; + }; + + propagatedBuildInputs = with self; [ appdirs colorama dateutil requests2 requests_toolbelt sqlalchemy ]; + + makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${pkgs.fuse}/lib/libfuse.so" ]; + + meta = { + description = "A command line interface and FUSE filesystem for Amazon Cloud Drive"; + homepage = https://github.com/yadayada/acd_cli; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ edwtjo ]; + }; + }; + + acme = buildPythonPackage rec { + inherit (pkgs.letsencrypt) src version; + + name = "acme-${version}"; + + propagatedBuildInputs = with self; [ + cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock + ndg-httpsclient + ]; + + buildInputs = with self; [ nose ]; + + sourceRoot = "letsencrypt-${version}/acme"; + }; actdiag = buildPythonPackage rec { name = "actdiag-0.5.3"; @@ -282,6 +342,29 @@ in modules // { }; }; + aiohttp = buildPythonPackage rec { + name = "aiohttp-${version}"; + version = "0.19.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/aiohttp/${name}.tar.gz"; + sha256 = "9bfb173baec179431a1c8f3566185e8ebbd1517cf4450217087d79e26e44c287"; + }; + + disabled = pythonOlder "3.4"; + + doCheck = false; # Too many tests fail. + + buildInputs = with self; [ pytest gunicorn pytest-raisesregexp ]; + propagatedBuildInputs = with self; [ chardet ]; + + meta = { + description = "http client/server for asyncio"; + license = with licenses; [ asl20 ]; + homepage = https://github.com/KeepSafe/aiohttp/; + }; + }; + alabaster = buildPythonPackage rec { name = "alabaster-0.7.3"; @@ -331,6 +414,30 @@ in modules // { }; }; + python-gnupg = buildPythonPackage rec { + name = "python-gnupg-${version}"; + version = "0.3.8"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-gnupg/${name}.tar.gz"; + sha256 = "0nkbs9c8f30lra7ca39kg91x8cyxn0jb61vih4qky839gpbwwwiq"; + }; + + # Let's make the library default to our gpg binary + patchPhase = '' + substituteInPlace gnupg.py \ + --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg}/bin/gpg'" + ''; + + meta = { + description = "A wrapper for the Gnu Privacy Guard"; + homepage = "https://pypi.python.org/pypi/python-gnupg"; + license = licenses.bsd3; + maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.unix; + }; + }; + almir = buildPythonPackage rec { name = "almir-0.1.8"; @@ -417,7 +524,6 @@ in modules // { }; }; - anyjson = buildPythonPackage rec { name = "anyjson-0.3.3"; disabled = isPy3k; @@ -473,6 +579,70 @@ in modules // { }; }; + ansible = buildPythonPackage rec { + version = "1.9.4"; + name = "ansible-${version}"; + + src = pkgs.fetchurl { + url = "https://releases.ansible.com/ansible/${name}.tar.gz"; + sha256 = "1qvgzb66nlyc2ncmgmqhzdk0x0p2px09967p1yypf5czwjn2yb4p"; + }; + + prePatch = '' + sed -i "s,/usr/,$out," lib/ansible/constants.py + ''; + + doCheck = false; + dontStrip = true; + dontPatchELF = true; + dontPatchShebangs = true; + windowsSupport = true; + + propagatedBuildInputs = with self; [ + paramiko jinja2 pyyaml httplib2 boto six + ] ++ optional windowsSupport pywinrm; + + meta = { + homepage = "http://www.ansible.com"; + description = "A simple automation tool"; + license = with licenses; [ gpl3] ; + maintainers = with maintainers; [ joamaki ]; + platforms = with platforms; [ linux darwin ]; + }; + }; + + ansible2 = buildPythonPackage rec { + version = "v2.0.0_0.6.rc1"; + name = "ansible-${version}"; + + src = pkgs.fetchurl { + url = "http://releases.ansible.com/ansible/ansible-2.0.0-0.6.rc1.tar.gz"; + sha256 = "0v7fqi7qg9lzvpsjlaw9rzas8n1cdsyp3y9jrqzjxs9nbknwcibd"; + }; + + prePatch = '' + sed -i "s,/usr/,$out," lib/ansible/constants.py + ''; + + doCheck = false; + dontStrip = true; + dontPatchELF = true; + dontPatchShebangs = true; + windowsSupport = true; + + propagatedBuildInputs = with self; [ + paramiko jinja2 pyyaml httplib2 boto six + ] ++ optional windowsSupport pywinrm; + + meta = with stdenv.lib; { + homepage = "http://www.ansible.com"; + description = "A simple automation tool"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ copumpkin ]; + platforms = with platforms; [ linux darwin ]; + }; + }; + apipkg = buildPythonPackage rec { name = "apipkg-1.4"; @@ -868,6 +1038,42 @@ in modules // { }; })); + awscli = buildPythonPackage rec { + name = "awscli-${version}"; + version = "1.9.12"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/awscli/${name}.tar.gz"; + sha256 = "0b50de084c8de70adf45c0e938b6350344d9b6acde8b7cdee02cb32964bc58fd"; + }; + + propagatedBuildInputs = with self; [ + botocore + bcdoc + six + colorama + docutils + rsa + pyasn1 + pkgs.groff + ]; + + postInstall = '' + mkdir -p $out/etc/bash_completion.d + echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli + mkdir -p $out/share/zsh/site-functions + mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions + rm $out/bin/aws.cmd + ''; + + meta = { + homepage = https://aws.amazon.com/cli/; + description = "Unified tool to manage your AWS services"; + license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ muflax ]; + }; + }; + azure = buildPythonPackage rec { version = "0.11.0"; name = "azure-${version}"; @@ -1605,6 +1811,32 @@ in modules // { }; }; + bsddb3 = buildPythonPackage rec { + name = "bsddb3-${version}"; + version = "6.1.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz"; + sha256 = "6f21b0252125c07798d784c164ef135ad153d226c01b290258ee1c5b9e7c4dd3"; + }; + + buildInputs = [ pkgs.db ]; + + # Path to database need to be set. + # Somehow the setup.py flag is not propagated. + #setupPyBuildFlags = [ "--berkeley-db=${pkgs.db}" ]; + # We can also use a variable + preConfigure = '' + export BERKELEYDB_DIR=${pkgs.db}; + ''; + + meta = { + description = "Python bindings for Oracle Berkeley DB"; + homepage = http://www.jcea.es/programacion/pybsddb.htm; + license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x + }; + }; + bokeh = buildPythonPackage rec { name = "bokeh-${version}"; version = "0.10.0"; @@ -1677,11 +1909,13 @@ in modules // { boto3 = buildPythonPackage rec { name = "boto3-${version}"; - version = "1.1.4"; + version = "1.2.2"; - src = pkgs.fetchurl { - url = "https://github.com/boto/boto3/archive/${version}.zip"; - sha256 = "11fdfbq8ann11wdzmbd0djnb1biyyhs1jcc8maxmkcj2q9fw6dk0"; + src = pkgs.fetchFromGitHub { + owner = "boto"; + repo = "boto3"; + rev = version; + sha256 = "1w53lhhdzi29d31qzhflb5mcwb24mfrj4frv70w6qyn8vmqznnjy"; }; propagatedBuildInputs = [ self.botocore @@ -1706,44 +1940,17 @@ in modules // { }; botocore = buildPythonPackage rec { - version = "1.2.0"; + version = "1.3.12"; name = "botocore-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; - sha256 = "0wj98fsiwqzy0i0zh86fx15sgdjkwqi6crxig6b4kvrckl8bkwjr"; + sha256 = "6f4f09234aca23db2e66c548b98a4fb14516241b31fb473c9c6f5b21270900c6"; }; propagatedBuildInputs = [ self.dateutil - self.requests - self.jmespath - ]; - - buildInputs = [ self.docutils ]; - - meta = { - homepage = https://github.com/boto/botocore; - - license = "bsd"; - - description = "A low-level interface to a growing number of Amazon Web Services"; - - }; - }; - - botocore_1_1_10 = buildPythonPackage rec { - version = "1.1.10"; - name = "botocore-${version}"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; - sha256 = "0syj0m0l7k4wa0n9h7h8ywayjv9fgpn5wyzpdriws0j417y1zlyc"; - }; - - propagatedBuildInputs = - [ self.dateutil - self.requests + self.requests2 self.jmespath ]; @@ -2071,6 +2278,23 @@ in modules // { }; }; + CDDB = buildPythonPackage rec { + name = "CDDB-1.4"; + + disabled = !isPy27; + + src = pkgs.fetchurl { + url = "http://cddb-py.sourceforge.net/${name}.tar.gz"; + sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w"; + }; + + meta = { + homepage = http://cddb-py.sourceforge.net/; + description = "CDDB and FreeDB audio CD track info access"; + license = licenses.gpl2Plus; + }; + }; + celery = buildPythonPackage rec { name = "celery-${version}"; @@ -2215,11 +2439,11 @@ in modules // { }; click = buildPythonPackage rec { - name = "click-6.1"; + name = "click-6.2"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz"; - sha256 = "09mi68vazmlqd0f94kjvqqlpjig4m5xl996zprwnghj90cn32ncw"; + sha256 = "10kavbisnk9m93jl2wi34pw7ryr2qbxshh2cysxwxd7bymqgz87v"; }; meta = { @@ -2516,6 +2740,25 @@ in modules // { }; + consul = buildPythonPackage (rec { + name = "python-consul-0.4.7"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-consul/${name}.tar.gz"; + sha256 = "1vb0hgl11n8krpk5n22bk90agm31004ipv4xnbcadzczj5xackg7"; + }; + + buildInputs = with self; [ requests2 six pytest ]; + + meta = { + description = "Python client for Consul (http://www.consul.io/)"; + homepage = https://github.com/cablehead/python-consul; + license = licenses.mit; + maintainers = with maintainers; [ desiderius ]; + }; + }); + + contextlib2 = buildPythonPackage rec { name = "contextlib2-0.4.0"; @@ -2857,6 +3100,7 @@ in modules // { mixpanel = buildPythonPackage rec { version = "4.0.2"; name = "mixpanel-${version}"; + disabled = isPy3k; src = pkgs.fetchzip { url = "https://github.com/mixpanel/mixpanel-python/archive/${version}.zip"; @@ -3133,6 +3377,30 @@ in modules // { }; }; + pytest-raisesregexp = buildPythonPackage rec { + name = "pytest-raisesregexp-${version}"; + version = "2.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-raisesregexp/${name}.tar.gz"; + sha256 = "0fde8aac1a54f9b56e5f9c61fda76727542ed24968c27c6e3688c6f1885f1e61"; + }; + + buildInputs = with self; [ py pytest ]; + + # https://github.com/kissgyorgy/pytest-raisesregexp/pull/3 + prePatch = '' + sed -i '3i\import io' setup.py + substituteInPlace setup.py --replace "long_description=open('README.rst').read()," "long_description=io.open('README.rst', encoding='utf-8').read()," + ''; + + meta = { + description = "Simple pytest plugin to look for regex in Exceptions"; + homepage = https://github.com/Walkman/pytest_raisesregexp; + license = with licenses; [ mit ]; + }; + }; + pytestrunner = buildPythonPackage rec { version = "2.6.2"; name = "pytest-runner-${version}"; @@ -3986,7 +4254,7 @@ in modules // { # Check is disabled because running them destroy the content of the local cluster! # https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch doCheck = false; - propagatedBuildInputs = with self; [ urllib3 pyaml requests2 pyyaml ]; + propagatedBuildInputs = with self; [ urllib3 requests2 ]; buildInputs = with self; [ nosexcover mock ]; meta = { @@ -5009,6 +5277,27 @@ in modules // { }; }; + python-mapnik = buildPythonPackage { + name = "python-mapnik-fae6388"; + + src = pkgs.fetchgit { + url = https://github.com/mapnik/python-mapnik.git; + rev = "fae63881ed0945829e73f711d52740240b740936"; + sha256 = "13i9zsy0dk9pa947vfq26a3nrn1ddknqliyb0ljcmi5w5x0z758k"; + }; + + disabled = isPyPy; + doCheck = false; # doesn't find needed test data files + buildInputs = with pkgs; [ boost harfbuzz icu mapnik ]; + propagatedBuildInputs = with self; [ pillow pycairo ]; + + meta = with stdenv.lib; { + description = "Python bindings for Mapnik"; + homepage = http://mapnik.org; + license = licenses.lgpl21; + }; + }; + mwlib = buildPythonPackage rec { version = "0.15.15"; name = "mwlib-${version}"; @@ -5018,7 +5307,7 @@ in modules // { sha256 = "1dnmnkc21zdfaypskbpvkwl0wpkpn0nagj1fc338w64mbxrk8ny7"; }; - commonDeps = with self; + propagatedBuildInputs = with self; [ apipkg bottle @@ -5034,19 +5323,7 @@ in modules // { simplejson sqlite3dbm timelib - ]; - - pythonPath = commonDeps ++ - [ - modules.sqlite3 - ]; - - propagatedBuildInputs = commonDeps; - - buildInputs = with self; - [ - pil - ] ++ propagatedBuildInputs; + ] ++ optionals (!isPy3k) [ modules.sqlite3 ]; meta = { description = "Library for parsing MediaWiki articles and converting them to different output formats"; @@ -5384,6 +5661,25 @@ in modules // { }; }; + plotly = buildPythonPackage rec { + name = "plotly-1.9.1"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/plotly/${name}.tar.gz"; + md5 = "84fe80b294b639357f12fa210ce09f95"; + }; + + propagatedBuildInputs = with self; [ self.pytz self.six self.requests ]; + + meta = { + description = "Python plotting library for collaborative, interactive, publication-quality graphs"; + homepage = https://plot.ly/python/; + license = licenses.mit; + }; + }; + + poppler-qt4 = buildPythonPackage rec { name = "poppler-qt4-${version}"; version = "0.18.1"; @@ -5827,10 +6123,10 @@ in modules // { }; py3status = buildPythonPackage rec { - name = "py3status-2.3"; + name = "py3status-2.7"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/py3status/${name}.tar.gz"; - md5 = "89ad395268c7791ff5d36412b1efeeb9"; + sha256 = "09r70zbq5xxhzbgd54dcx8p9z0631a454j2ird1lawkms22fc7wv"; }; propagatedBuildInputs = with self; [ requests2 ]; meta = { @@ -6322,6 +6618,16 @@ in modules // { django = self.django_1_7; + django_gis = self.django.override rec { + patches = [ + (pkgs.substituteAll { + src = ../development/python-modules/django/1.7.7-gis-libs.template.patch; + geos = pkgs.geos; + gdal = pkgs.gdal; + }) + ]; + }; + django_1_8 = buildPythonPackage rec { name = "Django-${version}"; version = "1.8.4"; @@ -7510,6 +7816,8 @@ in modules // { }; }); + foursuite = callPackage ../development/python-modules/4suite {}; + fs = buildPythonPackage rec { name = "fs-0.5.0"; @@ -7854,29 +8162,6 @@ in modules // { }; }; - glance = buildPythonPackage rec { - name = "glance-0.1.7"; - - src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/g/glance/${name}.tar.gz"; - md5 = "e733713ccd23e4a6253386a47971cfb5"; - }; - - buildInputs = with self; [ nose mox ]; - - # tests fail for python2.6 - doCheck = python.majorVersion != "2.6"; - - propagatedBuildInputs = with self; [ gflags sqlalchemy webob routes eventlet ]; - - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - - meta = { - homepage = https://launchpad.net/glance; - description = "Services for discovering, registering, and retrieving virtual machine images"; - }; - }; - glances = buildPythonPackage rec { name = "glances-${version}"; version = "2.4.2"; @@ -8487,12 +8772,12 @@ in modules // { }; ipykernel = buildPythonPackage rec { - version = "4.1.1"; + version = "4.2.0"; name = "ipykernel-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/ipykernel/${name}.tar.gz"; - sha256 = "d8c5555386d0f18f1336dea9800f9f0fe96dcecc9757c0f980e11fdfadb661ff"; + sha256 = "723b3d4baac20f0c9cd91fc75c3e813636ecb6c6e303fb34d628c3df078985a7"; }; buildInputs = with self; [] ++ optionals isPy27 [mock]; @@ -8507,12 +8792,12 @@ in modules // { }; ipyparallel = buildPythonPackage rec { - version = "4.0.2"; + version = "4.1.0"; name = "ipyparallel-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/ipyparallel/${name}.tar.gz"; - sha256 = "6b9e09ca441a45e055b97cb8e3e1dd30de85b935fae3aa0d97f138352fd3089b"; + sha256 = "c943f6b3bbabb9332336d15474969e2a7a73d5b583f9786f7b357c75e4b1709a"; }; propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel]; @@ -8573,12 +8858,12 @@ in modules // { ipywidgets = buildPythonPackage rec { - version = "4.0.2"; + version = "4.1.1"; name = "ipywidgets-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/ipywidgets/${name}.tar.gz"; - sha256 = "1afwddaslf62ba75679s059z36zfamcx454q2lgd97xqsp30hqmf"; + sha256 = "ceeb325e45ade9537c2d115fed9d522e5c6e90bb161592e2f0807375dc661028"; }; propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook]; @@ -8647,6 +8932,33 @@ in modules // { propagatedBuildInputs = with self; [ self.nose self.ipython ]; }; + pythonIRClib = buildPythonPackage rec { + name = "irclib-${version}"; + version = "0.4.8"; + + src = pkgs.fetchurl { + url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz"; + sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1"; + }; + + patches = [(pkgs.fetchurl { + url = "http://trac.uwc.ac.za/trac/python_tools/browser/xmpp/resources/irc-transport/irclib.py.diff?rev=387&format=raw"; + name = "irclib.py.diff"; + sha256 = "5fb8d95d6c95c93eaa400b38447c63e7a176b9502bc49b2f9b788c9905f4ec5e"; + })]; + + patchFlags = "irclib.py"; + + propagatedBuildInputs = with self; [ paver ]; + + disabled = isPy3k; + meta = { + description = "Python IRC library"; + homepage = https://bitbucket.org/jaraco/irc; + license = with licenses; [ lgpl21 ]; + }; + }; + iso8601 = buildPythonPackage { name = "iso8601-0.1.10"; src = pkgs.fetchurl { @@ -8916,13 +9228,13 @@ in modules // { kombu = buildPythonPackage rec { name = "kombu-${version}"; - version = "3.0.29"; + version = "3.0.30"; disabled = pythonOlder "2.6"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/k/kombu/${name}.tar.gz"; - sha256 = "1a6wlr2bv6j2z07wrxc5g0w6h99n2ciamx3f7qy40s76cpn5a2lp"; + sha256 = "0npq81ajiqmp8gjm7mq05n18y98xqpv7n4bbqb3p74d4irvgw0mr"; }; buildInputs = with self; optionals (!isPy3k) [ anyjson mock unittest2 nose ]; @@ -9064,6 +9376,24 @@ in modules // { }; }; + line_profiler = buildPythonPackage rec{ + version = "1.0"; + name = "line_profiler-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/l/line_profiler/${name}.tar.gz"; + sha256 = "a9e0c9ffa814f1215107c86c890afa8e63bec5a37d951f6f9d3668c1df2b1900"; + }; + + buildInputs = with self; [ cython ]; + + meta = { + description = "Line-by-line profiler"; + homepage = https://github.com/rkern/line_profiler; + license = licenses.bsd3; + maintainer = with maintainers; [ fridh ]; + }; + }; linode = buildPythonPackage rec { name = "linode-${version}"; @@ -9745,6 +10075,24 @@ in modules // { }; }); + modestmaps = buildPythonPackage rec { + name = "ModestMaps-1.4.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/M/ModestMaps/${name}.tar.gz"; + sha256 = "0vyi1m9q4pc34i6rq5agb4x3qicx5sjlbxwmxfk70k2l5mnbjca3"; + }; + + disabled = !isPy27; + propagatedBuildInputs = with self; [ pillow ]; + + meta = { + description = "A library for building interactive maps"; + homepage = http://modestmaps.com; + license = stdenv.lib.licenses.bsd3; + }; + }; + moinmoin = buildPythonPackage (rec { name = "moinmoin-${ver}"; disabled = isPy3k; @@ -10026,6 +10374,36 @@ in modules // { }; }); + mygpoclient = buildPythonPackage rec { + name = "mygpoclient-${version}"; + version = "1.7"; + + src = pkgs.fetchurl { + url = "https://thp.io/2010/mygpoclient/${name}.tar.gz"; + sha256 = "6a0b7b1fe2b046875456e14eda3e42430e493bf2251a64481cf4fd1a1e21a80e"; + }; + + buildInputs = with self; [ nose minimock ]; + + checkPhase = '' + nosetests + ''; + + disabled = isPy3k; + + meta = { + description = "A gpodder.net client library"; + longDescription = '' + The mygpoclient library allows developers to utilize a Pythonic interface + to the gpodder.net web services. + ''; + homepage = https://thp.io/2010/mygpoclient/; + license = with licenses; [ gpl3 ]; + platforms = with platforms; [ linux darwin ]; + maintainers = with maintainers; [ skeidel ]; + }; + }; + plover = buildPythonPackage rec { name = "plover-${version}"; version = "2.5.8"; @@ -10101,6 +10479,8 @@ in modules // { monotonic = buildPythonPackage rec { name = "monotonic-0.4"; + __propagatedImpureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/monotonic/${name}.tar.gz"; sha256 = "1diab6hfh3jpa1f0scpqaqrawk4g97ss4v7gkn2yw8znvdm6abw5"; @@ -10738,12 +11118,12 @@ in modules // { }; numexpr = buildPythonPackage rec { - version = "2.4.3"; + version = "2.4.6"; name = "numexpr-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/numexpr/${name}.tar.gz"; - sha256 = "3ae7191c89df40db6b0a8637a4dace7c5956bc910793a53225f985f3b443c722"; + sha256 = "052397670dc56d7845ff894cd7d858e4f115491ecd93bcc0eda5cb83990c5da3"; }; # Tests fail with python 3. https://github.com/pydata/numexpr/issues/177 @@ -11617,6 +11997,13 @@ in modules // { sha256 = "1711rlmykizw675ihbaqmk3ph6ah0njbygxr9lrdnacy6yrlmbd5"; }; + # https://bugs.launchpad.net/oslo.rootwrap/+bug/1519839 + patchPhase = '' + substituteInPlace oslo_rootwrap/filters.py \ + --replace "/bin/cat" "${pkgs.coreutils}/bin/cat" \ + --replace "/bin/kill" "${pkgs.coreutils}/bin/kill" + ''; + buildInputs = with self; [ eventlet mock oslotest ]; propagatedBuildInputs = with self; [ six pbr @@ -12242,9 +12629,9 @@ in modules // { }; propagatedBuildInputs = with self; [ - pbr Babel six iso8601 debtcollector pyinotify + pbr Babel six iso8601 debtcollector oslo-utils oslo-i18n oslo-config oslo-serialization oslo-context - ]; + ] ++ stdenv.lib.optional stdenv.isLinux pyinotify; buildInputs = with self; [ oslotest oslosphinx ]; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf @@ -12432,11 +12819,11 @@ in modules // { inherit (pkgs.stdenv) isDarwin; in buildPythonPackage rec { name = "pandas-${version}"; - version = "0.17.0"; + version = "0.17.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz"; - sha256 = "320d4fdf734b82adebc8fde9d8ca4b05fe155a72b6f7aa95d76242da8748d6a4"; + sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837"; }; buildInputs = with self; [ nose ] ++ optional isDarwin pkgs.libcxx; @@ -12454,7 +12841,7 @@ in modules // { (if isPy35 then null else html5lib) modules.sqlite3 beautifulsoup4 - ] ++ optional isDarwin pkgs.darwin.adv_cmds; # provides the locale command + ] ++ optional isDarwin pkgs.darwin.locale; # provides the locale command # For OSX, we need to add a dependency on libcxx, which provides # `complex.h` and other libraries that pandas depends on to build. @@ -13089,7 +13476,8 @@ in modules // { substituteInPlace soundfile.py --replace "'sndfile'" "'${pkgs.libsndfile}/lib/libsndfile.so'" ''; - disabled = isPyPy; + # https://github.com/bastibe/PySoundFile/issues/157 + disabled = isPyPy || stdenv.isi686; }; python3pika = buildPythonPackage { @@ -13127,50 +13515,6 @@ in modules // { }; }; - - pil = buildPythonPackage rec { - name = "PIL-${version}"; - version = "1.1.7"; - - src = pkgs.fetchurl { - url = "http://effbot.org/downloads/Imaging-${version}.tar.gz"; - sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9"; - }; - - buildInputs = with self; [ python pkgs.libjpeg pkgs.zlib pkgs.freetype ]; - - disabled = isPy3k; - - postInstall = "ln -s $out/${python.sitePackages} $out/${python.sitePackages}/PIL"; - - preConfigure = '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${pkgs.freetype}")|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${pkgs.libjpeg}")|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${pkgs.zlib}")|g ;' - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # Remove impurities - substituteInPlace setup.py \ - --replace '"/Library/Frameworks",' "" \ - --replace '"/System/Library/Frameworks"' "" - ''; - - checkPhase = "${python.interpreter} selftest.py"; - - meta = { - homepage = http://www.pythonware.com/products/pil/; - description = "The Python Imaging Library (PIL)"; - longDescription = '' - The Python Imaging Library (PIL) adds image processing - capabilities to your Python interpreter. This library - supports many file formats, and provides powerful image - processing and graphics capabilities. - ''; - license = "http://www.pythonware.com/products/pil/license.htm"; - }; - }; - - pillow = buildPythonPackage rec { name = "Pillow-2.9.0"; @@ -13502,6 +13846,7 @@ in modules // { sha256 = "07ivzl7bq8bjcq5n90w4bsl29gjfm5l8yamw0paxh25si8r3zfi4"; }; + buildInputs = optional stdenv.isDarwin pkgs.openssl; propagatedBuildInputs = with self; [ pkgs.postgresql ]; meta = { @@ -13529,15 +13874,16 @@ in modules // { py = buildPythonPackage rec { - name = "py-1.4.30"; + name = "py-${version}"; + version = "1.4.31"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz"; - md5 = "a904aabfe4765cb754f2db84ec7bb03a"; + sha256 = "a6501963c725fc2554dabfece8ae9a8fb5e149c0ac0a42fd2b02c5c1c57fc114"; }; # some weird errors with paths - doCheck = !isPy3k; + # doCheck = !isPy3k; meta = { description = "Library with cross-python path, ini-parsing, io, code, log facilities"; @@ -14026,6 +14372,24 @@ in modules // { }; }); + pycups = buildPythonPackage rec { + name = "pycups-${version}"; + version = "1.9.73"; + + src = pkgs.fetchurl { + url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2"; + sha256 = "c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335"; + }; + + buildInputs = [ pkgs.cups ]; + + meta = { + description = "Python bindings for libcups"; + homepage = http://cyberelk.net/tim/software/pycups/; + license = with licenses; [ gpl2Plus ]; + }; + + }; pycurl = buildPythonPackage (rec { name = "pycurl-7.19.5"; @@ -14182,6 +14546,38 @@ in modules // { }; }; + pyfftw = buildPythonPackage rec { + name = "pyfftw-${version}"; + version = "0.9.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyFFTW/pyFFTW-${version}.tar.gz"; + sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074"; + }; + + buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; + + propagatedBuildInputs = with self; [ numpy scipy ]; + + # Tests cannot import pyfftw. pyfftw works fine though. + doCheck = false; + + preConfigure = '' + export LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib" + export CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include" + ''; + #+ optionalString isDarwin '' + # export DYLD_LIBRARY_PATH="${pkgs.fftw}/lib" + #''; + + meta = { + description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; + homepage = http://hgomersall.github.com/pyFFTW/; + license = with licenses; [ bsd2 bsd3 ]; + maintainer = with maintainers; [ fridh ]; + }; + }; + pyfiglet = buildPythonPackage rec { name = "pyfiglet-${version}"; version = "0.7.2"; @@ -14304,6 +14700,24 @@ in modules // { }; }; + pyx = buildPythonPackage rec { + name = "pyx-${version}"; + version = "0.14.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/P/PyX/PyX-${version}.tar.gz"; + sha256 = "05d1b7fc813379d2c12fcb5bd0195cab522b5aabafac88f72913f1d47becd912"; + }; + + disabled = !isPy3k; + + meta = { + description = "Python package for the generation of PostScript, PDF, and SVG files"; + homepage = http://pyx.sourceforge.net/; + license = with licenses; [ gpl2 ]; + }; + }; + mmpython = buildPythonPackage rec { version = "0.4.10"; name = "mmpython-${version}"; @@ -15456,6 +15870,26 @@ in modules // { }; }; + rbtools = buildPythonPackage rec { + name = "rbtools-0.7.2"; + + src = pkgs.fetchurl { + url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.2.tar.gz"; + sha256 = "1ng8l8cx81cz23ls7fq9wz4ijs0zbbaqh4kj0mj6plzcqcf8na4i"; + }; + + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ modules.sqlite3 six ]; + + checkPhase = "nosetests"; + + disabled = isPy3k; + + meta = { + maintainers = with maintainers; [ iElectric ]; + }; + }; + rencode = buildPythonPackage rec { name = "rencode-${version}"; version = "git20150810"; @@ -16205,6 +16639,7 @@ in modules // { rpkg = buildPythonPackage (rec { name = "rpkg-1.14"; + disabled = !isPy27; meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { @@ -16734,6 +17169,24 @@ in modules // { }; }; + slowaes = buildPythonPackage rec { + name = "slowaes-${version}"; + version = "0.1a1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/slowaes/${name}.tar.gz"; + sha256 = "83658ae54cc116b96f7fdb12fdd0efac3a4e8c7c7064e3fac3f4a881aa54bf09"; + }; + + disabled = isPy3k; + + meta = { + homepage = "http://code.google.com/p/slowaes/"; + description = "AES implemented in pure python"; + license = with licenses; [ asl20 ]; + }; + }; + snowballstemmer = buildPythonPackage rec { name = "snowballstemmer-1.2.0"; @@ -16868,6 +17321,27 @@ in modules // { }; }; + tilestache = self.buildPythonPackage rec { + name = "tilestache-${version}"; + version = "1.50.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/T/TileStache/TileStache-${version}.tar.gz"; + sha256 = "1z1j35pz77lhhjdn69sq5rmz62b5m444507d8zjnp0in5xqaj6rj"; + }; + + disabled = !isPy27; + + propagatedBuildInputs = with self; + [ modestmaps pillow pycairo python-mapnik simplejson werkzeug ]; + + meta = { + description = "A tile server for rendered geographic data"; + homepage = http://tilestache.org; + license = licenses.bsd3; + }; + }; + timelib = buildPythonPackage rec { name = "timelib-0.2.4"; @@ -16899,12 +17373,12 @@ in modules // { }; sympy = buildPythonPackage rec { - name = "sympy-0.7.6"; + name = "sympy-0.7.6.1"; disabled = isPy34 || isPy35 || isPyPy; # some tests fail src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sympy/${name}.tar.gz"; - sha256 = "19yp0gy4i7p4g6l3b8vaqkj9qj7yqb5kqy0qgbdagpzgkdz958yz"; + sha256 = "1fc272b51091aabe7d07f1bf9f0a47f3e28657fb2bec52bf3ef0e8f159f5f564"; }; buildInputs = [ pkgs.glibcLocales ]; @@ -19038,11 +19512,11 @@ in modules // { werkzeug = buildPythonPackage rec { - name = "Werkzeug-0.9.6"; + name = "Werkzeug-0.10.4"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/W/Werkzeug/${name}.tar.gz"; - md5 = "f7afcadc03b0f2267bdc156c34586043"; + sha256 = "9d2771e4c89be127bc4bac056ab7ceaf0e0064c723d6b6e195739c3af4fd5c1d"; }; propagatedBuildInputs = with self; [ itsdangerous ]; @@ -19056,7 +19530,25 @@ in modules // { }; }; + wheel = buildPythonPackage rec { + name = "wheel-${version}"; + version = "0.26.0"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/wheel/${name}.tar.gz"; + sha256 = "eaad353805c180a47545a256e6508835b65a8e830ba1093ed8162f19a50a530c"; + }; + + buildInputs = with self; [ pytest pytestcov coverage ]; + + propagatedBuildInputs = with self; [ jsonschema ]; + + meta = { + description = "A built-package format for Python"; + license = with licenses; [ mit ]; + homepage = https://bitbucket.org/pypa/wheel/; + }; + }; willie = buildPythonPackage rec { name = "willie-5.2.0"; @@ -20394,6 +20886,26 @@ in modules // { }; + BlinkStick = buildPythonPackage rec { + name = "BlinkStick-${version}"; + version = "1.1.8"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/B/BlinkStick/${name}.tar.gz"; + sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408"; + }; + + propagatedBuildInputs = with self; [ pyusb ]; + + meta = { + description = "Python package to control BlinkStick USB devices"; + homepage = http://pypi.python.org/pypi/BlinkStick/; + license = licenses.bsd3; + maintainers = with maintainers; [ np ]; + }; + }; + + usbtmc = buildPythonPackage rec { name = "usbtmc-${version}"; version = "0.6"; @@ -21457,7 +21969,6 @@ in modules // { basemap = buildPythonPackage rec { name = "basemap-1.0.7"; - disabled = ! isPy27; src = pkgs.fetchurl { url = "mirror://sourceforge/project/matplotlib/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz"; @@ -21641,6 +22152,8 @@ in modules // { sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|" tests/test_streams.py sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|" tests/test_streams.py sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|" tests/test_streams.py + sed -i -e "s|test_read_pty_output|skip_test_read_pty_output|" tests/test_events.py + sed -i -e "s|test_write_pty|skip_test_write_pty|" tests/test_events.py sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|" tests/test_streams.py sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py @@ -21886,6 +22399,11 @@ in modules // { md5 = "fa13f3fee67c83016a1242982a7c8bda"; }; + patchPhase = '' + # Hardcode cairo library path + sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb}/lib/" + ,' -i xcffib/__init__.py + ''; + propagatedBuildInputs = [ self.cffi self.six ]; meta = { @@ -22116,6 +22634,27 @@ in modules // { }; }; + xmpppy = buildPythonPackage rec { + name = "xmpp.py-${version}"; + version = "0.5.0rc1"; + + src = pkgs.fetchurl { + url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz"; + sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si"; + }; + + preInstall = '' + mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out) + export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out) + ''; + + disabled = isPy3k; + + meta = { + description = "XMPP python library"; + }; + }; + xstatic-bootbox = buildPythonPackage rec { name = "XStatic-Bootbox-${version}"; version = "4.3.0.1"; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 4978c2e41b0..60a3a8da76c 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -96,7 +96,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; lynx = linux; lzma = linux; man = linux; - manpages = linux; + man-pages = linux; mc = all; mcabber = linux; mcron = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 435438d0ea6..d0c5faf823a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -130,7 +130,7 @@ let lynx = linux; lzma = linux; man = linux; - manpages = linux; + man-pages = linux; maxima = linux; mc = linux; mcabber = linux; @@ -160,7 +160,6 @@ let pmccabe = linux; ppl = all; procps = linux; - pthreadmanpages = linux; pygtk = linux; python = allBut cygwin; pythonFull = linux; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 907196d3dbe..9fee03b701e 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2015-11-01"; - rev = "a0534d1729e07f2bc3fe936342e33ce380dd0735"; + version = "2015-12-10"; + rev = "22d6577ebaf063f121fb8dc7dd3b53b73a75f453"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "0r8kn7ci9r6s6rb4h3qd8xiyl59llwv39db7s42j35fg7z8wbxk0"; + sha256 = "10hqb8pwi5bcxc96ddijjswxjv8yqh54w7r3x1xsz2i7160z8gs6"; }; in