diff --git a/doc/erlang-users-guide.xml b/doc/erlang-users-guide.xml index 778d6e709b1..074ae50b1c0 100644 --- a/doc/erlang-users-guide.xml +++ b/doc/erlang-users-guide.xml @@ -3,6 +3,23 @@ xml:id="users-guide-to-the-erlang-infrastructure"> User's Guide to the Erlang Infrastructure +
+ Build Tools + + By default Rebar3 wants to manage it's own dependencies. In the + normal non-Nix, this is perfectly acceptable. In the Nix world it + is not. To support this we have created two versions of rebar3, + rebar3 and rebar3-open. The + rebar3 version has been patched to remove the + ability to download anything from it. If you are not running it a + nix-shell or a nix-build then its probably not going to work for + you. rebar3-open is the normal, un-modified + rebar3. It should work exactly as would any other version of + rebar3. Any Erlang package should rely on + rebar3 and thats really what you should be + using too. + +
How to install Erlang packages diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 6bb1002a4c6..f8d9acb2fb0 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -224,6 +224,63 @@ genericBuild + + Variables affecting build properties + + + enableParallelBuilding + If set, stdenv will pass specific + flags to make and other build tools to enable + parallel building with up to build-cores + workers. + + + + preferLocalBuild + If set, specifies that the package is so lightweight + in terms of build operations (e.g. write a text file from a Nix string + to the store) that there's no need to look for it in binary caches -- + it's faster to just build it locally. It also tells Hydra and other + facilities that this package doesn't need to be exported in binary + caches (noone would use it, after all). + + + + + + Special variables + + + passthru + This is an attribute set which can be filled with arbitrary + values. For example: + + +passthru = { + foo = "bar"; + baz = { + value1 = 4; + value2 = 5; + }; +} + + + + + Values inside it are not passed to the builder, so you can change + them without triggering a rebuild. However, they can be accessed outside of a + derivation directly, as if they were set inside a derivation itself, e.g. + hello.baz.value1. We don't specify any usage or + schema of passthru - it is meant for values that would be + useful outside the derivation in other parts of a Nix expression (e.g. in other + derivations). An example would be to convey some specific dependency of your + derivation which contains a program with plugins support. Later, others who + make derivations with plugins can use passed-through dependency to ensure that + their plugin would be binary-compatible with built program. + + + +
@@ -1186,6 +1243,14 @@ echo @foo@ environment variable. + + Autoconf + The autoreconfHook derivation adds + autoreconfPhase, which runs autoreconf, libtoolize and + automake, essentially preparing the configure script in autotools-based + builds. + + libxml2 Adds every file named diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 3d7e2be1553..def1c4a22d9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -7,6 +7,7 @@ so it's easy to ping a package @maintainer. */ + aaronschif = "Aaron Schif "; a1russell = "Adam Russell "; abaldeau = "Andreas Baldeau "; abbradar = "Nikolay Amiantov "; @@ -65,6 +66,7 @@ chattered = "Phil Scott "; christopherpoole = "Christopher Mark Poole "; coconnor = "Corey O'Connor "; + codsl = "codsl "; codyopel = "Cody Opel "; copumpkin = "Dan Peebles "; coroa = "Jonas Hörsch "; @@ -288,6 +290,7 @@ smironov = "Sergey Mironov "; spacefrogg = "Michael Raitza "; spencerjanssen = "Spencer Janssen "; + spinus = "Tomasz Czyż "; sprock = "Roger Mason "; spwhitt = "Spencer Whitt "; stephenmw = "Stephen Weinberg "; @@ -338,6 +341,7 @@ zagy = "Christian Zagrodnick "; zef = "Zef Hemel "; zimbatm = "zimbatm "; + zohl = "Al Zohali "; zoomulator = "Kim Simmons "; Gonzih = "Max Gonzih "; } diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 40362fbbb23..63174205927 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -65,6 +65,14 @@ account named alice: $ useradd -m alice +To make all nix tools available to this new user use `su - USER` which +opens a login shell (==shell that loads the profile) for given user. +This will create the ~/.nix-defexpr symlink. So run: + + +$ su - alice -c "true" + + The flag causes the creation of a home directory for the new user, which is generally what you want. The user does not have an initial password and therefore cannot log in. A password can diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index a699e74e5f6..971e586f20b 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -107,12 +107,12 @@ the file system. This module declares two options that can be defined by other modules (typically the user’s configuration.nix): (whether the database should -be updated) and (when the +be updated) and (when the update should be done). It implements its functionality by defining two options declared by other modules: (the set of all systemd services) -and (the list of -commands to be executed periodically by cron). +and (the list of commands to be +executed periodically by systemd). NixOS Module for the “locate” Service @@ -120,53 +120,59 @@ commands to be executed periodically by cron). with lib; -let locatedb = "/var/cache/locatedb"; in - -{ - options = { - - services.locate = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - If enabled, NixOS will periodically update the database of - files used by the locate command. - ''; - }; - - period = mkOption { - type = types.str; - default = "15 02 * * *"; - description = '' - This option defines (in the format used by cron) when the - locate database is updated. The default is to update at - 02:15 at night every day. - ''; - }; - +let + cfg = config.services.locate; +in { + options.services.locate = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, NixOS will periodically update the database of + files used by the locate command. + ''; }; + interval = mkOption { + type = types.str; + default = "02:15"; + example = "hourly"; + description = '' + Update the locate database at this interval. Updates by + default at 2:15 AM every day. + + The format is described in + systemd.time + 7. + ''; + }; + + # Other options omitted for documentation }; config = { - systemd.services.update-locatedb = { description = "Update Locate Database"; path = [ pkgs.su ]; script = '' - mkdir -m 0755 -p $(dirname ${locatedb}) - exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /run' + mkdir -m 0755 -p $(dirname ${toString cfg.output}) + exec updatedb \ + --localuser=${cfg.localuser} \ + ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ + --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} ''; }; - services.cron.systemCronJobs = optional config.services.locate.enable - "${config.services.locate.period} root ${config.systemd.package}/bin/systemctl start update-locatedb.service"; - + systemd.timers.update-locatedb = mkIf cfg.enable + { description = "Update timer for locate database"; + partOf = [ "update-locatedb.service" ]; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = cfg.interval; + }; }; -} +} + diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index ffe8171171a..092c2a788ed 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -146,6 +146,15 @@ nginx.override { + + Data directory for Postfix MTA server is moved from + /var/postfix to /var/lib/postfix. + Old configurations are migrated automatically. service.postfix + module has also received many improvements, such as correct directories' access + rights, new aliasFiles and mapFiles + options and more. + + CUPS, installed by services.printing module, now has its data directory in /var/lib/cups. Old @@ -178,6 +187,11 @@ nginx.override { nix-shell (without installing anything). + + ejabberd module is brought back and now works on + NixOS. + + diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 293a42d38b5..ca498ca499e 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -39,6 +39,17 @@ in ''; }; + networking.dnsExtensionMechanism = lib.mkOption { + type = types.bool; + default = false; + description = '' + Enable the edns0 option in resolv.conf. With + that option set, glibc supports use of the extension mechanisms for + DNS (EDNS) specified in RFC 2671. The most popular user of that feature is DNSSEC, + which does not work without it. + ''; + }; + networking.extraResolvconfConf = lib.mkOption { type = types.lines; default = ""; @@ -162,7 +173,10 @@ in libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null' '' + optionalString cfg.dnsSingleRequest '' # only send one DNS request at a time - resolv_conf_options='single-request' + resolv_conf_options+=' single-request' + '' + optionalString cfg.dnsExtensionMechanism '' + # enable extension mechanisms for DNS + resolv_conf_options+=' edns0' '' + optionalString hasLocalResolver '' # This hosts runs a full-blown DNS resolver. name_servers='127.0.0.1' diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index c590c4cde3f..2284eba07a2 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -148,7 +148,7 @@ sub pciCheck { $device eq "0x4331" || $device eq "0x43a0" || $device eq "0x43b1" ) ) { - push @modulePackages, "\${config.boot.kernelPackages.broadcom_sta}"; + push @modulePackages, "config.boot.kernelPackages.broadcom_sta"; push @kernelModules, "wl"; } @@ -422,13 +422,20 @@ EOF # Generate the hardware configuration file. -sub toNixExpr { +sub toNixStringList { my $res = ""; foreach my $s (@_) { $res .= " \"$s\""; } return $res; } +sub toNixList { + my $res = ""; + foreach my $s (@_) { + $res .= " $s"; + } + return $res; +} sub multiLineList { my $indent = shift; @@ -444,9 +451,9 @@ sub multiLineList { return $res; } -my $initrdAvailableKernelModules = toNixExpr(uniq @initrdAvailableKernelModules); -my $kernelModules = toNixExpr(uniq @kernelModules); -my $modulePackages = toNixExpr(uniq @modulePackages); +my $initrdAvailableKernelModules = toNixStringList(uniq @initrdAvailableKernelModules); +my $kernelModules = toNixStringList(uniq @kernelModules); +my $modulePackages = toNixList(uniq @modulePackages); my $fsAndSwap = ""; if (!$noFilesystems) { diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 6792690b4c3..105d1cd1625 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -19,6 +19,8 @@ rollback= upgrade= repair= profile=/nix/var/nix/profiles/system +buildHost= +targetHost= while [ "$#" -gt 0 ]; do i="$1"; shift 1 @@ -73,6 +75,14 @@ while [ "$#" -gt 0 ]; do fi shift 1 ;; + --build-host|h) + buildHost="$1" + shift 1 + ;; + --target-host|t) + targetHost="$1" + shift 1 + ;; *) echo "$0: unknown option \`$i'" exit 1 @@ -80,6 +90,90 @@ while [ "$#" -gt 0 ]; do esac done + +if [ -z "$buildHost" -a -n "$targetHost" ]; then + buildHost="$targetHost" +fi +if [ "$targetHost" = localhost ]; then + targetHost= +fi +if [ "$buildHost" = localhost ]; then + buildHost= +fi + +buildHostCmd() { + if [ -z "$buildHost" ]; then + "$@" + elif [ -n "$remoteNix" ]; then + ssh $SSHOPTS "$buildHost" PATH="$remoteNix:$PATH" "$@" + else + ssh $SSHOPTS "$buildHost" "$@" + fi +} + +targetHostCmd() { + if [ -z "$targetHost" ]; then + "$@" + else + ssh $SSHOPTS "$targetHost" "$@" + fi +} + +copyToTarget() { + if ! [ "$targetHost" = "$buildHost" ]; then + if [ -z "$targetHost" ]; then + NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --from "$buildHost" "$1" + elif [ -z "$buildHost" ]; then + NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$targetHost" "$1" + else + buildHostCmd nix-copy-closure --to "$targetHost" "$1" + fi + fi +} + +nixBuild() { + if [ -z "$buildHost" ]; then + nix-build "$@" + else + local instArgs=() + local buildArgs=() + + while [ "$#" -gt 0 ]; do + local i="$1"; shift 1 + case "$i" in + -o) + local out="$1"; shift 1 + buildArgs+=("--add-root" "$out" "--indirect") + ;; + -A) + local j="$1"; shift 1 + instArgs+=("$i" "$j") + ;; + -I) + # We don't want this in buildArgs + shift 1 + ;; + "<"*) # nix paths + instArgs+=("$i") + ;; + *) + buildArgs+=("$i") + ;; + esac + done + + local drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")" + if [ -a "$drv" ]; then + NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$buildHost" "$drv" + buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" + else + echo "nix-instantiate failed" + exit 1 + fi + fi +} + + if [ -z "$action" ]; then showSyntax; fi # Only run shell scripts from the Nixpkgs tree if the action is @@ -128,7 +222,16 @@ fi tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX) -trap 'rm -rf "$tmpDir"' EXIT +SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60" + +cleanup() { + for ctrl in "$tmpDir"/ssh-*; do + ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true + done + rm -rf "$tmpDir" +} +trap cleanup EXIT + # If the Nix daemon is running, then use it. This allows us to use @@ -150,30 +253,56 @@ if [ -n "$rollback" -o "$action" = dry-build ]; then buildNix= fi +prebuiltNix() { + machine="$1" + if [ "$machine" = x86_64 ]; then + return /nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10 + elif [[ "$machine" =~ i.86 ]]; then + return /nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10 + else + echo "$0: unsupported platform" + exit 1 + fi +} + +remotePATH= + if [ -n "$buildNix" ]; then echo "building Nix..." >&2 - if ! nix-build '' -A config.nix.package -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then - if ! nix-build '' -A nixFallback -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then - if ! nix-build '' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then - machine="$(uname -m)" - if [ "$machine" = x86_64 ]; then - nixStorePath=/nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10 - elif [[ "$machine" =~ i.86 ]]; then - nixStorePath=/nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10 - else - echo "$0: unsupported platform" - exit 1 - fi + nixDrv= + if ! nixDrv="$(nix-instantiate '' --add-root $tmpDir/nix.drv --indirect -A config.nix.package "${extraBuildFlags[@]}")"; then + if ! nixDrv="$(nix-instantiate '' --add-root $tmpDir/nix.drv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then + if ! nixDrv="$(nix-instantiate '' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then + nixStorePath="$(prebuiltNix "$(uname -m)")" if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \ --option extra-binary-caches https://cache.nixos.org/; then echo "warning: don't know how to get latest Nix" >&2 fi # Older version of nix-store -r don't support --add-root. [ -e $tmpDir/nix ] || ln -sf $nixStorePath $tmpDir/nix + if [ -n "$buildHost" ]; then + remoteNixStorePath="$(prebuiltNix "$(buildHostCmd uname -m)")" + remoteNix="$remoteNixStorePath/bin" + if ! buildHostCmd nix-store -r $remoteNixStorePath \ + --option extra-binary-caches https://cache.nixos.org/ >/dev/null; then + remoteNix= + echo "warning: don't know how to get latest Nix" >&2 + fi + fi fi fi fi - PATH=$tmpDir/nix/bin:$PATH + if [ -a "$nixDrv" ]; then + nix-store -r "$nixDrv"'!'"out" --add-root $tmpDir/nix --indirect >/dev/null + if [ -n "$buildHost" ]; then + nix-copy-closure --to "$buildHost" "$nixDrv" + # The nix build produces multiple outputs, we add them all to the remote path + for p in $(buildHostCmd nix-store -r "$(readlink "$nixDrv")" "${buildArgs[@]}"); do + remoteNix="$remoteNix${remoteNix:+:}$p/bin" + done + fi + fi + PATH="$tmpDir/nix/bin:$PATH" fi @@ -200,31 +329,35 @@ fi if [ -z "$rollback" ]; then echo "building the system configuration..." >&2 if [ "$action" = switch -o "$action" = boot ]; then - nix-env "${extraBuildFlags[@]}" -p "$profile" -f '' --set -A system - pathToConfig="$profile" + pathToConfig="$(nixBuild '' -A system "${extraBuildFlags[@]}")" + copyToTarget "$pathToConfig" + targetHostCmd nix-env -p "$profile" --set "$pathToConfig" elif [ "$action" = test -o "$action" = build -o "$action" = dry-build -o "$action" = dry-activate ]; then - nix-build '' -A system -k "${extraBuildFlags[@]}" > /dev/null - pathToConfig=./result + pathToConfig="$(nixBuild '' -A system -k "${extraBuildFlags[@]}")" elif [ "$action" = build-vm ]; then - nix-build '' -A vm -k "${extraBuildFlags[@]}" > /dev/null - pathToConfig=./result + pathToConfig="$(nixBuild '' -A vm -k "${extraBuildFlags[@]}")" elif [ "$action" = build-vm-with-bootloader ]; then - nix-build '' -A vmWithBootLoader -k "${extraBuildFlags[@]}" > /dev/null - pathToConfig=./result + pathToConfig="$(nixBuild '' -A vmWithBootLoader -k "${extraBuildFlags[@]}")" else showSyntax fi + # Copy build to target host if we haven't already done it + if ! [ "$action" = switch -o "$action" = boot ]; then + copyToTarget "$pathToConfig" + fi else # [ -n "$rollback" ] if [ "$action" = switch -o "$action" = boot ]; then - nix-env --rollback -p "$profile" + targetHostCmd nix-env --rollback -p "$profile" pathToConfig="$profile" elif [ "$action" = test -o "$action" = build ]; then systemNumber=$( - nix-env -p "$profile" --list-generations | + targetHostCmd nix-env -p "$profile" --list-generations | sed -n '/current/ {g; p;}; s/ *\([0-9]*\).*/\1/; h' ) - ln -sT "$profile"-${systemNumber}-link ./result - pathToConfig=./result + pathToConfig="$profile"-${systemNumber}-link + if [ -z "$targetHost" ]; then + ln -sT "$pathToConfig" ./result + fi else showSyntax fi @@ -234,7 +367,7 @@ fi # If we're not just building, then make the new configuration the boot # default and/or activate it now. if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = dry-activate ]; then - if ! $pathToConfig/bin/switch-to-configuration "$action"; then + if ! targetHostCmd $pathToConfig/bin/switch-to-configuration "$action"; then echo "warning: error(s) occurred while switching to the new configuration" >&2 exit 1 fi diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 4f9c8d4e5ba..318b81ca07c 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -1,76 +1,74 @@ -{ config, lib, pkgs, ... }: +{ config, options, lib, pkgs, ... }: with lib; let cfg = config.services.locate; in { - - ###### interface - - options = { - - services.locate = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - If enabled, NixOS will periodically update the database of - files used by the locate command. - ''; - }; - - period = mkOption { - type = types.str; - default = "15 02 * * *"; - description = '' - This option defines (in the format used by cron) when the - locate database is updated. - The default is to update at 02:15 at night every day. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = [ ]; - description = '' - Extra flags to pass to updatedb. - ''; - }; - - output = mkOption { - type = types.path; - default = "/var/cache/locatedb"; - description = '' - The database file to build. - ''; - }; - - localuser = mkOption { - type = types.str; - default = "nobody"; - description = '' - The user to search non-network directories as, using - su. - ''; - }; - - includeStore = mkOption { - type = types.bool; - default = false; - description = '' - Whether to include /nix/store in the locate database. - ''; - }; - + options.services.locate = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, NixOS will periodically update the database of + files used by the locate command. + ''; }; + interval = mkOption { + type = types.str; + default = "02:15"; + example = "hourly"; + description = '' + Update the locate database at this interval. Updates by + default at 2:15 AM every day. + + The format is described in + systemd.time + 7. + ''; + }; + + # This is no longer supported, but we keep it to give a better warning below + period = mkOption { visible = false; }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + Extra flags to pass to updatedb. + ''; + }; + + output = mkOption { + type = types.path; + default = "/var/cache/locatedb"; + description = '' + The database file to build. + ''; + }; + + localuser = mkOption { + type = types.str; + default = "nobody"; + description = '' + The user to search non-network directories as, using + su. + ''; + }; + + includeStore = mkOption { + type = types.bool; + default = false; + description = '' + Whether to include /nix/store in the locate database. + ''; + }; }; - ###### implementation - config = { + warnings = let opt = options.services.locate.period; in optional opt.isDefined "The `period` definition in ${showFiles opt.files} has been removed; please replace it with `interval`, using the new systemd.time interval specifier."; + systemd.services.update-locatedb = { description = "Update Locate Database"; path = [ pkgs.su ]; @@ -84,11 +82,18 @@ in { ''; serviceConfig.Nice = 19; serviceConfig.IOSchedulingClass = "idle"; + serviceConfig.PrivateTmp = "yes"; + serviceConfig.PrivateNetwork = "yes"; + serviceConfig.NoNewPrivileges = "yes"; + serviceConfig.ReadOnlyDirectories = "/"; + serviceConfig.ReadWriteDirectories = cfg.output; }; - services.cron.systemCronJobs = optional config.services.locate.enable - "${config.services.locate.period} root ${config.systemd.package}/bin/systemctl start update-locatedb.service"; - + systemd.timers.update-locatedb = mkIf cfg.enable + { description = "Update timer for locate database"; + partOf = [ "update-locatedb.service" ]; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = cfg.interval; + }; }; - } diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 36bdcaca47a..11e8b26c75e 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -9,16 +9,10 @@ let baseDir = "/run/dovecot2"; stateDir = "/var/lib/dovecot"; - protocols = concatStrings [ - (optionalString cfg.enableImap "imap") - (optionalString cfg.enablePop3 "pop3") - (optionalString cfg.enableLmtp "lmtp") - ]; - dovecotConf = concatStrings [ '' base_dir = ${baseDir} - protocols = ${protocols} + protocols = ${concatStringsSep " " cfg.protocols} '' (if isNull cfg.sslServerCert then '' @@ -33,6 +27,8 @@ let '' default_internal_user = ${cfg.user} + ${optionalString (cfg.mailUser != null) "mail_uid = ${cfg.mailUser}"} + ${optionalString (cfg.mailGroup != null) "mail_gid = ${cfg.mailGroup}"} mail_location = ${cfg.mailLocation} @@ -57,11 +53,17 @@ let } '') + (optionalString (cfg.sieveScripts != {}) '' + plugin { + ${concatStringsSep "\n" (mapAttrsToList (to: from: "sieve_${to} = ${stateDir}/sieve/${to}") cfg.sieveScripts)} + } + '') + cfg.extraConfig ]; modulesDir = pkgs.symlinkJoin "dovecot-modules" - (map (module: "${module}/lib/dovecot") cfg.modules); + (map (pkg: "${pkg}/lib/dovecot") ([ dovecotPkg ] ++ map (module: module.override { dovecot = dovecotPkg; }) cfg.modules)); in { @@ -87,6 +89,12 @@ in description = "Start the LMTP listener (when Dovecot is enabled)."; }; + protocols = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "Additional listeners to start when Dovecot is enabled."; + }; + package = mkOption { type = types.package; default = pkgs.dovecot22; @@ -129,13 +137,25 @@ in ''; }; + mailUser = mkOption { + type = types.nullOr types.str; + default = null; + description = "Default user to store mail for virtual users."; + }; + + mailGroup = mkOption { + type = types.nullOr types.str; + default = null; + description = "Default group to store mail for virtual users."; + }; + modules = mkOption { type = types.listOf types.package; default = []; example = literalExample "[ pkgs.dovecot_pigeonhole ]"; description = '' Symlinks the contents of lib/dovecot of every given package into - /var/lib/dovecot/modules. This will make the given modules available + /etc/dovecot/modules. This will make the given modules available if a dovecot package with the module_dir patch applied (like pkgs.dovecot22, the default) is being used. ''; @@ -162,7 +182,13 @@ in enablePAM = mkOption { type = types.bool; default = true; - description = "Wether to create a own Dovecot PAM service and configure PAM user logins."; + description = "Whether to create a own Dovecot PAM service and configure PAM user logins."; + }; + + sieveScripts = mkOption { + type = types.attrsOf types.path; + default = {}; + description = "Sieve scripts to be executed. Key is a sequence, e.g. 'before2', 'after' etc."; }; showPAMFailure = mkOption { @@ -177,23 +203,31 @@ in security.pam.services.dovecot2 = mkIf cfg.enablePAM {}; + services.dovecot2.protocols = + optional cfg.enableImap "imap" + ++ optional cfg.enablePop3 "pop3" + ++ optional cfg.enableLmtp "lmtp"; + users.extraUsers = [ - { name = cfg.user; - uid = config.ids.uids.dovecot2; - description = "Dovecot user"; - group = cfg.group; - } { name = "dovenull"; uid = config.ids.uids.dovenull2; description = "Dovecot user for untrusted logins"; group = cfg.group; } - ]; + ] ++ optional (cfg.user == "dovecot2") + { name = "dovecot2"; + uid = config.ids.uids.dovecot2; + description = "Dovecot user"; + group = cfg.group; + }; - users.extraGroups = singleton { - name = cfg.group; - gid = config.ids.gids.dovecot2; - }; + users.extraGroups = optional (cfg.group == "dovecot2") + { name = "dovecot2"; + gid = config.ids.gids.dovecot2; + }; + + environment.etc."dovecot/modules".source = modulesDir; + environment.etc."dovecot/dovecot.conf".source = cfg.configFile; systemd.services.dovecot2 = { description = "Dovecot IMAP/POP3 server"; @@ -201,26 +235,38 @@ in after = [ "keys.target" "network.target" ]; wants = [ "keys.target" ]; wantedBy = [ "multi-user.target" ]; - - preStart = '' - mkdir -p "${baseDir}/login" - chown -R ${cfg.user}:${cfg.group} "${baseDir}" - rm -f "${stateDir}/modules" - ln -s "${modulesDir}" "${stateDir}/modules" - ''; + restartTriggers = [ cfg.configFile ]; serviceConfig = { - ExecStart = "${dovecotPkg}/sbin/dovecot -F -c ${cfg.configFile}"; + ExecStart = "${dovecotPkg}/sbin/dovecot -F"; + ExecReload = "${dovecotPkg}/sbin/doveadm reload"; Restart = "on-failure"; RestartSec = "1s"; StartLimitInterval = "1min"; + RuntimeDirectory = [ "dovecot2" ]; }; + + preStart = '' + rm -rf ${stateDir}/sieve + '' + optionalString (cfg.sieveScripts != {}) '' + mkdir -p ${stateDir}/sieve + ${concatStringsSep "\n" (mapAttrsToList (to: from: '' + if [ -d '${from}' ]; then + mkdir '${stateDir}/sieve/${to}' + cp ${from}/*.sieve '${stateDir}/sieve/${to}' + else + cp '${from}' '${stateDir}/sieve/${to}' + fi + ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}' + '') cfg.sieveScripts)} + chown -R '${cfg.mailUser}:${cfg.mailGroup}' '${stateDir}/sieve' + ''; }; environment.systemPackages = [ dovecotPkg ]; assertions = [ - { assertion = cfg.enablePop3 || cfg.enableImap; + { assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != []; message = "dovecot needs at least one of the IMAP or POP3 listeners enabled"; } { assertion = isNull cfg.sslServerCert == isNull cfg.sslServerKey diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 6c5d7e92702..f2d8189de6e 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -20,6 +20,23 @@ let mail_owner = ${user} default_privs = nobody + # NixOS specific locations + data_directory = /var/lib/postfix/data + queue_directory = /var/lib/postfix/queue + + # Default location of everything in package + meta_directory = ${pkgs.postfix}/etc/postfix + command_directory = ${pkgs.postfix}/bin + sample_directory = /etc/postfix + newaliases_path = ${pkgs.postfix}/bin/newaliases + mailq_path = ${pkgs.postfix}/bin/mailq + readme_directory = no + sendmail_path = ${pkgs.postfix}/bin/sendmail + daemon_directory = ${pkgs.postfix}/libexec/postfix + manpage_directory = ${pkgs.postfix}/share/man + html_directory = ${pkgs.postfix}/share/postfix/doc/html + shlib_directory = no + '' + optionalString config.networking.enableIPv6 '' inet_protocols = all @@ -435,31 +452,35 @@ in mkdir -p /var/lib mv /var/postfix /var/lib/postfix fi - mkdir -p /var/lib/postfix/data /var/lib/postfix/queue/{pid,public,maildrop} - chown -R ${user}:${group} /var/lib/postfix - chown root /var/lib/postfix/queue - chown root /var/lib/postfix/queue/pid - chgrp -R ${setgidGroup} /var/lib/postfix/queue/{public,maildrop} - chmod 770 /var/lib/postfix/queue/{public,maildrop} + # All permissions set according ${pkgs.postfix}/etc/postfix/postfix-files script + mkdir -p /var/lib/postfix /var/lib/postfix/queue/{pid,public,maildrop} + chmod 0755 /var/lib/postfix + chown root:root /var/lib/postfix rm -rf /var/lib/postfix/conf mkdir -p /var/lib/postfix/conf + chmod 0755 /var/lib/postfix/conf + ln -sf ${pkgs.postfix}/etc/postfix/postfix-files ln -sf ${mainCfFile} /var/lib/postfix/conf/main.cf ln -sf ${masterCfFile} /var/lib/postfix/conf/master.cf + ${concatStringsSep "\n" (mapAttrsToList (to: from: '' ln -sf ${from} /var/lib/postfix/conf/${to} - postalias /var/lib/postfix/conf/${to} + ${pkgs.postfix}/bin/postalias /var/lib/postfix/conf/${to} '') cfg.aliasFiles)} ${concatStringsSep "\n" (mapAttrsToList (to: from: '' ln -sf ${from} /var/lib/postfix/conf/${to} - postmap /var/lib/postfix/conf/${to} + ${pkgs.postfix}/bin/postmap /var/lib/postfix/conf/${to} '') cfg.mapFiles)} mkdir -p /var/spool/mail chown root:root /var/spool/mail chmod a+rwxt /var/spool/mail ln -sf /var/spool/mail /var/ + + #Finally delegate to postfix checking remain directories in /var/lib/postfix and set permissions on them + ${pkgs.postfix}/bin/postfix set-permissions config_directory=/var/lib/postfix/conf ''; }; } diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index 1927922909e..d0e9b839e75 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -6,7 +6,6 @@ let cfg = config.services.ihaskell; ihaskell = pkgs.ihaskell.override { - inherit (cfg.haskellPackages) ihaskell ghcWithPackages; packages = self: cfg.extraPackages self; }; @@ -22,7 +21,6 @@ in }; haskellPackages = mkOption { - type = types.attrsOf types.package; default = pkgs.haskellPackages; defaultText = "pkgs.haskellPackages"; example = literalExample "pkgs.haskell.packages.ghc784"; diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index 46273fc1218..51d38e8db4d 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -129,17 +129,19 @@ in { description = "bosun metrics collector (part of Bosun)"; wantedBy = [ "multi-user.target" ]; - preStart = - '' - mkdir -p `dirname ${cfg.stateFile}`; - touch ${cfg.stateFile} - touch ${cfg.stateFile}.tmp + preStart = '' + mkdir -p "$(dirname "${cfg.stateFile}")"; + touch "${cfg.stateFile}" + touch "${cfg.stateFile}.tmp" + + mkdir -p "${cfg.ledisDir}"; if [ "$(id -u)" = 0 ]; then - chown ${cfg.user}:${cfg.group} ${cfg.stateFile} - chown ${cfg.user}:${cfg.group} ${cfg.stateFile}.tmp + chown ${cfg.user}:${cfg.group} "${cfg.stateFile}" + chown ${cfg.user}:${cfg.group} "${cfg.stateFile}.tmp" + chown ${cfg.user}:${cfg.group} "${cfg.ledisDir}" fi - ''; + ''; serviceConfig = { PermissionsStartOnly = true; diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix index 3a5d9bd63c7..bc975159cdf 100644 --- a/nixos/modules/services/networking/gale.nix +++ b/nixos/modules/services/networking/gale.nix @@ -76,7 +76,7 @@ in system.activationScripts.gale = mkIf cfg.enable ( stringAfter [ "users" "groups" ] '' - chmod -R 755 ${home} + chmod 755 ${home} mkdir -m 0777 -p ${home}/auth/cache mkdir -m 1777 -p ${home}/auth/local # GALE_DOMAIN.gpub mkdir -m 0700 -p ${home}/auth/private # ROOT.gpub @@ -86,7 +86,8 @@ in mkdir -m 0700 -p ${home}/.gale/auth/private # GALE_DOMAIN.gpri ln -sf ${pkgs.gale}/etc/gale/auth/trusted/ROOT "${home}/auth/trusted/ROOT" - chown -R ${cfg.user}:${cfg.group} ${home} + chown ${cfg.user}:${cfg.group} ${home} ${home}/auth ${home}/auth/* + chown ${cfg.user}:${cfg.group} ${home}/.gale ${home}/.gale/auth ${home}/.gale/auth/private '' ); @@ -149,10 +150,9 @@ in after = [ "network.target" ]; preStart = '' - install -m 0640 ${keyPath}/${cfg.domain}.gpri "${home}/.gale/auth/private/" - install -m 0644 ${gpubFile} "${home}/.gale/auth/private/${cfg.domain}.gpub" - install -m 0644 ${gpubFile} "${home}/auth/local/${cfg.domain}.gpub" - chown -R ${cfg.user}:${cfg.group} ${home} + install -m 0640 -o ${cfg.user} -g ${cfg.group} ${keyPath}/${cfg.domain}.gpri "${home}/.gale/auth/private/" + install -m 0644 -o ${cfg.user} -g ${cfg.group} ${gpubFile} "${home}/.gale/auth/private/${cfg.domain}.gpub" + install -m 0644 -o ${cfg.user} -g ${cfg.group} ${gpubFile} "${home}/auth/local/${cfg.domain}.gpub" ''; serviceConfig = { diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix index a421b32f02c..5e49efc3aa3 100644 --- a/nixos/modules/services/networking/softether.nix +++ b/nixos/modules/services/networking/softether.nix @@ -61,11 +61,14 @@ in dataDir = cfg.dataDir; })) ]; - systemd.services.softether = { - description = "SoftEther VPN services initial job"; - after = [ "network-interfaces.target" ]; - wantedBy = [ "multi-user.target" ]; - preStart = '' + systemd.services."softether-init" = { + description = "SoftEther VPN services initial task"; + wantedBy = [ "network-interfaces.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = false; + }; + script = '' for d in vpnserver vpnbridge vpnclient vpncmd; do if ! test -e ${cfg.dataDir}/$d; then ${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d @@ -81,12 +84,12 @@ in (mkIf (cfg.vpnserver.enable) { systemd.services.vpnserver = { description = "SoftEther VPN Server"; - after = [ "network-interfaces.target" ]; - wantedBy = [ "multi-user.target" ]; + after = [ "softether-init.service" ]; + wantedBy = [ "network-interfaces.target" ]; serviceConfig = { + Type = "forking"; ExecStart = "${pkg}/bin/vpnserver start"; ExecStop = "${pkg}/bin/vpnserver stop"; - Type = "forking"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnserver/vpnserver @@ -101,12 +104,12 @@ in (mkIf (cfg.vpnbridge.enable) { systemd.services.vpnbridge = { description = "SoftEther VPN Bridge"; - after = [ "network-interfaces.target" ]; - wantedBy = [ "multi-user.target" ]; + after = [ "softether-init.service" ]; + wantedBy = [ "network-interfaces.target" ]; serviceConfig = { + Type = "forking"; ExecStart = "${pkg}/bin/vpnbridge start"; ExecStop = "${pkg}/bin/vpnbridge stop"; - Type = "forking"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge @@ -121,12 +124,12 @@ in (mkIf (cfg.vpnclient.enable) { systemd.services.vpnclient = { description = "SoftEther VPN Client"; - after = [ "network-interfaces.target" ]; - wantedBy = [ "multi-user.target" ]; + after = [ "softether-init.service" ]; + wantedBy = [ "network-interfaces.target" ]; serviceConfig = { + Type = "forking"; ExecStart = "${pkg}/bin/vpnclient start"; ExecStop = "${pkg}/bin/vpnclient stop"; - Type = "forking"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnclient/vpnclient diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index ea0cf1dcd78..356cfd409ad 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -128,6 +128,7 @@ in { description = "Elasticsearch Daemon"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; + path = [ pkgs.inetutils ]; environment = { ES_HOME = cfg.dataDir; }; serviceConfig = { ExecStart = "${cfg.package}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}"; @@ -139,8 +140,7 @@ in { if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi # Install plugins - rm ${cfg.dataDir}/plugins || true - ln -s ${esPlugins}/plugins ${cfg.dataDir}/plugins + ln -sfT ${esPlugins}/plugins ${cfg.dataDir}/plugins ''; postStart = mkBefore '' until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix index 5f8916bbf9a..b20d6096803 100644 --- a/nixos/modules/services/system/uptimed.nix +++ b/nixos/modules/services/system/uptimed.nix @@ -1,66 +1,55 @@ -{pkgs, config, lib, ...}: +{ config, lib, pkgs, ... }: + +with lib; let - - inherit (lib) mkOption mkIf singleton; - - inherit (pkgs) uptimed; - + cfg = config.services.uptimed; stateDir = "/var/spool/uptimed"; - - uptimedUser = "uptimed"; - in - { - - ###### interface - options = { - services.uptimed = { - enable = mkOption { default = false; description = '' - Uptimed allows you to track your highest uptimes. + Enable uptimed, allowing you to track + your highest uptimes. ''; }; - }; - }; - - ###### implementation - - config = mkIf config.services.uptimed.enable { - - environment.systemPackages = [ uptimed ]; - - users.extraUsers = singleton - { name = uptimedUser; - uid = config.ids.uids.uptimed; - description = "Uptimed daemon user"; - home = stateDir; - }; + config = mkIf cfg.enable { + users.extraUsers.uptimed = { + description = "Uptimed daemon user"; + home = stateDir; + createHome = true; + uid = config.ids.uids.uptimed; + }; systemd.services.uptimed = { - description = "Uptimed daemon"; - wantedBy = [ "multi-user.target" ]; + unitConfig.Documentation = "man:uptimed(8) man:uprecords(1)"; + description = "uptimed service"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Restart = "on-failure"; + User = "uptimed"; + Nice = 19; + IOSchedulingClass = "idle"; + PrivateTmp = "yes"; + PrivateNetwork = "yes"; + NoNewPrivileges = "yes"; + ReadWriteDirectories = stateDir; + InaccessibleDirectories = "/home"; + ExecStart = "${pkgs.uptimed}/sbin/uptimed -f -p ${stateDir}/pid"; + }; preStart = '' - mkdir -m 0755 -p ${stateDir} - chown ${uptimedUser} ${stateDir} - if ! test -f ${stateDir}/bootid ; then - ${uptimed}/sbin/uptimed -b + ${pkgs.uptimed}/sbin/uptimed -b fi ''; - - script = "${uptimed}/sbin/uptimed"; }; - }; - } diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix index 0d5816e363d..d43dacb1be6 100644 --- a/nixos/modules/services/x11/window-managers/i3.nix +++ b/nixos/modules/services/x11/window-managers/i3.nix @@ -34,6 +34,6 @@ in ''; }]; }; - environment.systemPackages = [ pkgs.i3 ]; + environment.systemPackages = with pkgs; [ i3 i3status dmenu ]; }; } diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 02b3e25a313..d78ec0d7bf3 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -94,6 +94,18 @@ in }; + environment.usrbinenv = mkOption { + default = "${pkgs.coreutils}/bin/env"; + example = literalExample '' + "''${pkgs.busybox}/bin/env" + ''; + type = types.nullOr types.path; + visible = false; + description = '' + The env(1) executable that is linked system-wide to + /usr/bin/env. + ''; + }; }; @@ -128,11 +140,15 @@ in mkdir -m 0555 -p /var/empty ''; - system.activationScripts.usrbinenv = - '' + system.activationScripts.usrbinenv = if config.environment.usrbinenv != null + then '' mkdir -m 0755 -p /usr/bin - ln -sfn ${pkgs.coreutils}/bin/env /usr/bin/.env.tmp + ln -sfn ${config.environment.usrbinenv} /usr/bin/.env.tmp mv /usr/bin/.env.tmp /usr/bin/env # atomically replace /usr/bin/env + '' + else '' + rm -f /usr/bin/env + rmdir --ignore-fail-on-non-empty /usr/bin /usr ''; system.activationScripts.tmpfs = diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 34eea9af83b..ab748550026 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -93,11 +93,13 @@ let checkNetwork = checkUnitConfig "Network" [ (assertOnlyFields [ - "Description" "DHCP" "DHCPServer" "IPv4LL" "IPv4LLRoute" + "Description" "DHCP" "DHCPServer" "IPForward" "IPMasquerade" "IPv4LL" "IPv4LLRoute" "LLMNR" "Domains" "Bridge" "Bond" ]) (assertValueOneOf "DHCP" ["both" "none" "v4" "v6"]) (assertValueOneOf "DHCPServer" boolValues) + (assertValueOneOf "IPForward" ["yes" "no" "ipv4" "ipv6"]) + (assertValueOneOf "IPMasquerade" boolValues) (assertValueOneOf "IPv4LL" boolValues) (assertValueOneOf "IPv4LLRoute" boolValues) (assertValueOneOf "LLMNR" boolValues) @@ -129,6 +131,16 @@ let (assertValueOneOf "RequestBroadcast" boolValues) ]; + checkDhcpServer = checkUnitConfig "DHCPServer" [ + (assertOnlyFields [ + "PoolOffset" "PoolSize" "DefaultLeaseTimeSec" "MaxLeaseTimeSec" + "EmitDNS" "DNS" "EmitNTP" "NTP" "EmitTimezone" "Timezone" + ]) + (assertValueOneOf "EmitDNS" boolValues) + (assertValueOneOf "EmitNTP" boolValues) + (assertValueOneOf "EmitTimezone" boolValues) + ]; + commonNetworkOptions = { enable = mkOption { @@ -341,6 +353,18 @@ let ''; }; + dhcpServerConfig = mkOption { + default = {}; + example = { PoolOffset = 50; EmitDNS = false; }; + type = types.addCheck (types.attrsOf unitOption) checkDhcpServer; + description = '' + Each attribute in this set specifies an option in the + [DHCPServer] section of the unit. See + systemd.network + 5 for details. + ''; + }; + name = mkOption { type = types.nullOr types.str; default = null; @@ -565,6 +589,11 @@ let [DHCP] ${attrsToSection def.dhcpConfig} + ''} + ${optionalString (def.dhcpServerConfig != { }) '' + [DHCPServer] + ${attrsToSection def.dhcpServerConfig} + ''} ${flip concatMapStrings def.addresses (x: '' [Address] diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 211e0423216..c5ee95f4c9a 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -61,6 +61,8 @@ let "systemd-user-sessions.service" "dbus-org.freedesktop.login1.service" "dbus-org.freedesktop.machine1.service" + "org.freedesktop.login1.busname" + "org.freedesktop.machine1.busname" "user@.service" # Journal. @@ -147,10 +149,14 @@ let "systemd-tmpfiles-setup-dev.service" # Misc. + "org.freedesktop.systemd1.busname" "systemd-sysctl.service" "dbus-org.freedesktop.timedate1.service" "dbus-org.freedesktop.locale1.service" "dbus-org.freedesktop.hostname1.service" + "org.freedesktop.timedate1.busname" + "org.freedesktop.locale1.busname" + "org.freedesktop.hostname1.busname" "systemd-timedated.service" "systemd-localed.service" "systemd-hostnamed.service" diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl old mode 100644 new mode 100755 index 004385f728c..eda57a9751e --- a/nixos/modules/virtualisation/nixos-container.pl +++ b/nixos/modules/virtualisation/nixos-container.pl @@ -97,10 +97,10 @@ if ($action eq "create") { if ($ensureUniqueName) { my $base = $containerName; for (my $nr = 0; ; $nr++) { - $containerName = "$base-$nr"; $confFile = "/etc/containers/$containerName.conf"; $root = "/var/lib/containers/$containerName"; last unless -e $confFile || -e $root; + $containerName = "$base-$nr"; } } diff --git a/nixos/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix index f356445abe4..c2837d0e2e2 100644 --- a/nixos/modules/virtualisation/nova.nix +++ b/nixos/modules/virtualisation/nova.nix @@ -146,7 +146,7 @@ in path = [ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm - pkgs.e2fsprogs pkgs.utillinux pkgs.multipath_tools pkgs.iproute + pkgs.e2fsprogs pkgs.utillinux pkgs.multipath-tools pkgs.iproute pkgs.bridge-utils ]; diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix index 7b4d46e0749..c4c5cb3380e 100644 --- a/nixos/modules/virtualisation/rkt.nix +++ b/nixos/modules/virtualisation/rkt.nix @@ -58,5 +58,7 @@ in ExecStart = "${pkgs.rkt}/bin/rkt gc ${cfg.gc.options}"; }; }; + + users.extraGroups.rkt = {}; }; } diff --git a/nixos/release.nix b/nixos/release.nix index 8a502ae2baa..9c15b1ea074 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -230,6 +230,7 @@ in rec { #tests.gitlab = callTest tests/gitlab.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {}; + tests.grsecurity = callTest tests/grsecurity.nix {}; tests.i3wm = callTest tests/i3wm.nix {}; tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test); tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test); @@ -287,6 +288,7 @@ in rec { tests.openssh = callTest tests/openssh.nix {}; tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; + tests.postgresql = callTest tests/postgresql.nix {}; tests.printing = callTest tests/printing.nix {}; tests.proxy = callTest tests/proxy.nix {}; tests.pumpio = callTest tests/pump.io.nix {}; diff --git a/nixos/tests/grsecurity.nix b/nixos/tests/grsecurity.nix new file mode 100644 index 00000000000..14f1aa9ff88 --- /dev/null +++ b/nixos/tests/grsecurity.nix @@ -0,0 +1,19 @@ +# Basic test to make sure grsecurity works + +import ./make-test.nix ({ pkgs, ...} : { + name = "grsecurity"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ copumpkin ]; + }; + + machine = { config, pkgs, ... }: + { boot.kernelPackages = pkgs.linuxPackages_grsec_testing_server; }; + + testScript = + '' + $machine->succeed("uname -a") =~ /grsec/; + # FIXME: this seems to hang the whole test. Unclear why, but let's fix it + # $machine->succeed("${pkgs.paxtest}/bin/paxtest blackhat"); + ''; +}) + diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix new file mode 100644 index 00000000000..f17384b44ba --- /dev/null +++ b/nixos/tests/postgresql.nix @@ -0,0 +1,26 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "postgresql"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ zagy ]; + }; + + nodes = { + master = + { pkgs, config, ... }: + + { + services.postgresql.enable = true; + services.postgresql.initialScript = pkgs.writeText "postgresql-init.sql" + '' + CREATE ROLE postgres WITH superuser login createdb; + ''; + }; + }; + + testScript = '' + startAll; + $master->waitForUnit("postgresql"); + $master->sleep(10); # Hopefully this is long enough!! + $master->succeed("echo 'select 1' | sudo -u postgres psql"); + ''; +}) diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index 8e80992d7ca..a75de090033 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,13 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "3.22.02"; + version = "3.23.07"; pname = "fldigi"; name = "${pname}-${version}"; src = fetchurl { - url = "http://www.w1hkj.com/downloads/${pname}/${name}.tar.gz"; - sha256 = "1gry3r133j2x99h0ji56v6yjxzvbi0hb18p1lbkr9djzjvf591j3"; + url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + sha256 = "0v78sk9bllxw640wxd4q2qy0h8z2j1d077nxhmpkjpf6mn6vwcda"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem program"; - homepage = http://www.w1hkj.com/Fldigi.html; + homepage = http://sourceforge.net/projects/fldigi/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ relrod ]; + maintainers = with stdenv.lib.maintainers; [ relrod ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index e3422d4ba06..d7cdfcf0d08 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, scons, pkgconfig, qt4, portaudio, portmidi, libusb1 -, libmad, protobuf, libvorbis, taglib, libid3tag, flac, libsndfile, libshout -, fftw, vampSDK +{ stdenv, fetchurl, chromaprint, fftw, flac, libid3tag, libmad +, libopus, libshout, libsndfile, libusb1, libvorbis, pkgconfig +, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite +, taglib, vampSDK }: stdenv.mkDerivation rec { name = "mixxx-${version}"; - version = "1.11.0"; + version = "2.0.0"; src = fetchurl { url = "http://downloads.mixxx.org/${name}/${name}-src.tar.gz"; - sha256 = "0c833gf4169xvpfn7car9vzvwfwl9d3xwmbfsy36cv8ydifip5h0"; + sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71"; }; buildInputs = [ - scons pkgconfig qt4 portaudio portmidi libusb1 libmad protobuf libvorbis - taglib libid3tag flac libsndfile libshout fftw vampSDK + chromaprint fftw flac libid3tag libmad libopus libshout libsndfile + libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4 + rubberband scons sqlite taglib vampSDK ]; sconsFlags = [ @@ -22,10 +24,6 @@ stdenv.mkDerivation rec { "qtdir=${qt4}" ]; - postPatch = '' - sed -i -e 's/"which /"type -P /' build/depends.py - ''; - buildPhase = '' runHook preBuild mkdir -p "$out" @@ -41,11 +39,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = { - homepage = "http://mixxx.org/"; + meta = with stdenv.lib; { + homepage = http://mixxx.org; description = "Digital DJ mixing software"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.aszlig ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.aszlig maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 91fc9d6f3fc..ae53008d58c 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -1,27 +1,30 @@ -{ stdenv, fetchurl, pythonPackages, pygobject, gst_python -, gst_plugins_good, gst_plugins_base, gst_plugins_ugly +{ stdenv, fetchurl, pythonPackages, pygobject, gst_python, wrapGAppsHook +, glib_networking, gst_plugins_good, gst_plugins_base, gst_plugins_ugly }: pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; - sha256 = "1xfyg8xqgnrb98wx7a4fzr4vlzkffjhkc1s36ka63rwmx86vqhyw"; + sha256 = "1vn4knpmnp3krmn627iv1r7xa50zl816ac6b24b8ph50cq2sqjfv"; }; + buildInputs = [ + wrapGAppsHook gst_plugins_base gst_plugins_good gst_plugins_ugly glib_networking + ]; + propagatedBuildInputs = with pythonPackages; [ - gst_python pygobject pykka tornado requests2 gst_plugins_base gst_plugins_good gst_plugins_ugly + gst_python pygobject pykka tornado requests2 ]; # There are no tests doCheck = false; - postInstall = '' - wrapProgram $out/bin/mopidy \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + preFixup = '' + gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") ''; meta = with stdenv.lib; { @@ -31,7 +34,7 @@ pythonPackages.buildPythonPackage rec { SoundCloud, Google Play Music, and more ''; license = licenses.asl20; - maintainers = [ maintainers.rickynils ]; + maintainers = with maintainers; [ rickynils fpletz ]; hydraPlatforms = []; }; } diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 70cde4b0c70..488fe45e6c8 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.7"; + version = "0.7.2"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "0xzz0g9whqjcjaaqmsw5ph1zvpi2j5v3i5k73g7916rca3q4z4jh"; + sha256 = "0fq9nk796cp7gs0gwrabb6wp7f5h7pph10hrkrik1wf4k3mzb4k3"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix new file mode 100644 index 00000000000..558c9fa3de5 --- /dev/null +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -0,0 +1,54 @@ +{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jre, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }: + +{ name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: + +stdenv.mkDerivation rec { + inherit name src; + + desktopItem = makeDesktopItem { + name = "Eclipse"; + exec = "eclipse"; + icon = "eclipse"; + comment = "Integrated Development Environment"; + desktopName = "Eclipse IDE"; + genericName = "Integrated Development Environment"; + categories = "Application;Development;"; + }; + + buildInputs = [ makeWrapper ]; + + buildCommand = '' + # Unpack tarball. + mkdir -p $out + tar xfvz $src -C $out + + # Patch binaries. + interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2) + libCairo=$out/eclipse/libcairo-swt.so + patchelf --set-interpreter $interpreter $out/eclipse/eclipse + [ -f $libCairo ] && patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $libCairo + + # Create wrapper script. Pass -configuration to store + # settings in ~/.eclipse/org.eclipse.platform_ rather + # than ~/.eclipse/org.eclipse.platform__. + productId=$(sed 's/id=//; t; d' $out/eclipse/.eclipseproduct) + productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct) + + makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ + --prefix PATH : ${jre}/bin \ + --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \ + --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" + + # Create desktop item. + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + mkdir -p $out/share/pixmaps + ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm + ''; # */ + + meta = { + homepage = http://www.eclipse.org/; + inherit description; + }; + +} diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 7d543c4ed55..75736356fb2 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -4,67 +4,13 @@ , webkitgtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage -}: +} @ args: assert stdenv ? glibc; -let +rec { - buildEclipse = - { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: - - stdenv.mkDerivation rec { - inherit name src; - - desktopItem = makeDesktopItem { - name = "Eclipse"; - exec = "eclipse"; - icon = "eclipse"; - comment = "Integrated Development Environment"; - desktopName = "Eclipse IDE"; - genericName = "Integrated Development Environment"; - categories = "Application;Development;"; - }; - - buildInputs = [ makeWrapper ]; - - buildCommand = '' - # Unpack tarball. - mkdir -p $out - tar xfvz $src -C $out - - # Patch binaries. - interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2) - libCairo=$out/eclipse/libcairo-swt.so - patchelf --set-interpreter $interpreter $out/eclipse/eclipse - [ -f $libCairo ] && patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $libCairo - - # Create wrapper script. Pass -configuration to store - # settings in ~/.eclipse/org.eclipse.platform_ rather - # than ~/.eclipse/org.eclipse.platform__. - productId=$(sed 's/id=//; t; d' $out/eclipse/.eclipseproduct) - productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct) - - makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ - --prefix PATH : ${jre}/bin \ - --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \ - --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" - - # Create desktop item. - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - mkdir -p $out/share/pixmaps - ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm - ''; # */ - - meta = { - homepage = http://www.eclipse.org/; - inherit description; - }; - - }; - -in { + buildEclipse = import ./build-eclipse.nix args; eclipse_sdk_35 = buildEclipse { name = "eclipse-sdk-3.5.2"; @@ -312,7 +258,6 @@ in { "x86_64-linux" = fetchurl { url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk-x86_64.tar.gz; sha256 = "0g00alsixfaakmn4khr0m9fxvkrbhbg6qqfa27xr6a9np6gzg98l"; - }; "i686-linux" = fetchurl { url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk.tar.gz; @@ -328,7 +273,6 @@ in { "x86_64-linux" = fetchurl { url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk-x86_64.tar.gz; sha256 = "0vfql4gh263ms8bg7sgn05gnjajplx304cn3nr03jlacgr3pkarf"; - }; "i686-linux" = fetchurl { url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk.tar.gz; @@ -337,22 +281,53 @@ in { }; }; - eclipse-platform = buildEclipse { + eclipse_sdk_451 = buildEclipse { + name = "eclipse-sdk-4.5.1"; + description = "Eclipse Mars Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-SDK-4.5.1-linux-gtk-x86_64.tar.gz; + sha256 = "b56503ab4b86f54e1cdc93084ef8c32fb1eaabc6f6dad9ef636153b14c928e02"; + }; + "i686-linux" = fetchurl { + url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-SDK-4.5.1-linux-gtk.tar.gz; + sha256 = "f2e41da52e138276f8f121fd4d57c3f98839817836b56f8424e99b63c9b1b025"; + }; + }; + }; + + eclipse-platform = eclipse-platform-451; + + eclipse-platform-45 = buildEclipse { name = "eclipse-platform-4.5"; description = "Eclipse platform"; sources = { "x86_64-linux" = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk-x86_64.tar.gz"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk-x86_64.tar.gz; sha256 = "1510j41yr86pbzwf48kjjdd46nkpkh8zwn0hna0cqvsw1gk2vqcg"; - }; "i686-linux" = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk.tar.gz"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk.tar.gz; sha256 = "1f97jd3qbi3830y3djk8bhwzd9whsq8gzfdk996chxc55prn0qbd"; }; }; }; + eclipse-platform-451 = buildEclipse { + name = "eclipse-platform-4.5.1"; + description = "Eclipse platform"; + sources = { + "x86_64-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-platform-4.5.1-linux-gtk-x86_64.tar.gz; + sha256 = "1m7bzyi20yss6cz74d7hvhxj1cddcpgzxjia5wcjycsvq33kkny0"; + }; + "i686-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-platform-4.5.1-linux-gtk.tar.gz; + sha256 = "17x8w4k0rba0c0v9ghxdl0zqfadla5c1aakfd5k0q9q3x3qi6rxp"; + }; + }; + }; + eclipseWithPlugins = { eclipse, plugins ? [], jvmArgs ? [] }: let # Gather up the desired plugins. @@ -369,21 +344,20 @@ in { dropinProp = "-D${dropinPropName}=${pluginEnv}/eclipse/dropins"; jvmArgsText = stdenv.lib.concatStringsSep "\n" (jvmArgs ++ [dropinProp]); - # Prepare an eclipse.ini with the plugin directory. - origEclipseIni = builtins.readFile "${eclipse}/eclipse/eclipse.ini"; - eclipseIniFile = writeText "eclipse.ini" '' - ${origEclipseIni} - ${jvmArgsText} - ''; - # Base the derivation name on the name of the underlying # Eclipse. name = (stdenv.lib.meta.appendToName "with-plugins" eclipse).name; in runCommand name { buildInputs = [ makeWrapper ]; } '' - mkdir -p $out/bin + mkdir -p $out/bin $out/etc + + # Prepare an eclipse.ini with the plugin directory. + cat ${eclipse}/eclipse/eclipse.ini - > $out/etc/eclipse.ini </dev/null` -+ checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '-L%s -lpython2.5 %s' % (distutils.sysconfig.get_config_var('LIBDIR'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null` - if test "$?" -gt "0"; then - with_python="no" - else diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 6bffa834ae0..97607e81951 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "openimageio-${version}"; - version = "1.4.16"; + version = "1.6.9"; src = fetchurl { url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip"; - sha256 = "0f9gspsjhniz992c04dm4lvffzz7zjqn1n34nqn6c32r498kimcj"; + sha256 = "0942xj877875f4dpfg7aqwyw015y82vkhaqap7yhybmvzsfj7wki"; }; buildInputs = [ diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index c96b0c182a6..9d68a44821a 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1"; }; - buildInputs = [ cmake makeWrapper qtbase qttools exiv2 graphicsmagick ]; + buildInputs = [ + cmake makeWrapper qtbase qtquickcontrols qttools exiv2 graphicsmagick + ]; preConfigure = '' export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick" diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index e98774a4368..b597250098f 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, avahi, libusb1, libv4l, net_snmp +, avahi, libjpeg, libusb1, libv4l, net_snmp , gettext, pkgconfig # List of { src name backend } attibute sets - see installFirmware below: @@ -50,6 +50,9 @@ stdenv.mkDerivation { mkdir -p $out/etc/udev/rules.d/ ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \ cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules + + substituteInPlace $out/lib/libsane.la \ + --replace "-ljpeg" "-L${libjpeg}/lib -ljpeg" '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware); meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix index 1b1ccf4e589..bb5e787ede6 100644 --- a/pkgs/applications/graphics/sane/backends/git.nix +++ b/pkgs/applications/graphics/sane/backends/git.nix @@ -1,10 +1,10 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // { - version = "2016-01-09"; + version = "2016-01-25"; src = fetchgit { - sha256 = "440f88a4126841cfd139b17902ceb940bbf189defe21b208e93bfd474cfb16e8"; - rev = "f78e85cad666492fadd5612af77fa7c84e270a12"; + sha256 = "db1fecd671bd8b3a777138bb4815285b4364ee3ad01ab05424b4aa0c20ed9919"; + rev = "056f590f2d147099554d97a89dd5e0ddfa8d6dda"; url = "git://alioth.debian.org/git/sane/sane-backends.git"; }; }) diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/polkit-install.patch b/pkgs/applications/kde-apps-15.12/kdelibs/polkit-install.patch deleted file mode 100644 index d2ecac663ec..00000000000 --- a/pkgs/applications/kde-apps-15.12/kdelibs/polkit-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake ---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200 -+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200 -@@ -139,7 +139,7 @@ - ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR - ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) - -- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING -+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING - "Where policy files generated by KAuth will be installed" FORCE) - elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") - set (KAUTH_COMPILING_FAKE_BACKEND TRUE) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix new file mode 100644 index 00000000000..b6c0feede6c --- /dev/null +++ b/pkgs/applications/misc/albert/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, qtbase, qtx11extras, makeQtWrapper, muparser, cmake }: + +stdenv.mkDerivation rec { + name = "albert-${version}"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "manuelschneid3r"; + repo = "albert"; + rev = "v${version}"; + sha256 = "0lzj1gbcc5sp2x1c0d3s21y55kcnnn4dmy8d205mrgnyavjrak7n"; + }; + + buildInputs = [ cmake qtbase qtx11extras muparser makeQtWrapper ]; + + fixupPhase = '' + wrapQtProgram $out/bin/albert + ''; + + meta = { + homepage = https://github.com/manuelSchneid3r/albert; + description = "Desktop agnostic launcher"; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.ericsagnes ]; + }; +} diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix index fc8d0ec36c8..51a48db34e9 100644 --- a/pkgs/applications/misc/direwolf/default.nix +++ b/pkgs/applications/misc/direwolf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, alsaLib }: +{ stdenv, fetchFromGitHub, unzip, alsaLib }: let version = "1.2"; in @@ -6,9 +6,11 @@ stdenv.mkDerivation rec { name = "direwolf-${version}"; inherit version; - src = fetchurl { - url = "http://home.comcast.net/~wb2osz/Version%201.2/direwolf-${version}-src.zip"; - sha256 = "0csl6harx7gmjmamxy0ylzhbamppphffisk8j33dc6g08k6rc77f"; + src = fetchFromGitHub { + owner = "wb2osz"; + repo = "direwolf"; + rev = "8b81a32"; + sha256 = "0r4fgdxghh292bzhqshr7zl5cg2lfsvlgmy4d5vqcli7x6qa1gcs"; }; buildInputs = [ diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 08fad5a021d..488a9a3732e 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,23 +1,28 @@ {stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, vlc, rtmpdump}: buildPerlPackage { - name = "get_iplayer-2.86"; + name = "get_iplayer-2.94"; buildInputs = [makeWrapper perl]; - propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP]; + propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP XMLSimple]; preConfigure = "touch Makefile.PL"; doCheck = false; + patchPhase = '' + sed -e 's|^update_script|#update_script|' \ + -e '/WARNING.*updater/d' \ + -i get_iplayer + ''; + installPhase = '' mkdir -p $out/bin cp get_iplayer $out/bin - sed -i 's|^update_script|#update_script|' $out/bin/get_iplayer wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB ''; src = fetchurl { - url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.86.tar.gz; - sha256 = "0zhcw0ikxrrz1jayx7jjgxmdf7gzk4pmzfvpraxmv64xwzgc1sc1"; + url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.94.tar.gz; + sha256 = "16p0bw879fl8cs6rp37g1hgrcai771z6rcqk2nvm49kk39dx1zi4"; }; } diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix new file mode 100644 index 00000000000..4f6733e7d8d --- /dev/null +++ b/pkgs/applications/misc/guake/default.nix @@ -0,0 +1,77 @@ +/* Beware! +After starting Guake it will give the error message "Guake can not init! Gconf Error. Have you installed guake.schemas properly?", +which will have to be resolved manually, because I have not found a way to automate this, without being impure. + +If you have Guake installed, you can use `nix-build -A gnome3.guake` to get the path to the build directory in the nix store, +which then can be used in the following command to install the schemas file of Guake: +gconftool-2 --install-schema-file /path/returned/by/nix-build/share/gconf/schemas/guake.schemas + +It can be removed again by the following command: +gconftool-2 --recursive-unset /apps/guake +*/ +{ stdenv, fetchurl, lib +, pkgconfig, libtool, intltool, makeWrapper +, dbus, gtk2, gconf, python2, python2Packages, libutempter, vte, keybinder, gnome2, gnome3 }: + +with lib; + +let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_common ]; + pySubDir = "lib/${python2.libPrefix}/site-packages"; + pyPath = makeSearchPath pySubDir (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); + in stdenv.mkDerivation rec { + name = "guake-${version}"; + version = "0.8.3"; + + src = fetchurl { + url = "https://github.com/Guake/guake/archive/${version}.tar.gz"; + sha256 = "1lbmdz3i9a97840h8239s360hd37nmhy3hs6kancxbzl1512ak1y"; + }; + + nativeBuildInputs = [ pkgconfig libtool intltool makeWrapper ]; + + buildInputs = inputs ++ (with python2Packages; [ pyGtkGlade pyxdg ]); + + patchPhase = '' + patchShebangs . + ''; + + configureScript = "./autogen.sh"; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--disable-schemas-install" + ]; + + installFlags = [ + # Configuring the installation to not install gconf schemas is not always supported, + # therefore gconftool-2 has this variable, which will make gconftool-2 not update any of the databases. + "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" + ]; + + postInstall = '' + mkdir -p $out/share/gconf/schemas + cp data/guake.schemas $out/share/gconf/schemas + ''; + + postFixup = '' + for bin in $out/bin/{guake,guake-prefs}; do + substituteInPlace $bin \ + --replace '/usr/bin/env python2' ${python2}/bin/python2 + wrapProgram $bin \ + --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix LD_LIBRARY_PATH : ${makeLibraryPath inputs} \ + --prefix PYTHONPATH : "$out/${pySubDir}:${pyPath}:$PYTHONPATH" + done + ''; + + meta = { + description = "Drop-down terminal for GNOME"; + homepage = http://guake-project.org; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.msteen ]; + }; +} diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix new file mode 100644 index 00000000000..6a111d48cee --- /dev/null +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc }: + +assert stdenv.isLinux; + +stdenv.mkDerivation rec { + name = "IPMIView-${version}"; + version = "20151223"; + + src = fetchurl { + url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_V2.11.0_bundleJRE_Linux_x64_${version}.tar.gz"; + sha256 = "1rv9j0id7i2ipm25n60bpfdm1gj44xg2aj8rnx4s6id3ln90q121"; + }; + + buildInputs = [ patchelf makeWrapper ]; + + buildPhase = with xorg; '' + patchelf --set-rpath "${libX11}/lib:${libXext}/lib:${libXrender}/lib:${libXtst}/lib:${libXi}/lib" ./jre/lib/amd64/xawt/libmawt.so + patchelf --set-rpath "${gcc.cc}/lib" ./libiKVM64.so + patchelf --set-rpath "${libXcursor}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${libXtst}/lib:${libXi}/lib" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws + patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java + ''; + + installPhase = '' + mkdir -p $out/bin + cp -R . $out/ + echo "$out/jre/bin/java -jar $out/IPMIView20.jar" > $out/bin/IPMIView + chmod +x $out/bin/IPMIView + ''; + + meta = with stdenv.lib; { + license = licenses.unfree; + }; + } + diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index ffde422c18b..bf1b77534ce 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -8,17 +8,17 @@ let in stdenv.mkDerivation rec { name = "kdbplus-${version}"; - version = "3.2"; + version = "3.3"; src = requireFile { message = '' Nix can't download kdb+ for you automatically. Go to http://kx.com and download the free, 32-bit version for Linux. Then run "nix-prefetch-url file:///linux.zip" in the - directory where you saved it. Note you need version 3.2. + directory where you saved it. Note you need version 3.3. ''; name = "linux.zip"; - sha256 = "0ah1kfvxnrck1kg8j7rpzgj6amji62zbm4ya6q55l54gm3qq6q0r"; + sha256 = "5fd0837599e24f0f437a8314510888a86ab0787684120a8fcf592299800aa940"; }; dontStrip = true; diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix new file mode 100644 index 00000000000..90737a344ca --- /dev/null +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, pkgconfig, gtk2, synergy}: + +stdenv.mkDerivation rec { + name = "quicksynergy-${version}"; + version = "0.9.0"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz"; + sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix"; + }; + buildInputs = [ + pkgconfig + gtk2 + synergy + ]; + preBuild = " + sed -i 's@/usr/bin@${synergy.out}/bin@' src/synergy_config.c + "; + meta = { + description = "GUI application to share mouse and keyboard between computers"; + longDescription = " + QuickSynergy is a graphical interface (GUI) for easily configuring + Synergy2, an application that allows the user to share his mouse and + keyboard between two or more computers. + + Without the need for any external hardware, Synergy2 uses the TCP-IP + protocol to share the resources, even between machines with diferent + operating systems, such as Mac OS, Linux and Windows. + + Remember to open port 24800 (used by synergys program) if you want to + host mouse and keyboard."; + homepage = https://code.google.com/p/quicksynergy/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.spinus ]; + }; +} diff --git a/pkgs/applications/misc/scim/default.nix b/pkgs/applications/misc/scim/default.nix index 98594157211..0014784abd1 100644 --- a/pkgs/applications/misc/scim/default.nix +++ b/pkgs/applications/misc/scim/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "scim-${version}"; src = fetchurl { - url = "https://github.com/andmarti1424/scim/archive/v${version}.tar.gz"; + url = "https://github.com/andmarti1424/sc-im/archive/v${version}.tar.gz"; sha256 = "00rjz344acw0bxv78x1w9jz8snl9lb9qhr9z22phxinidnd3vaaz"; }; diff --git a/pkgs/applications/misc/slic3r/fix-no-display.patch b/pkgs/applications/misc/slic3r/fix-no-display.patch deleted file mode 100644 index b5aeca3a416..00000000000 --- a/pkgs/applications/misc/slic3r/fix-no-display.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/Build.PL b/Build.PL -index 8b21c15..fd3aff0 100644 ---- a/Build.PL -+++ b/Build.PL -@@ -33,9 +33,6 @@ my $sudo = grep { $_ eq '--sudo' } @ARGV; - my $gui = grep { $_ eq '--gui' } @ARGV; - my $xs_only = grep { $_ eq '--xs' } @ARGV; - if ($gui) { -- %prereqs = qw( -- Wx 0.9918 -- ); - %recommends = qw( - Growl::GNTP 0.15 - Wx::GLCanvas 0 -diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm -index 842ff44..ea0af64 100644 ---- a/lib/Slic3r/GUI.pm -+++ b/lib/Slic3r/GUI.pm -@@ -26,7 +26,7 @@ use Slic3r::GUI::OptionsGroup::Field; - use Slic3r::GUI::SimpleTab; - use Slic3r::GUI::Tab; - --our $have_OpenGL = eval "use Slic3r::GUI::PreviewCanvas; 1"; -+our $have_OpenGL = 0; - - use Wx 0.9901 qw(:bitmap :dialog :icon :id :misc :systemsettings :toplevelwindow - :filedialog); -diff --git a/lib/Slic3r/GUI/Plater/2DToolpaths.pm b/lib/Slic3r/GUI/Plater/2DToolpaths.pm -index 8e48a72..7bed973 100644 ---- a/lib/Slic3r/GUI/Plater/2DToolpaths.pm -+++ b/lib/Slic3r/GUI/Plater/2DToolpaths.pm -@@ -90,18 +90,20 @@ sub set_z { - package Slic3r::GUI::Plater::2DToolpaths::Canvas; - - use Wx::Event qw(EVT_PAINT EVT_SIZE EVT_ERASE_BACKGROUND EVT_IDLE EVT_MOUSEWHEEL EVT_MOUSE_EVENTS); --use OpenGL qw(:glconstants :glfunctions :glufunctions); --use base qw(Wx::GLCanvas Class::Accessor); --use Wx::GLCanvas qw(:all); - use List::Util qw(min first); - use Slic3r::Geometry qw(scale unscale epsilon); - - __PACKAGE__->mk_accessors(qw(print z layers color init dirty bb)); - --# make OpenGL::Array thread-safe --{ -- no warnings 'redefine'; -- *OpenGL::Array::CLONE_SKIP = sub { 1 }; -+if ($Slic3r::GUI::have_OpenGL) { -+ use OpenGL qw(:glconstants :glfunctions :glufunctions); -+ use Wx::GLCanvas qw(:all); -+ use base qw(Wx::GLCanvas Class::Accessor); -+ # make OpenGL::Array thread-safe -+ { -+ no warnings 'redefine'; -+ *OpenGL::Array::CLONE_SKIP = sub { 1 }; -+ } - } - - sub new { diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix new file mode 100644 index 00000000000..db0798f64cf --- /dev/null +++ b/pkgs/applications/misc/solaar/default.nix @@ -0,0 +1,43 @@ +{fetchurl, stdenv, makeWrapper, gtk3, python3Packages}: +let + version = "0.9.2"; +in +stdenv.mkDerivation { + name = "solaar-${version}"; + src = fetchurl { + sha256 = "0954grz2adggfzcj4df4mpr4d7qyl7w8rb4j2s0f9ymawl92i05j"; + url = "https://github.com/pwr/Solaar/archive/${version}.tar.gz"; + }; + + buildInputs = [gtk3 python3Packages.pygobject3 python3Packages.pyudev]; + enableParallelBuilding = true; + installPhase = '' + mkdir -p "$out"; + ''; + postInstall = '' + wrapProgram "$out/bin/solaar" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" + wrapProgram "$out/bin/solaar-cli" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" + ''; + meta = with stdenv.lib; { + description = "Linux devices manager for the Logitech Unifying Receiver"; + longDescription = '' + Solaar is a Linux device manager for Logitech’s Unifying Receiver + peripherals. It is able to pair/unpair devices to the receiver, and for + most devices read battery status. + + It comes in two flavors, command-line and GUI. Both are able to list the + devices paired to a Unifying Receiver, show detailed info for each + device, and also pair/unpair supported devices with the receiver. + + To be able to use it, make sure you have access to /dev/hidraw* files. + ''; + license = licenses.gpl2; + homepage = https://pwr.github.io/Solaar/; + platforms = platforms.linux; + maintainers = [maintainers.spinus]; + }; +} diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index ba3d3db3267..d37f2c947c9 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, vte, gtk, ncurses }: +{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses }: stdenv.mkDerivation rec { name = "termite-${version}"; @@ -10,11 +10,9 @@ stdenv.mkDerivation rec { sha256 = "107v59x8q2m1cx1x3i5ciibw4nl1qbq7p58bfw0irkhp7sl7kjk2"; }; - makeFlags = "VERSION=v${version}"; + makeFlags = [ "VERSION=v${version}" "PREFIX=$(out)" ]; - buildInputs = [pkgconfig vte gtk ncurses]; - - installFlags = "PREFIX=$(out)"; + buildInputs = [ pkgconfig vte gtk3 ncurses ]; meta = with stdenv.lib; { description = "A simple VTE-based terminal"; diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index 10b63d1db51..e48201b914c 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -3,23 +3,21 @@ let pname = "yakuake"; - version = "2.9.8"; + version = "2.9.9"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "0a9x3nmala8nl4xl3h7rcd76f5j7b7r74jc5cfbayc6jgkjdynd3"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; + sha256 = "0e0e4994c568f8091c9424e4aab35645436a9ff341c00b1cd1eab0ada0bf61ce"; }; buildInputs = [ kdelibs ]; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - patchPhase = '' - substituteInPlace app/terminal.cpp --replace \"konsolepart\" "\"${konsole}/lib/kde4/libkonsolepart.so\"" - ''; + propagatedUserEnvPkgs = [ konsole ]; meta = { homepage = http://yakuake.kde.org; diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 28d342384d7..d2d6fcb5934 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -60,7 +60,7 @@ let in stdenv.mkDerivation { - name = "firefox-bin-${version}"; + name = "firefox-bin-unwrapped-${version}"; src = fetchurl { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/emulated-version.patch b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/emulated-version.patch deleted file mode 100644 index f730ad017b1..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/emulated-version.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/common/defines.h 2012-11-14 18:02:43.000000000 +0100 -+++ b/common/defines.h 2013-09-20 19:17:45.669290630 +0200 -@@ -39,7 +39,7 @@ - #define RELEASE_TIME 1352912534 - #define IPCVERSION "10" - --#define EMULATED_VERSION "4.15.0.14" -+#define EMULATED_VERSION "4.17.0.11" // Was 4.15.0.14 - #define DNSVERSION "2" - #define STATUSDOMAIN ".status.fribid.se" - - diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/icecat3-idldir.patch b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/icecat3-idldir.patch deleted file mode 100644 index 39dbc7a3ed0..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/icecat3-idldir.patch +++ /dev/null @@ -1,16 +0,0 @@ -We have to run `xpidl', but we need to provide it with the right IDL -directory. With GNU IceCat 3 (and possibly Firefox 3), this happens to be -"$(pkg-config --variable=idldir libxul)/stable". - ---- mplayerplug-in-3.55/Makefile.in 2008-01-03 01:20:33.000000000 +0100 -+++ mplayerplug-in-3.55/Makefile.in 2008-09-29 22:47:20.000000000 +0200 -@@ -46,7 +46,7 @@ datadir=@datadir@ - LOCALEDIR=$(datadir)/locale - MOZILLA_HOME=@MOZILLA_HOME@ - GECKO_XPIDL=@GECKO_XPIDL@ --GECKO_IDLDIR=@GECKO_IDLDIR@ -+GECKO_IDLDIR=@GECKO_IDLDIR@/stable - - PIXMAPS=pixmaps/logo.xpm pixmaps/progress_left.xpm pixmaps/progress_right.xpm \ - pixmaps/progress_fill.xpm pixmaps/progress_middle.xpm - diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 1d53ea2aceb..61b02d2a639 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -2,7 +2,7 @@ , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }: -let version = "0.5.0"; in +let version = "0.5.1"; in buildPythonPackage rec { name = "qutebrowser-${version}"; @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "16cyw0jg6qg9ksr6xwgnkm1a2bwgii2s35nrgk3g705ywfsf02j7"; + sha256 = "1pxgap04rv94kgcp9a05xx2kwg3j6jv8f6d3ww7hqs2xnkj8wzqb"; }; # Needs tox diff --git a/pkgs/applications/networking/instant-messengers/freetalk/01_callbacks_const_fix.diff b/pkgs/applications/networking/instant-messengers/freetalk/01_callbacks_const_fix.diff deleted file mode 100644 index 5fe87160122..00000000000 --- a/pkgs/applications/networking/instant-messengers/freetalk/01_callbacks_const_fix.diff +++ /dev/null @@ -1,25 +0,0 @@ -Description: Patch to fix FTBFS due to a modified const in src/callbacks.cc -Forwarded: yes -Origin: Ubuntu, -https://bugs.launchpad.net/ubuntu/+source/freetalk/+bug/443241 -Bug-Debian: http://bugs.debian.org/560535 -Author: Jon Bernard ---- 3.2-1.orig/src/callbacks.cc 2008-11-15 10:41:22.000000000 +0000 -+++ 3.2-1/src/callbacks.cc 2009-10-21 15:50:49.000000000 +0100 -@@ -116,13 +116,13 @@ ft_msg_msg_handler (LmMessageHandler *ha - LmMessage *msg, gpointer user_data) - { - LmMessageNode *root, *body, *x; -- const char *from, *msg_str, *type; -- char *ts = NULL; -+ const char *msg_str, *type; -+ char *from, *ts = NULL; - - root = lm_message_get_node (msg); - body = lm_message_node_get_child (root, "body"); - -- from = lm_message_node_get_attribute (msg->node, "from"); -+ from = (char *) lm_message_node_get_attribute (msg->node, "from"); - - /* since the file-transfer happens in-band with messages, we can no longer - * ignore messages with no 'body' */ diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix deleted file mode 100644 index 33ffe87a4ff..00000000000 --- a/pkgs/applications/networking/instant-messengers/fuze/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl, dpkg, openssl, alsaLib, libXext, libXfixes, libXrandr -, libjpeg, curl, libX11, libXmu, libXv, libXtst, qt4, mesa, zlib -, gnome, libidn, rtmpdump, c-ares, openldap, makeWrapper -}: -assert stdenv.system == "x86_64-linux"; -let - curl_custom = - stdenv.lib.overrideDerivation curl (args: { - configureFlags = args.configureFlags ++ ["--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"] ; - } ); -in -stdenv.mkDerivation { - name = "fuze-1.0.5"; - src = fetchurl { - url = http://apt.fuzebox.com/apt/pool/lucid/main/f/fuzelinuxclient/fuzelinuxclient_1.0.5.lucid_amd64.deb; - sha256 = "0gvxc8qj526cigr1lif8vdn1aawj621camkc8kvps23r7zijhnqv"; - }; - buildInputs = [ dpkg makeWrapper ]; - libPath = - stdenv.lib.makeLibraryPath [ - openssl alsaLib libXext libXfixes libXrandr libjpeg curl_custom - libX11 libXmu libXv qt4 libXtst mesa stdenv.cc.cc zlib - gnome.GConf libidn rtmpdump c-ares openldap - ]; - buildCommand = '' - dpkg-deb -x $src . - mkdir -p $out/lib $out/bin - cp -R usr/lib/fuzebox $out/lib - - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $out/lib/fuzebox:$libPath \ - $out/lib/fuzebox/FuzeLinuxApp - - wrapProgram $out/lib/fuzebox/FuzeLinuxApp --prefix LD_LIBRARY_PATH : $libPath - for f in $out/lib/fuzebox/*.so.*; do - patchelf \ - --set-rpath $out/lib/fuzebox:$libPath \ - $f - done - - ln -s ${openssl}/lib/libssl.so.1.0.0 $out/lib/fuzebox/libssl.so.0.9.8 - ln -s ${openssl}/lib/libcrypto.so.1.0.0 $out/lib/fuzebox/libcrypto.so.0.9.8 - - ln -s $out/lib/fuzebox/FuzeLinuxApp $out/bin/fuze - ''; - - meta = { - description = "Internet and mobile based unified communications solutions (Linux client)"; - homepage = http://www.fuzebox.com; - license = "unknown"; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix new file mode 100644 index 00000000000..89487e5bf27 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip +, qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols +, openssl, protobuf +}: + +stdenv.mkDerivation rec { + name = "ricochet-${version}"; + version = "1.1.1"; + + src = fetchurl { + url = "https://github.com/ricochet-im/ricochet/archive/v${version}.tar.gz"; + sha256 = "0y79igzgl9xn00981zcyxdlks7vnqxhb4rq3x8gwxm0yr98p39ms"; + }; + + desktopItem = makeDesktopItem { + name = "ricochet"; + exec = "ricochet"; + icon = "ricochet"; + desktopName = "Ricochet"; + genericName = "Ricochet"; + comment = meta.description; + categories = "Office;Email;"; + }; + + buildInputs = [ + qtbase qttools qtmultimedia qtquick1 qtquickcontrols + openssl protobuf + ]; + + nativeBuildInputs = [ pkgconfig makeQtWrapper ]; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)" + ''; + + configureScript = "qmake"; + dontAddPrefix = true; + configureFlags = [ "PREFIX=$(out)" "DEFINES+=RICOCHET_NO_PORTABLE" ]; + + installPhase = '' + mkdir -p $out/bin + cp ricochet $out/bin + wrapQtProgram $out/bin/ricochet + + mkdir -p $out/share/applications + cp $desktopItem/share/applications"/"* $out/share/applications + + mkdir -p $out/share/pixmaps + cp icons/ricochet.png $out/share/pixmaps/ricochet.png + ''; + + meta = with stdenv.lib; { + description = "Anonymous peer-to-peer instant messaging"; + homepage = "https://ricochet.im"; + license = licenses.bsd3; + maintainers = [ maintainers.codsl maintainers.jgillich ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch b/pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch deleted file mode 100644 index 466194c0a8f..00000000000 --- a/pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch +++ /dev/null @@ -1,28 +0,0 @@ -Add function to replace the behaviour of server_setup_find_port which was removed from irssi on revision 5125. Fixes bug #577501. ---- a/apps/irssi/src/silc/core/client_ops.c -+++ b/apps/irssi/src/silc/core/client_ops.c -@@ -2790,6 +2790,15 @@ - silc_free(a); - } - -+/* helper function to emulate server_setup_find_port */ -+static SERVER_SETUP_REC *silc_server_setup_find_port(const char *address, -+ int port) { -+ SERVER_SETUP_REC *rec; -+ -+ rec = server_setup_find(address, port, NULL); -+ return (rec == NULL || rec->port != port) ? NULL : rec; -+} -+ - /* Find authentication data by hostname and port. The hostname may be IP - address as well.*/ - -@@ -2811,7 +2820,7 @@ - - /* Check whether we find the password for this server in our - configuration. If it's set, always send it server. */ -- setup = server_setup_find_port(hostname, port); -+ setup = silc_server_setup_find_port(hostname, port); - if (setup && setup->password) { - completion(SILC_AUTH_PASSWORD, setup->password, strlen(setup->password), - context); diff --git a/pkgs/applications/networking/irc/konversation/1.6.nix b/pkgs/applications/networking/irc/konversation/1.6.nix new file mode 100644 index 00000000000..158fe886b8b --- /dev/null +++ b/pkgs/applications/networking/irc/konversation/1.6.nix @@ -0,0 +1,84 @@ +{ stdenv +, lib +, fetchurl +, cmake +, extra-cmake-modules +, kbookmarks +, karchive +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdoctools +, kemoticons +, kglobalaccel +, ki18n +, kiconthemes +, kidletime +, kitemviews +, knotifications +, knotifyconfig +, kio +, kparts +, kwallet +, makeQtWrapper +, solid +, sonnet +, phonon}: + +let + pn = "konversation"; + v = "1.6"; +in + +stdenv.mkDerivation rec { + name = "${pn}-${v}"; + + src = fetchurl { + url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz"; + sha256 = "789fd75644bf54606778971310433dbe2bc01ac0917b34bc4e8cac88e204d5b6"; + }; + + buildInputs = [ + cmake + extra-cmake-modules + kbookmarks + karchive + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kdoctools + kemoticons + kglobalaccel + ki18n + kiconthemes + kidletime + kitemviews + knotifications + knotifyconfig + kio + kparts + kwallet + solid + sonnet + phonon + ]; + + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + makeQtWrapper + ]; + + postInstall = '' + wrapQtProgram "$out/bin/konversation" + ''; + + meta = { + description = "Integrated IRC client for KDE"; + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ fridh ]; + homepage = https://konversation.kde.org; + }; +} diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 82c1504ebd9..a781a8ceb35 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -4,12 +4,12 @@ , extraBuildInputs ? [] }: stdenv.mkDerivation rec { - version = "1.3"; + version = "1.4"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0j2ic1c69ksf78wi0cmc4yi5348x6c92g6annsx928sayxqxfgbh"; + sha256 = "1m6xq6izcac5186xvvmm8znfjzrg9hq42p69jabdvv7cri4rjvg0"; }; cmakeFlags = stdenv.lib.optional stdenv.isDarwin diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index bc5289f8093..31931aa75d9 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null); with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "3.3.1"; + version = "3.3.3"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "1li9law732n4vc7sn6i92pwxn8li7ypqaxcmfpm17kk978immlfs"; + sha256 = "0lyv230vqwb77isjqm6fwwgv8hdap88zir9yrccj0qxj7zf8p3cw"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch index 9e3e484667f..a906803e433 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch +++ b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch @@ -1,12 +1,17 @@ diff --git a/qm_gen.pri b/qm_gen.pri -index ed29b76..2d5990c 100644 +index 5454440..2d5990c 100644 --- a/qm_gen.pri +++ b/qm_gen.pri -@@ -5,7 +5,7 @@ isEmpty(QMAKE_LRELEASE) { +@@ -5,12 +5,7 @@ isEmpty(QMAKE_LRELEASE) { win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease unix { +- equals(QT_MAJOR_VERSION, 4) { - !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 } +- } +- equals(QT_MAJOR_VERSION, 5) { +- !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 } +- } + !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } } else { !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } diff --git a/pkgs/applications/networking/sync/lsyncd/configure-a2x-fix.patch b/pkgs/applications/networking/sync/lsyncd/configure-a2x-fix.patch deleted file mode 100644 index 73b47994691..00000000000 --- a/pkgs/applications/networking/sync/lsyncd/configure-a2x-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -aur lsyncd-release-2.1.5.orig/configure.ac lsyncd-release-2.1.5/configure.ac ---- lsyncd-release-2.1.5.orig/configure.ac 2013-06-07 18:24:02.000000000 +0600 -+++ lsyncd-release-2.1.5/configure.ac 2014-03-04 13:24:15.390350812 +0600 -@@ -15,10 +15,10 @@ - AC_PROG_INSTALL - AC_PROG_MAKE_SET - --#AC_PATH_PROG([A2X], [a2x], [no]) --#if test x${A2X} = xno ; then --# AC_MSG_ERROR([Program 'a2x' (package asciidoc) is required]) --#fi -+AC_PATH_PROG([A2X], [a2x], [no]) -+if test x${A2X} = xno ; then -+ AC_MSG_ERROR([Program 'a2x' (package asciidoc) is required]) -+fi - - ### - # Checks for Lua \ No newline at end of file diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix new file mode 100644 index 00000000000..b39617e02db --- /dev/null +++ b/pkgs/applications/office/ib/controller/default.nix @@ -0,0 +1,162 @@ +{ stdenv, fetchurl, unzip, jdk, ib-tws, xpra }: + +stdenv.mkDerivation rec { + version = "2.14.0"; + name = "ib-controller-${version}"; + + src = fetchurl { + url = "https://github.com/ib-controller/ib-controller/archive/${version}.tar.gz"; + sha256 = "17a8bcgg9z3b4y38k035hm2lgvhmf8srlz59c7n2q3fdw2i95i68"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + buildInputs = [ unzip jdk ib-tws ]; + + installPhase = '' + mkdir -p $out $out/bin $out/etc/ib/controller $out/share/IBController + cp resources/*.jar $out/share/IBController/. + cp resources/*.ini $out/etc/ib/controller/. + classpath="" + for jar in ${ib-tws}/share/IBJts/*.jar; do + classpath="$classpath:$jar" + done + for jar in $out/share/IBController/*.jar; do + classpath="$classpath:$jar" + done + # strings to use below; separated to avoid nix specific substitutions + javaOptions={JAVA_OPTIONS:--Xmx1024M} + ibProfileDir={IB_PROFILE_DIR:-~/IB/} + cat< $out/bin/ib-tws-c + #!$SHELL + if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then + IB_USER_PROFILE=\`realpath \$1\` + IB_USER_PROFILE_TITLE=\`basename \$1\` + else + if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then + IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\` + IB_USER_PROFILE_TITLE=\$1 + else + echo "ERROR: \"\$1\" is not a valid name of a profile." + exit 1 + fi + fi + shift + if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi + if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi + if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp ${ib-tws}/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi + if [ ! -e \$IB_USER_PROFILE/IBController.ini ]; then cp $out/etc/ib/controller/IBController.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/IBController.ini; fi + if [[ \$1 == "-q" ]]; then + if [ -f \$IB_USER_PROFILE/xpra/run ]; then + ${xpra}/bin/xpra stop \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ &> /dev/null + fi + exit 0 + fi + if [[ \$1 == "-d" ]] && [ ! -f \$IB_USER_PROFILE/xpra/run ]; then + ( sleep infinity ) & + WAIT_DUMMY_PID=\$! + ( trap "" INT; + DISPLAYNUM=100 + while [ -f /tmp/.X\$DISPLAYNUM-lock ]; do DISPLAYNUM=\$((\$DISPLAYNUM + 1)); done + mkdir -p \$IB_USER_PROFILE/xpra + cd \$IB_USER_PROFILE + nohup ${xpra}/bin/xpra start :\$DISPLAYNUM \ + --socket-dir=\$IB_USER_PROFILE/xpra/ \ + --start-child="echo -n :\$DISPLAYNUM > \$IB_USER_PROFILE/xpra/run \ + && kill \$WAIT_DUMMY_PID &> /dev/null \ + && ${jdk}/bin/java -cp $classpath \$$javaOptions ibcontroller.IBController \$IB_USER_PROFILE/IBController.ini" \ + --exit-with-children \ + --no-pulseaudio \ + --no-mdns \ + --no-notification \ + --no-daemon \ + &> \$IB_USER_PROFILE/xpra/server.log + rm -f \$IB_USER_PROFILE/xpra/run + rm -f /tmp/.X\$DISPLAYNUM-lock + ) & + wait \$WAIT_DUMMY_PID + exit 0 + fi + if [ -f \$IB_USER_PROFILE/xpra/run ]; then + ${xpra}/bin/xpra attach \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ \ + --windows \ + --no-speaker \ + --no-microphone \ + --no-tray \ + --title="\$IB_USER_PROFILE_TITLE: @title@" \ + &> \$IB_USER_PROFILE/xpra/client.log + fi + EOF + chmod u+x $out/bin/ib-tws-c + cat< $out/bin/ib-gw-c + #!$SHELL + if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then + IB_USER_PROFILE=\`realpath \$1\` + IB_USER_PROFILE_TITLE=\`basename \$1\` + else + if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then + IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\` + IB_USER_PROFILE_TITLE=\$1 + else + echo "ERROR: \"\$1\" is not a valid name of a profile." + exit 1 + fi + fi + shift + if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi + if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi + if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp ${ib-tws}/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi + if [ ! -e \$IB_USER_PROFILE/IBController.ini ]; then cp $out/etc/ib/controller/IBController.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/IBController.ini; fi + if [[ \$1 == "-q" ]]; then + if [ -f \$IB_USER_PROFILE/xpra/run ]; then + ${xpra}/bin/xpra stop \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ &> /dev/null + fi + exit 0 + fi + if [[ \$1 == "-d" ]] && [ ! -f \$IB_USER_PROFILE/xpra/run ]; then + ( sleep infinity ) & + WAIT_DUMMY_PID=\$! + ( trap "" INT; + DISPLAYNUM=100 + while [ -f /tmp/.X\$DISPLAYNUM-lock ]; do DISPLAYNUM=\$((\$DISPLAYNUM + 1)); done + mkdir -p \$IB_USER_PROFILE/xpra + cd \$IB_USER_PROFILE + nohup ${xpra}/bin/xpra start :\$DISPLAYNUM \ + --socket-dir=\$IB_USER_PROFILE/xpra/ \ + --start-child="echo -n :\$DISPLAYNUM > \$IB_USER_PROFILE/xpra/run \ + && kill \$WAIT_DUMMY_PID &> /dev/null \ + && ${jdk}/bin/java -cp $classpath \$$javaOptions ibcontroller.IBGatewayController \$IB_USER_PROFILE/IBController.ini" \ + --exit-with-children \ + --no-pulseaudio \ + --no-mdns \ + --no-notification \ + --no-daemon \ + &> \$IB_USER_PROFILE/xpra/server.log + rm -f \$IB_USER_PROFILE/xpra/run + rm -f /tmp/.X\$DISPLAYNUM-lock + ) & + wait \$WAIT_DUMMY_PID + exit 0 + fi + if [ -f \$IB_USER_PROFILE/xpra/run ]; then + ${xpra}/bin/xpra attach \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ \ + --windows \ + --no-speaker \ + --no-microphone \ + --no-tray \ + --title="\$IB_USER_PROFILE_TITLE: @title@" \ + &> \$IB_USER_PROFILE/xpra/client.log + fi + EOF + chmod u+x $out/bin/ib-gw-c + ''; + + + meta = with stdenv.lib; { + description = "Automation Controller for the Trader Work Station of Interactive Brokers"; + homepage = https://github.com/ib-controller/ib-controller; + license = licenses.gpl3; + maintainers = [ maintainers.tstrobel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix new file mode 100644 index 00000000000..b8844391c7d --- /dev/null +++ b/pkgs/applications/office/ib/tws/default.nix @@ -0,0 +1,96 @@ +{ stdenv, requireFile, jdk }: + +stdenv.mkDerivation rec { + version = "9542"; + name = "ib-tws-${version}"; + + src = requireFile rec { + name = "ibtws_${version}.jar"; + message = '' + This nix expression requires that ${name} is already part of the store. + Download the TWS from + https://download2.interactivebrokers.com/download/unixmacosx_latest.jar, + rename the file to ${name}, and add it to the nix store with + "nix-prefetch-url file://${name}". + ''; + sha256 = "1a2jiwwnr5g3xfba1a89c257bdbnq4zglri8hz021vk7f6s4rlrf"; + }; + + phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + + buildInputs = [ jdk ]; + + buildPhase = '' + jar -xf IBJts/jts.jar + cp trader/common/images/ibapp_icon.gif ibtws_icon.gif + ''; + + unpackPhase = '' + jar xf ${src} + ''; + + installPhase = '' + mkdir -p $out $out/bin $out/etc/ib/tws $out/share/IBJts $out/share/icons + cp IBJts/*.jar $out/share/IBJts/. + cp IBJts/*.ini $out/etc/ib/tws/. + cp ibtws_icon.gif $out/share/icons/. + classpath="" + for jar in $out/share/IBJts/*.jar; do + classpath="$classpath:$jar" + done + # strings to use below; separated to avoid nix specific substitutions + javaOptions={JAVA_OPTIONS:-'-Xmx1024M -Dawt.useSystemAAFontSettings=lcd -Dsun.java2d.xrender=True -Dsun.java2d.opengl=False'} + # OTHER JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java + ibProfileDir={IB_PROFILE_DIR:-~/IB/} + cat< $out/bin/ib-tws + #!$SHELL + if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then + IB_USER_PROFILE=\`realpath \$1\` + IB_USER_PROFILE_TITLE=\`basename \$1\` + else + if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then + IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\` + IB_USER_PROFILE_TITLE=\$1 + else + echo "ERROR: \"\$1\" is not a valid name of a profile." + exit 1 + fi + fi + shift + if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi + if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi + if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp $out/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi + ${jdk}/bin/java -cp $classpath \$$javaOptions jclient.LoginFrame \$IB_USER_PROFILE + EOF + chmod u+x $out/bin/ib-tws + cat< $out/bin/ib-gw + #!$SHELL + if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then + IB_USER_PROFILE=\`realpath \$1\` + IB_USER_PROFILE_TITLE=\`basename \$1\` + else + if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then + IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\` + IB_USER_PROFILE_TITLE=\$1 + else + echo "ERROR: \"\$1\" is not a valid name of a profile." + exit 1 + fi + fi + shift + if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi + if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi + if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp $out/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi + ${jdk}/bin/java -cp $classpath -Dsun.java2d.noddraw=true \$$javaOptions ibgateway.GWClient \$IB_USER_PROFILE + EOF + chmod u+x $out/bin/ib-gw + ''; + + meta = with stdenv.lib; { + description = "Trader Work Station of Interactive Brokers"; + homepage = https://www.interactivebrokers.com; + license = licenses.unfree; + maintainers = [ maintainers.tstrobel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh index d77b41a0480..bba1ad9c213 100755 --- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh +++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh @@ -1,7 +1,11 @@ #!/run/current-system/sw/bin/bash +# Ideally we would move as much as possible into derivation dependencies + # Take the list of files from the main package, ooo.lst.in +# This script wants an argument: download list file + cat <&2; + eval "${line#* }"; + ;; \#*) echo Skipping comment: "$line" >&2; ;; @@ -42,6 +53,7 @@ while read line; do line="${line#,}" md5=${line:0:32}; name=${line:33}; + name="${name%)}" brief=false; write_entry; ;; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh new file mode 100644 index 00000000000..d505aa7a4cb --- /dev/null +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh @@ -0,0 +1 @@ +EVAL additions_libgltf=' subDir = "libgltf/";' diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 0e7525782c6..a70d5a7c77c 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -323,6 +323,7 @@ name = "libgltf-0.0.2.tar.bz2"; md5 = "d63a9f47ab048f5009d90693d6aa6424"; brief = true; + subDir = "libgltf/"; } { name = "liblangtag-0.5.1.tar.bz2"; diff --git a/pkgs/applications/science/electronics/qucs/tr1-complex.patch b/pkgs/applications/science/electronics/qucs/tr1-complex.patch deleted file mode 100644 index 0be7ae00eb9..00000000000 --- a/pkgs/applications/science/electronics/qucs/tr1-complex.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- qucs-core/configure.orig 2011-07-03 07:34:09.069218113 -0500 -+++ qucs-core/configure 2011-07-03 07:34:46.618990497 -0500 -@@ -5884,7 +5884,6 @@ - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include - using namespace std; - using namespace std::tr1; - int diff --git a/pkgs/applications/science/logic/isabelle/settings.patch b/pkgs/applications/science/logic/isabelle/settings.patch deleted file mode 100644 index bf509a4bac4..00000000000 --- a/pkgs/applications/science/logic/isabelle/settings.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nuar Isabelle2011/etc/settings Isabelle2011-fix/etc/settings ---- Isabelle2011/etc/settings 2011-01-30 13:02:18.000000000 +0100 -+++ Isabelle2011-fix/etc/settings 2011-05-14 22:56:04.000000000 +0200 -@@ -17,13 +17,7 @@ - - # Poly/ML 5.x (automated settings) - ML_PLATFORM="$ISABELLE_PLATFORM" --ML_HOME="$(choosefrom \ -- "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \ -- "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \ -- "/usr/local/polyml/$ML_PLATFORM" \ -- "/usr/share/polyml/$ML_PLATFORM" \ -- "/opt/polyml/$ML_PLATFORM" \ -- "")" -+ML_HOME=@ML_HOME@ - ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version") - ML_OPTIONS="-H 200" - ML_SOURCES="$ML_HOME/../src" -@@ -175,13 +169,7 @@ - ### - - # Proof General home, look in a variety of places --PROOFGENERAL_HOME="$(choosefrom \ -- "$ISABELLE_HOME/contrib/ProofGeneral" \ -- "$ISABELLE_HOME/../ProofGeneral" \ -- "/usr/local/ProofGeneral" \ -- "/usr/share/ProofGeneral" \ -- "/opt/ProofGeneral" \ -- "")" -+PROOFGENERAL_HOME=@PROOFGENERAL_HOME@ - - PROOFGENERAL_OPTIONS="" - #PROOFGENERAL_OPTIONS="-m no_brackets -m no_type_brackets" diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix index 308ca79eab2..772d755b233 100644 --- a/pkgs/applications/science/logic/metis-prover/default.nix +++ b/pkgs/applications/science/logic/metis-prover/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metis-prover-${version}"; - version = "2.3.20160101"; + version = "2.3.20160102"; src = fetchurl { url = "http://www.gilith.com/software/metis/metis.tar.gz"; - sha256 = "0wkh506ggwmfacwl19n84n1xi6ak4xhrc96d9pdkpk8zdwh5w58l"; + sha256 = "13csr90i9lsxdyzxqiwgi98pa7phfl28drjcv4qdjhzi71wcdc66"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index fb3fb959ae6..43ce46b8e7a 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "z3-${version}"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "Z3Prover"; repo = "z3"; - rev = "7f6ef0b6c0813f2e9e8f993d45722c0e5b99e152"; - sha256 = "1xllvq9fcj4cz34biq2a9dn2sj33bdgrzyzkj26hqw70wkzv1kzx"; + rev = "z3-${version}"; + sha256 = "1ix100r1h00iph1bk5qx5963gpqaxmmx42r2vb5zglynchjif07c"; }; buildInputs = [ python ]; diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index abdbb46bc5b..43228b255a2 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -1,15 +1,15 @@ -{ stdenv, lib, autoconf, automake, go, file, git, wget, gnupg1, squashfsTools, cpio -, fetchurl, fetchFromGitHub }: +{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, squashfsTools, + cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }: let coreosImageRelease = "794.1.0"; coreosImageSystemdVersion = "222"; # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. - stage1Flavours = [ "coreos" "fly" ]; + stage1Flavours = [ "coreos" "fly" "host" ]; in stdenv.mkDerivation rec { - version = "0.14.0"; + version = "0.15.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { rev = "v${version}"; owner = "coreos"; repo = "rkt"; - sha256 = "0dmgs9s40xhan2rh9f5n0k5gv8p2dn946zffq02sq35qqvi67s71"; + sha256 = "1pw14r38p8sdkma37xx0yy3zx5yxqc12zj35anmlbmrgw4vdgavf"; }; stage1BaseImage = fetchurl { @@ -25,7 +25,10 @@ in stdenv.mkDerivation rec { sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym"; }; - buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ]; + buildInputs = [ + autoreconfHook go file git wget gnupg1 squashfsTools cpio acl systemd + makeWrapper + ]; preConfigure = '' ./autogen.sh @@ -45,6 +48,9 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -Rv $BUILDDIR/bin/* $out/bin + wrapProgram $out/bin/rkt \ + --prefix LD_LIBRARY_PATH : ${systemd}/lib \ + --prefix PATH : ${iptables}/bin ''; meta = with lib; { diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index bc777c962d5..855694e0412 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.10"; + version = "5.0.12"; forEachModule = action: '' for mod in \ @@ -39,12 +39,12 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "104061"; + extpackRevision = "104815"; 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 = "c846fa26fec8587e57180c85c408cad377c48ad26830b0dc839ebf9025e3d29c"; + sha256 = "ac1bc8452b7fdf183325272149e9f18b9810cc07adf18e48755385a9cd1b236d"; 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 = "56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89"; + sha256 = "de0362b1d404d1ca0298db1984acb6f0f1c6210313aeb744fea345ad9201e86e"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index b6b05806a00..43f591cf6aa 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 = "8f7ffee3fac75793e48d1859b65a95879b3ed5bc1c3164c967e85d69244c594b"; + sha256 = "61a19c9ec4b449cbc6bb41b636b03a16bf5a47ffa4943423d262863017e8bc9b"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 71c26c5f99c..6774675266c 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -5,7 +5,7 @@ , flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl , checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice , spice_protocol, usbredir, alsaLib, quilt -, coreutils, gawk, gnused, gnugrep, diffutils, multipath_tools +, coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools , inetutils, iptables, openvswitch, nbd, drbd, xenConfig , xenserverPatched ? false, ... }: @@ -51,7 +51,7 @@ let ]; scriptEnvPath = stdenv.lib.concatStrings (stdenv.lib.intersperse ":" (map (x: "${x}/bin") - [ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath_tools + [ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath-tools iproute inetutils iptables bridge-utils openvswitch nbd drbd ])); in diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 9c9d3d5f451..2b0d44e61c8 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -7,7 +7,7 @@ }: let - version = "3.5.6"; + version = "3.5.7"; in with luaPackages; stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "1ms6a3l1i2jdhzrd1zr25cqckznmb44qgz4n635jam42hzhrvx1p"; + sha256 = "ba7f92b0ab8b729c569b19b098b0a08339d8654e3c040d07ad02cf99641ceecf"; }; meta = with stdenv.lib; { diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index 5db0d98b79a..4177846c433 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -12,6 +12,8 @@ let ''; init = run: writeText "${name}-init" '' + source /etc/profile + # Make /tmp directory mkdir -m 1777 /tmp @@ -44,7 +46,7 @@ in runCommand name { cat <$out/bin/${name} #! ${stdenv.shell} export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:\$CHROOTENV_EXTRA_BINDS" - exec ${chroot-user}/bin/chroot-user ${env} ${bash'} -l ${init runScript} "\$(pwd)" "\$@" + exec ${chroot-user}/bin/chroot-user ${env} ${bash'} ${init runScript} "\$(pwd)" "\$@" EOF chmod +x $out/bin/${name} ${extraInstallCommands} diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 155af314397..c505473ee72 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -5,6 +5,7 @@ use Cwd 'abs_path'; use IO::Handle; use File::Path; use File::Basename; +use File::Compare; use JSON::PP; STDOUT->autoflush(1); @@ -38,7 +39,7 @@ for my $p (@pathsToLink) { sub findFiles; sub findFilesInDir { - my ($relName, $target, $ignoreCollisions, $priority) = @_; + my ($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority) = @_; opendir DIR, "$target" or die "cannot open `$target': $!"; my @names = readdir DIR or die; @@ -46,12 +47,28 @@ sub findFilesInDir { foreach my $name (@names) { next if $name eq "." || $name eq ".."; - findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions, $priority); + findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions, $checkCollisionContents, $priority); } } +sub checkCollision { + my ($path1, $path2) = @_; + + my $stat1 = (stat($path1))[2]; + my $stat2 = (stat($path2))[2]; + + if ($stat1 != $stat2) { + warn "different permissions in `$path1' and `$path2': " + . sprintf("%04o", $stat1 & 07777) . " <-> " + . sprintf("%04o", $stat2 & 07777); + return 0; + } + + return compare($path1, $path2) == 0; +} + sub findFiles { - my ($relName, $target, $baseName, $ignoreCollisions, $priority) = @_; + my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_; # Urgh, hacky... return if @@ -82,13 +99,15 @@ sub findFiles { if ($ignoreCollisions) { warn "collision between `$target' and `$oldTarget'\n" if $ignoreCollisions == 1; return; + } elsif ($checkCollisionContents && checkCollision($oldTarget, $target)) { + return; } else { die "collision between `$target' and `$oldTarget'\n"; } } - findFilesInDir($relName, $oldTarget, $ignoreCollisions, $oldPriority) unless $oldTarget eq ""; - findFilesInDir($relName, $target, $ignoreCollisions, $priority); + findFilesInDir($relName, $oldTarget, $ignoreCollisions, $checkCollisionContents, $oldPriority) unless $oldTarget eq ""; + findFilesInDir($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority); $symlinks{$relName} = ["", $priority]; # denotes directory } @@ -98,12 +117,12 @@ my %done; my %postponed; sub addPkg { - my ($pkgDir, $ignoreCollisions, $priority) = @_; + my ($pkgDir, $ignoreCollisions, $checkCollisionContents, $priority) = @_; return if (defined $done{$pkgDir}); $done{$pkgDir} = 1; - findFiles("", $pkgDir, "", $ignoreCollisions, $priority); + findFiles("", $pkgDir, "", $ignoreCollisions, $checkCollisionContents, $priority); my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages"; if (-e $propagatedFN) { @@ -132,7 +151,11 @@ if (exists $ENV{"pkgsPath"}) { # user. for my $pkg (@{decode_json $pkgs}) { for my $path (@{$pkg->{paths}}) { - addPkg($path, $ENV{"ignoreCollisions"} eq "1", $pkg->{priority}) if -e $path; + addPkg($path, + $ENV{"ignoreCollisions"} eq "1", + $ENV{"checkCollisionContents"} eq "1", + $pkg->{priority}) + if -e $path; } } diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 9b8b9daad94..a9a4d95d7d8 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -16,6 +16,10 @@ , # Whether to ignore collisions or abort. ignoreCollisions ? false +, # If there is a collision, check whether the contents and permissions match + # and only if not, throw a collision error. + checkCollisionContents ? true + , # The paths (relative to each element of `paths') that we want to # symlink (e.g., ["/bin"]). Any file not inside any of the # directories in the list is not symlinked. @@ -39,7 +43,9 @@ }: runCommand name - rec { inherit manifest ignoreCollisions passthru meta pathsToLink extraPrefix postBuild buildInputs; + rec { + inherit manifest ignoreCollisions checkCollisionContents passthru + meta pathsToLink extraPrefix postBuild buildInputs; pkgs = builtins.toJSON (map (drv: { paths = [ drv ] diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix new file mode 100644 index 00000000000..79a26abcb83 --- /dev/null +++ b/pkgs/build-support/emacs/elpa.nix @@ -0,0 +1,30 @@ +# builder for Emacs packages built for packages.el + +{ lib, stdenv, fetchurl, emacs, texinfo }: + +with lib; + +{ pname +, version +, src +, ... +}@args: + +import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ + + phases = "installPhase fixupPhase distPhase"; + + installPhase = '' + runHook preInstall + + emacs --batch -Q -l ${./elpa2nix.el} \ + -f elpa2nix-install-package \ + "${src}" "$out/share/emacs/site-lisp/elpa" + + runHook postInstall + ''; +} + +// removeAttrs args [ "files" "fileSpecs" + "meta" + ]) diff --git a/pkgs/build-support/emacs/elpa2nix.el b/pkgs/build-support/emacs/elpa2nix.el new file mode 100644 index 00000000000..7eef81b9e7a --- /dev/null +++ b/pkgs/build-support/emacs/elpa2nix.el @@ -0,0 +1,30 @@ +(require 'package) +(package-initialize) + +(defun elpa2nix-install-package () + (if (not noninteractive) + (error "`elpa2nix-install-package' is to be used only with -batch")) + (pcase command-line-args-left + (`(,archive ,elpa) + (progn (setq package-user-dir elpa) + (elpa2nix-install-file archive))))) + +(defun elpa2nix-install-from-buffer () + "Install a package from the current buffer." + (let ((pkg-desc (if (derived-mode-p 'tar-mode) + (package-tar-file-info) + (package-buffer-info)))) + ;; Install the package itself. + (package-unpack pkg-desc) + pkg-desc)) + +(defun elpa2nix-install-file (file) + "Install a package from a file. +The file can either be a tar file or an Emacs Lisp file." + (let ((is-tar (string-match "\\.tar\\'" file))) + (with-temp-buffer + (if is-tar + (insert-file-contents-literally file) + (insert-file-contents file)) + (when is-tar (tar-mode)) + (elpa2nix-install-from-buffer)))) diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index d41f90ebd05..6fa27f09839 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -32,8 +32,11 @@ stdenv.mkDerivation ({ unpackCmd = '' case "$curSrc" in *.el) - cp $curSrc $pname.el - chmod +w $pname.el + # keep original source filename without the hash + local filename=$(basename "$curSrc") + filename="''${filename:33}" + cp $curSrc $filename + chmod +w $filename sourceRoot="." ;; *) diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 8fd2a00b50a..3b8a23d8c2a 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -28,8 +28,6 @@ let sha256 = "1biwg2pqmmdz5iwqbjdszljazqymvgyyjcnc255nr6qz8mhnx67j"; }; - fname = "${pname}-${version}"; - targets = concatStringsSep " " (if files == null then fileSpecs else files); defaultMeta = { @@ -41,31 +39,33 @@ in import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ inherit packageBuild; - buildPhase = '' - runHook preBuild + buildPhase = + if recipeFile == null + then '' + runHook preBuild - emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \ - ${if recipeFile == null - then - '' - -f melpa2nix-build-package \ - ${pname} ${version} ${targets} - '' - else - '' - -f melpa2nix-build-package-from-recipe \ - ${pname} ${version} ${recipeFile} - ''} + export archive=$(emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \ + -f melpa2nix-build-package \ + ${pname} ${version} ${targets}) - runHook postBuild - ''; + runHook postBuild + '' + else '' + runHook preBuild + + export archive=$(emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \ + -f melpa2nix-build-package-from-recipe \ + ${recipeFile} ${version}) + + runHook postBuild + ''; installPhase = '' runHook preInstall - emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \ - -f melpa2nix-install-package \ - ${fname}.* $out/share/emacs/site-lisp/elpa + emacs --batch -Q -l ${./elpa2nix.el} \ + -f elpa2nix-install-package \ + "$archive" "$out/share/emacs/site-lisp/elpa" runHook postInstall ''; diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el index f1309fc0d57..3cd5bbdb954 100644 --- a/pkgs/build-support/emacs/melpa2nix.el +++ b/pkgs/build-support/emacs/melpa2nix.el @@ -6,14 +6,6 @@ (setq package-build-working-dir (expand-file-name ".") package-build-archive-dir (expand-file-name ".")) -(defun melpa2nix-install-package () - (if (not noninteractive) - (error "`melpa2nix-install-package' is to be used only with -batch")) - (pcase command-line-args-left - (`(,archive ,elpa) - (progn (setq package-user-dir elpa) - (package-install-file archive))))) - (defun melpa2nix-build-package () (if (not noninteractive) (error "`melpa2nix-build-package' is to be used only with -batch")) @@ -25,8 +17,10 @@ (if (not noninteractive) (error "`melpa2nix-build-package' is to be used only with -batch")) (pcase command-line-args-left - (`(,package ,version ,recipe-file) - (let* ((rcp (cdr (package-build--read-from-file recipe-file))) + (`(,recipe-file ,version) + (let* ((recipe (package-build--read-from-file recipe-file)) + (rcp (cdr recipe)) + (package (car recipe)) (files (package-build--config-file-list rcp))) (melpa2nix-package-build-archive package version files))))) @@ -38,8 +32,11 @@ version files package-build-working-dir - package-build-archive-dir))) + package-build-archive-dir)) + (archive-file (package-build--archive-file-name archive-entry))) - (package-build--message "Built in %.3fs, finished at %s" + (progn + (package-build--message "Built in %.3fs, finished at %s" (time-to-seconds (time-since start-time)) - (current-time-string)))) + (current-time-string)) + (princ (format "%s\n" archive-file))))) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index fbefba5ccc0..6cf694dd2b1 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -24,6 +24,22 @@ else leaveDotGit=true fi +usage(){ + echo >&2 "syntax: nix-prefetch-git [options] [URL [REVISION [EXPECTED-HASH]]] + +Options: + --out path Path where the output would be stored. + --url url Any url understand by 'git clone'. + --rev ref Any sha1 or references (such as refs/heads/master) + --hash h Expected hash. + --deepClone Clone submodules recursively. + --no-deepClone Do not clone submodules. + --leave-dotGit Keep the .git directories. + --fetch-submodules Fetch submodules. + --builder Clone as fetchgit does, but url, rev, and out option are mandatory. +" + exit 1 +} argi=0 argfun="" @@ -40,6 +56,7 @@ for arg; do --leave-dotGit) leaveDotGit=true;; --fetch-submodules) fetchSubmodules=true;; --builder) builder=true;; + --help) usage; exit;; *) argi=$(($argi + 1)) case $argi in @@ -61,23 +78,6 @@ for arg; do fi done -usage(){ - echo >&2 "syntax: nix-prefetch-git [options] [URL [REVISION [EXPECTED-HASH]]] - -Options: - --out path Path where the output would be stored. - --url url Any url understand by 'git clone'. - --rev ref Any sha1 or references (such as refs/heads/master) - --hash h Expected hash. - --deepClone Clone submodules recursively. - --no-deepClone Do not clone submodules. - --leave-dotGit Keep the .git directories. - --fetch-submodules Fetch submodules. - --builder Clone as fetchgit does, but url, rev, and out option are mandatory. -" - exit 1 -} - if test -z "$url"; then usage fi diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 29565d7cdb9..c4fd18e46ca 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -45,6 +45,11 @@ tryDownload() { finish() { set +o noglob + + if [[ $executable == "1" ]]; then + chmod +x $downloadedFile + fi + runHook postFetch stopNest exit 0 diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index b1dc6e7be31..804974954d1 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -73,6 +73,9 @@ in # is communicated to postFetch via $downloadedFile. downloadToTemp ? false +, # If true, set executable bit on downloaded file + executable ? false + , # If set, don't download the file, but write a list of all possible # URLs (resulting from resolving mirror:// URLs) to $out. showURLs ? false @@ -116,9 +119,9 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s outputHash = if outputHash != "" then outputHash else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; - outputHashMode = if recursiveHash then "recursive" else "flat"; + outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; - inherit curlOpts showURLs mirrorsFile impureEnvVars postFetch downloadToTemp; + inherit curlOpts showURLs mirrorsFile impureEnvVars postFetch downloadToTemp executable; # Doing the download on a remote machine just duplicates network # traffic, so don't do that. diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 3bf40a2e8d6..841effcfca1 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -33,7 +33,7 @@ let grKernel = if cfg.stable then mkKernel pkgs.linux_3_14 stable-patch - else mkKernel pkgs.linux_4_2 test-patch; + else mkKernel pkgs.linux_4_3 test-patch; ## -- grsecurity configuration --------------------------------------------- @@ -142,6 +142,7 @@ let }; extraConfig = grsecConfig; features.grsecurity = true; + ignoreConfigErrors = true; # Too lazy to model the config options that work with grsecurity and don't for now })) (args: grsecurityOverrider args grkern)); mkGrsecPkg = grkern: pkgs.linuxPackagesFor grkern (mkGrsecPkg grkern); diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index a1594047af6..8a70b2949af 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, unzip }: stdenv.mkDerivation rec { - version = "129da4d8036c9ea52ba8b94cdfa0148e4c2cff96"; + version = "e7008b488edfe37379ba9c4b8d5245dfd6125fc3"; package-name = "numix-icon-theme-circle"; - name = "${package-name}-20151014"; + name = "${package-name}-20160121-${version}"; buildInputs = [ unzip ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "1505j63qh96hy04x3ywc6kspavzgjd848cgdkda23kjdbx0fpij4"; + sha256 = "0pfcz50b9g7zzskws94m6wvd8zm3sjvhpbzq9vjqi1q02nzflap6"; }; dontBuild = true; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index ee4e0af9369..909750aec6f 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0f7641b048a07eb614662c502eb209dad5eb6d97"; + version = "a704451830d343670721cbf1391df18611d61901"; package-name = "numix-icon-theme"; - name = "${package-name}-20151023"; + name = "${package-name}-20160120-${version}"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "16kbasgbb5mgiyl9b240215kivdnl8ynpkxhp5gairba9l4jpbih"; + sha256 = "0kk0rvywbm074nskjvvy0vjf6giw54jgvrw7sz9kwnv6h75ki96m"; }; dontBuild = true; diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 581d1db5088..c5510b79cc3 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2016-01-11"; + version = "2016-01-18"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; @@ -27,10 +27,10 @@ stdenv.mkDerivation { "1fksbnmda2a05cpax41h9r7jhi8102q41kl5nij4ai42d6yqy73x"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "06lhgkycyxisnvcrcdqcxlbhawyqw302yv1p3836bm0fjhyr7v4r"; + "00x6d11l8jxc1dj7p1kwmr3x1zwxwbv7xqbxj17j30s4qjmkb2i1"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "1scn63zd8di5jzxx4nfic4ggfy4jas9l56h0mcyvgypzlyvxgz43"; + "0r84ji86q4f6maw3scx9i054nzhjg4kb26r6fp1jdbiqjp8mhkyw"; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix index 5ec07d01b2e..7dcba417364 100644 --- a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu , bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool -, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit +, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which , gdk_pixbuf, librsvg, gnome_common }: @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { for f in $out/bin/* $out/libexec/*; do wrapProgram "$f" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" done ''; diff --git a/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix index 1dbbd390877..81bbd443e96 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "evolution-3.18.3"; + name = "evolution-3.18.4"; src = fetchurl { - url = mirror://gnome/sources/evolution/3.18/evolution-3.18.3.tar.xz; - sha256 = "f073b7cbef4ecc3dc4c3e0b80f98198eec577a20cae93e784659e8cf5af7c9b9"; + url = mirror://gnome/sources/evolution/3.18/evolution-3.18.4.tar.xz; + sha256 = "8161a0ebc77e61904dfaca9745595fefbf84d834a07ee1132d1f8d030dabfefb"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix index e368fd2cdd9..167acabee91 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gedit-3.18.2"; + name = "gedit-3.18.3"; src = fetchurl { - url = mirror://gnome/sources/gedit/3.18/gedit-3.18.2.tar.xz; - sha256 = "856e451aec29ee45980011de57cadfe89c3cbc53968f6cc865f8efe0bd0d49b1"; + url = mirror://gnome/sources/gedit/3.18/gedit-3.18.3.tar.xz; + sha256 = "6762ac0d793b0f754a2da5f88739d04fa39daa7491c5c46401d24bcef76c32e7"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix index 5a98770b663..ff21da4a28c 100644 --- a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu , bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool -, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit +, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which , gdk_pixbuf, librsvg, gnome_common }: @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { for f in $out/bin/* $out/libexec/*; do wrapProgram "$f" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" done ''; diff --git a/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix index 9f899fb6e42..5b465be415b 100644 --- a/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix +++ b/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "evolution-data-server-3.18.3"; + name = "evolution-data-server-3.18.4"; src = fetchurl { - url = mirror://gnome/sources/evolution-data-server/3.18/evolution-data-server-3.18.3.tar.xz; - sha256 = "9de9d6392822bb4b89318a88f5db1fd2f0f09899b793a0dd5525a656ed0e8163"; + url = mirror://gnome/sources/evolution-data-server/3.18/evolution-data-server-3.18.4.tar.xz; + sha256 = "0b756f05feae538676832acc122407046a89d4dd32da725789229dc3c416433f"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix index 2e0df487ee4..30edc3ab50e 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-bluetooth-3.18.1"; + name = "gnome-bluetooth-3.18.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-bluetooth/3.18/gnome-bluetooth-3.18.1.tar.xz; - sha256 = "c51d5b896d32845a2b5bb6ccd48926c88c8e9ef0915c32d3c56cb7e7974d4a49"; + url = mirror://gnome/sources/gnome-bluetooth/3.18/gnome-bluetooth-3.18.2.tar.xz; + sha256 = "d8df073c331df0f97261869fb77ffcdbf4e3e4eaf460d3c3ed2b16e03d9c5398"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix index 9e3660f207b..07fe6eceb13 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-dictionary-3.18.0"; + name = "gnome-dictionary-3.18.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-dictionary/3.18/gnome-dictionary-3.18.0.tar.xz; - sha256 = "5338962124f6d784920ed4968d98734a7589513b36e4f4a6ff00d1ed5afb4ead"; + url = mirror://gnome/sources/gnome-dictionary/3.18/gnome-dictionary-3.18.1.tar.xz; + sha256 = "92cf2d519335b125018468c22405499fdb320e4446201c7b0f55f1a441bf05cc"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix index bb02f9c6f84..6448f9aa99d 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gtksourceview-3.18.1"; + name = "gtksourceview-3.18.2"; src = fetchurl { - url = mirror://gnome/sources/gtksourceview/3.18/gtksourceview-3.18.1.tar.xz; - sha256 = "7be95faf068b9f0ac7540cc1e8d607baa98a482850ef11a6471b53c9327aede6"; + url = mirror://gnome/sources/gtksourceview/3.18/gtksourceview-3.18.2.tar.xz; + sha256 = "60f75a9f0039e13a2281fc595b5ef7344afa06732cc53b57d13234bfb0a5b7b2"; }; } diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix index b47381cf61b..86dfd953b48 100644 --- a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection, vala, libxml2 -, gnutls, selectTextPatch ? false }: +{ stdenv, fetchurl, intltool, pkgconfig +, gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls -stdenv.mkDerivation rec { +, selectTextPatch ? false +, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf +}: + +let baseAttrs = rec { inherit (import ./src.nix fetchurl) name src; - patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.40.0.patch; - - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib + buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses vala libxml2 ]; propagatedBuildInputs = [ gnutls ]; @@ -36,4 +38,22 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ astsmtl antono lethalman ]; platforms = platforms.linux; }; -} +}; + +in stdenv.mkDerivation ( baseAttrs + // stdenv.lib.optionalAttrs selectTextPatch rec { + name = "vte-ng-${version}"; + version = "0.42.1.a"; + src = fetchFromGitHub { + owner = "thestinger"; + repo = "vte-ng"; + rev = version; + sha256 = "1296rvngixi6l31mhhaks6vr1xyqw8h6n5hwknadrlk95nknrpxm"; + }; + # slightly hacky; I couldn't make it work with autoreconfHook + configureScript = "./autogen.sh"; + nativeBuildInputs = (baseAttrs.nativeBuildInputs or []) + ++ [ gtk_doc autoconf automake libtool gperf ]; + } +) + diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/expose_select_text.0.40.0.patch b/pkgs/desktops/gnome-3/3.18/core/vte/expose_select_text.0.40.0.patch deleted file mode 100644 index c18f1b76b41..00000000000 --- a/pkgs/desktops/gnome-3/3.18/core/vte/expose_select_text.0.40.0.patch +++ /dev/null @@ -1,226 +0,0 @@ -Only in vte-0.40.0.new: .git -diff --unified -aur vte-0.40.0/src/vteaccess.c vte-0.40.0.new/src/vteaccess.c ---- vte-0.40.0/src/vteaccess.c 2015-03-16 06:34:37.000000000 -0400 -+++ vte-0.40.0.new/src/vteaccess.c 2015-04-10 00:08:53.146853382 -0400 -@@ -1444,7 +1444,7 @@ - *start_offset = offset_from_xy (priv, start_x, start_y); - _vte_terminal_get_end_selection (terminal, &end_x, &end_y); - *end_offset = offset_from_xy (priv, end_x, end_y); -- return _vte_terminal_get_selection (terminal); -+ return vte_terminal_get_selection (terminal); - } - - static gboolean -diff --unified -aur vte-0.40.0/src/vte.c vte-0.40.0.new/src/vte.c ---- vte-0.40.0/src/vte.c 2015-03-18 12:38:09.000000000 -0400 -+++ vte-0.40.0.new/src/vte.c 2015-04-10 00:08:53.150186722 -0400 -@@ -123,7 +123,6 @@ - gpointer data, - GArray *attributes, - gboolean include_trailing_spaces); --static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal); - static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal); - static void vte_terminal_stop_processing (VteTerminal *terminal); - -@@ -3344,9 +3343,10 @@ - _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n"); - terminal->pvt->pty_input_source = 0; - } --static void --_vte_terminal_connect_pty_read(VteTerminal *terminal) -+void -+vte_terminal_connect_pty_read(VteTerminal *terminal) - { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); - if (terminal->pvt->pty_channel == NULL) { - return; - } -@@ -3398,9 +3398,10 @@ - } - } - --static void --_vte_terminal_disconnect_pty_read(VteTerminal *terminal) -+void -+vte_terminal_disconnect_pty_read(VteTerminal *terminal) - { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); - if (terminal->pvt->pty_input_source != 0) { - _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n"); - g_source_remove(terminal->pvt->pty_input_source); -@@ -6302,6 +6303,28 @@ - } - } - -+/** -+ * vte_terminal_set_cursor_position: -+ * @terminal: a #VteTerminal -+ * @column: the new cursor column -+ * @row: the new cursor row -+ * -+ * Set the location of the cursor. -+ */ -+void -+vte_terminal_set_cursor_position(VteTerminal *terminal, -+ long column, long row) -+{ -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); -+ -+ _vte_invalidate_cursor_once(terminal, FALSE); -+ terminal->pvt->cursor.col = column; -+ terminal->pvt->cursor.row = row; -+ _vte_invalidate_cursor_once(terminal, FALSE); -+ _vte_check_cursor_blink(terminal); -+ vte_terminal_queue_cursor_moved(terminal); -+} -+ - static GtkClipboard * - vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board) - { -@@ -6465,7 +6488,7 @@ - vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE); - - /* Temporarily stop caring about input from the child. */ -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - } - - static gboolean -@@ -6482,7 +6505,7 @@ - terminal->pvt->selecting = FALSE; - - /* Reconnect to input from the child if we paused it. */ -- _vte_terminal_connect_pty_read(terminal); -+ vte_terminal_connect_pty_read(terminal); - - return TRUE; - } -@@ -6982,6 +7005,50 @@ - vte_terminal_deselect_all (terminal); - } - -+/** -+ * vte_terminal_get_selection_block_mode: -+ * @terminal: a #VteTerminal -+ * -+ * Checks whether or not block selection is enabled. -+ * -+ * Returns: %TRUE if block selection is enabled, %FALSE if not -+ */ -+gboolean -+vte_terminal_get_selection_block_mode(VteTerminal *terminal) { -+ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE); -+ return terminal->pvt->selection_block_mode; -+} -+ -+/** -+ * vte_terminal_set_selection_block_mode: -+ * @terminal: a #VteTerminal -+ * @block_mode: whether block selection is enabled -+ * -+ * Sets whether or not block selection is enabled. -+ */ -+void -+vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); -+ terminal->pvt->selection_block_mode = block_mode; -+} -+ -+/** -+ * vte_terminal_select_text: -+ * @terminal: a #VteTerminal -+ * @start_col: the starting column for the selection -+ * @start_row: the starting row for the selection -+ * @end_col: the end column for the selection -+ * @end_row: the end row for the selection -+ * -+ * Sets the current selection region. -+ */ -+void -+vte_terminal_select_text(VteTerminal *terminal, -+ long start_col, long start_row, -+ long end_col, long end_row) { -+ _vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0); -+} -+ - /* Autoscroll a bit. */ - static gboolean - vte_terminal_autoscroll(VteTerminal *terminal) -@@ -8631,7 +8698,7 @@ - #endif - kill(terminal->pvt->pty_pid, SIGHUP); - } -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - _vte_terminal_disconnect_pty_write(terminal); - if (terminal->pvt->pty_channel != NULL) { - g_io_channel_unref (terminal->pvt->pty_channel); -@@ -12188,7 +12255,7 @@ - g_object_freeze_notify(object); - - if (pvt->pty != NULL) { -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - _vte_terminal_disconnect_pty_write(terminal); - - if (terminal->pvt->pty_channel != NULL) { -@@ -12243,7 +12310,7 @@ - _vte_terminal_setup_utf8 (terminal); - - /* Open channels to listen for input on. */ -- _vte_terminal_connect_pty_read (terminal); -+ vte_terminal_connect_pty_read (terminal); - - g_object_notify(object, "pty"); - -@@ -12276,7 +12343,7 @@ - } - - char * --_vte_terminal_get_selection(VteTerminal *terminal) -+vte_terminal_get_selection(VteTerminal *terminal) - { - g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); - -diff --unified -aur vte-0.40.0/src/vteint.h vte-0.40.0.new/src/vteint.h ---- vte-0.40.0/src/vteint.h 2014-05-28 08:22:48.000000000 -0400 -+++ vte-0.40.0.new/src/vteint.h 2015-04-10 00:08:53.153520062 -0400 -@@ -25,7 +25,6 @@ - G_BEGIN_DECLS - - void _vte_terminal_accessible_ref(VteTerminal *terminal); --char* _vte_terminal_get_selection(VteTerminal *terminal); - void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y); - void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y); - void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset); -diff --unified -aur vte-0.40.0/src/vteterminal.h vte-0.40.0.new/src/vteterminal.h ---- vte-0.40.0/src/vteterminal.h 2015-03-18 12:38:09.000000000 -0400 -+++ vte-0.40.0.new/src/vteterminal.h 2015-04-10 00:08:53.150186722 -0400 -@@ -169,6 +169,18 @@ - - void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); - void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+void vte_terminal_set_selection_block_mode(VteTerminal *terminal, -+ gboolean block_mode) _VTE_GNUC_NONNULL(1); -+void vte_terminal_select_text(VteTerminal *terminal, -+ long start_col, long start_row, -+ long end_col, long end_row) _VTE_GNUC_NONNULL(1); -+char * -+vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+ -+/* pause and unpause output */ -+void vte_terminal_disconnect_pty_read(VteTerminal *vte); -+void vte_terminal_connect_pty_read(VteTerminal *vte); - - /* By-word selection */ - void vte_terminal_set_word_char_exceptions(VteTerminal *terminal, -@@ -280,6 +292,8 @@ - void vte_terminal_get_cursor_position(VteTerminal *terminal, - glong *column, - glong *row) _VTE_GNUC_NONNULL(1); -+void vte_terminal_set_cursor_position(VteTerminal *terminal, -+ long column, long row) _VTE_GNUC_NONNULL(1); - - /* Add a matching expression, returning the tag the widget assigns to that - * expression. */ diff --git a/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix index 0440af440fe..ec8b6c62228 100644 --- a/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - rev = "624945d"; + rev = "4844fada548ba4d30e1441e063565f9e46334ffd"; name = "gnome-shell-pomodoro-${gnome3.version}-${rev}"; src = fetchFromGitHub { owner = "codito"; repo = "gnome-pomodoro"; rev = "${rev}"; - sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq"; + sha256 = "11vqlz0gcvrvf87hwwxvpw3lv50ail16nlynlzkqfd2dac028mag"; }; configureScript = ''./autogen.sh''; diff --git a/pkgs/desktops/kde-4.14/files/kdelibs-cve-2014-5033.patch b/pkgs/desktops/kde-4.14/files/kdelibs-cve-2014-5033.patch deleted file mode 100644 index c85eccd6beb..00000000000 --- a/pkgs/desktops/kde-4.14/files/kdelibs-cve-2014-5033.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -+++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -@@ -144,7 +144,7 @@ - - Action::AuthStatus Polkit1Backend::actionStatus(const QString &action) - { -- PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid()); -+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID())); - PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject, - PolkitQt1::Authority::None); - switch (r) { -@@ -160,21 +160,12 @@ - - QByteArray Polkit1Backend::callerID() const - { -- QByteArray a; -- QDataStream s(&a, QIODevice::WriteOnly); -- s << QCoreApplication::applicationPid(); -- -- return a; -+ return QDBusConnection::systemBus().baseService().toUtf8(); - } - - bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID) - { -- QDataStream s(&callerID, QIODevice::ReadOnly); -- qint64 pid; -- -- s >> pid; -- -- PolkitQt1::UnixProcessSubject subject(pid); -+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID)); - PolkitQt1::Authority *authority = PolkitQt1::Authority::instance(); - - PolkitResultEventLoop e; - diff --git a/pkgs/desktops/kde-4.14/files/polkit-install.patch b/pkgs/desktops/kde-4.14/files/polkit-install.patch deleted file mode 100644 index d2ecac663ec..00000000000 --- a/pkgs/desktops/kde-4.14/files/polkit-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake ---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200 -+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200 -@@ -139,7 +139,7 @@ - ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR - ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) - -- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING -+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING - "Where policy files generated by KAuth will be installed" FORCE) - elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") - set (KAUTH_COMPILING_FAKE_BACKEND TRUE) diff --git a/pkgs/desktops/plasma-5.5/libkscreen/libkscreen-backend-path.patch b/pkgs/desktops/plasma-5.5/libkscreen/libkscreen-backend-path.patch deleted file mode 100644 index d5797924d23..00000000000 --- a/pkgs/desktops/plasma-5.5/libkscreen/libkscreen-backend-path.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 460022f..422a708 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,5 +1,7 @@ - include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES}) - -+configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h) -+ - set(libkscreen_SRCS - backendloader.cpp - config.cpp -diff --git a/src/backendloader.cpp b/src/backendloader.cpp -index b93e469..8aebc14 100644 ---- a/src/backendloader.cpp -+++ b/src/backendloader.cpp -@@ -16,6 +16,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - *************************************************************************************/ - -+#include "config-libkscreen.h" - #include "backendloader.h" - #include "debug_p.h" - #include "backends/abstractbackend.h" -@@ -40,55 +41,54 @@ bool BackendLoader::init() - const QString backend = qgetenv("KSCREEN_BACKEND").constData(); - const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend); - -- const QStringList paths = QCoreApplication::libraryPaths(); -- Q_FOREACH (const QString &path, paths) { -- const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"), -- backendFilter, -- QDir::SortFlags(QDir::QDir::NoSort), -- QDir::NoDotAndDotDot | QDir::Files); -- const QFileInfoList finfos = dir.entryInfoList(); -- Q_FOREACH (const QFileInfo &finfo, finfos) { -- // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND -- if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) { -- continue; -- } -+ QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/"); - -- // When on X11, skip the QScreen backend, instead use the XRandR backend, -- // if not specified in KSCREEN_BACKEND -- if (backend.isEmpty() && -- finfo.fileName().contains(QLatin1String("KSC_QScreen")) && -- QX11Info::isPlatformX11()) { -- continue; -- } -+ const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"), -+ backendFilter, -+ QDir::SortFlags(QDir::QDir::NoSort), -+ QDir::NoDotAndDotDot | QDir::Files); -+ const QFileInfoList finfos = dir.entryInfoList(); -+ Q_FOREACH (const QFileInfo &finfo, finfos) { -+ // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND -+ if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) { -+ continue; -+ } - -- // When not on X11, skip the XRandR backend, and fall back to QSCreen -- // if not specified in KSCREEN_BACKEND -- if (backend.isEmpty() && -- finfo.fileName().contains(QLatin1String("KSC_XRandR")) && -- !QX11Info::isPlatformX11()) { -- continue; -- } -+ // When on X11, skip the QScreen backend, instead use the XRandR backend, -+ // if not specified in KSCREEN_BACKEND -+ if (backend.isEmpty() && -+ finfo.fileName().contains(QLatin1String("KSC_QScreen")) && -+ QX11Info::isPlatformX11()) { -+ continue; -+ } -+ -+ // When not on X11, skip the XRandR backend, and fall back to QSCreen -+ // if not specified in KSCREEN_BACKEND -+ if (backend.isEmpty() && -+ finfo.fileName().contains(QLatin1String("KSC_XRandR")) && -+ !QX11Info::isPlatformX11()) { -+ continue; -+ } - -- QPluginLoader loader(finfo.filePath()); -- loader.load(); -- QObject *instance = loader.instance(); -- if (!instance) { -+ QPluginLoader loader(finfo.filePath()); -+ loader.load(); -+ QObject *instance = loader.instance(); -+ if (!instance) { -+ loader.unload(); -+ continue; -+ } -+ -+ s_backend = qobject_cast< AbstractBackend* >(instance); -+ if (s_backend) { -+ if (!s_backend->isValid()) { -+ qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend"; -+ delete s_backend; -+ s_backend = 0; - loader.unload(); - continue; - } -- -- s_backend = qobject_cast< AbstractBackend* >(instance); -- if (s_backend) { -- if (!s_backend->isValid()) { -- qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend"; -- delete s_backend; -- s_backend = 0; -- loader.unload(); -- continue; -- } -- qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend"; -- return true; -- } -+ qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend"; -+ return true; - } - } - -diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake -new file mode 100644 -index 0000000..a99f3d1 ---- /dev/null -+++ b/src/config-libkscreen.h.cmake -@@ -0,0 +1,2 @@ -+#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" -+#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}" diff --git a/pkgs/development/compilers/ecl/libffi-prefix.patch b/pkgs/development/compilers/ecl/libffi-prefix.patch deleted file mode 100644 index d02cc214f31..00000000000 --- a/pkgs/development/compilers/ecl/libffi-prefix.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/configure.in b/src/configure.in -index 434da49..642c66c 100644 ---- ecl-15.3.7.orig/src/configure.ac -+++ ecl-15.3.7/src/configure.ac -@@ -191,6 +191,11 @@ AC_ARG_WITH(dffi, - [(system|included|auto|no, default=AUTO if libffi available)]), - [enable_libffi=${withval}], [enable_libffi=auto]) - -+AC_ARG_WITH(libffi-prefix, -+ AS_HELP_STRING( [--with-libffi-prefix=path], -+ [prefix for system LIBFFI includes and libraries] ), -+ [LIBFFI_INCDIR="$withval/include"; LIBFFI_LIBDIR="$withval/lib"], []) -+ - AC_ARG_WITH(fpe, - AS_HELP_STRING( [--with-fpe], - [detect floating point exceptions] -@@ -368,6 +373,22 @@ else - INFOEXT=info - fi - -+dnl libffi -+ -+if test "x$LIBFFI_INCDIR" != "x"; then -+ LIBFFI_CPPFLAGS="-I$LIBFFI_INCDIR" -+fi -+if test "x$LIBFFI_LIBDIR" != "x"; then -+ LIBFFI_LDFLAGS="-L$LIBFFI_LIBDIR" -+ if test "$enable_rpath" = "yes"; then -+ if (echo "$ECL_LDRPATH" | grep '~A') > /dev/null; then -+ LIBFFI_LDFLAGS=`echo $ECL_LDRPATH | sed "s,~A,$LIBFFI_LIBDIR,"`" $LIBFFI_LDFLAGS" -+ fi -+ fi -+fi -+CPPFLAGS="$CPPFLAGS $LIBFFI_CPPFLAGS" -+LDFLAGS="$LDFLAGS $LIBFFI_LDFLAGS" -+ - dnl ====================================================================== - dnl GNU multiprecision library - dnl diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 9b9773e6973..408af6e75c6 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -34,7 +34,7 @@ let EOF '' + lib.concatStrings cmds; - hsPkgs = haskell.packages.ghc7102.override { + hsPkgs = haskell.packages.ghc7103.override { overrides = self: super: let hlib = haskell.lib; elmRelease = import ./packages/release.nix { inherit (self) callPackage; }; diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix new file mode 100644 index 00000000000..e6fe97c6fe8 --- /dev/null +++ b/pkgs/development/compilers/fstar/default.nix @@ -0,0 +1,78 @@ +{ stdenv, fetchFromGitHub, mono, fsharp, dotnetPackages, z3, ocamlPackages, openssl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "fstar-${version}"; + version = "2016-01-12"; + + src = fetchFromGitHub { + owner = "FStarLang"; + repo = "FStar"; + rev = "af9a231566ca52c9bc3409398c801ae9e8191cfa"; + sha256 = "1zri4gqr6j6hygnh0ckfhq93mqwk9i19vng8chnmvlr27zq734a2"; + }; + + buildInputs = with ocamlPackages; [ + mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries openssl makeWrapper + ]; + + preBuild = '' + substituteInPlace src/Makefile --replace "\$(RUNTIME) VS/.nuget/NuGet.exe" "true" + + source setenv.sh + ''; + + makeFlags = [ + "FSYACC=${dotnetPackages.FsLexYacc}/bin/fsyacc" + "FSLEX=${dotnetPackages.FsLexYacc}/bin/fslex" + "NUGET=true" + "PREFIX=$(out)" + ]; + + buildFlags = "-C src"; + + # Now that the .NET fstar.exe is built, use it to build the native OCaml binary + postBuild = '' + patchShebangs bin/fstar.exe + + # Workaround for fsharp/fsharp#419 + cp ${fsharp}/lib/mono/4.5/FSharp.Core.dll bin/ + + # Use the built .NET binary to extract the sources of itself from F* to OCaml + make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} \ + $makeFlags "''${makeFlagsArray[@]}" \ + ocaml -C src + + # Build the extracted OCaml sources + make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} \ + $makeFlags "''${makeFlagsArray[@]}" \ + -C src/ocaml-output + ''; + + doCheck = true; + + preCheck = "ulimit -s unlimited"; + + # Basic test suite: + #checkFlags = "VERBOSE=y -C examples"; + + # Complete, but heavyweight test suite: + checkTarget = "regressions"; + checkFlags = "VERBOSE=y -C src"; + + installFlags = "-C src/ocaml-output"; + + postInstall = '' + # Workaround for FStarLang/FStar#456 + mv $out/lib/fstar/* $out/lib/ + rmdir $out/lib/fstar + + wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" + ''; + + meta = with stdenv.lib; { + description = "ML-like functional programming language aimed at program verification"; + homepage = "https://www.fstar-lang.org"; + license = licenses.asl20; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/compilers/ghc/osx-dylib-resolver.patch b/pkgs/development/compilers/ghc/osx-dylib-resolver.patch deleted file mode 100644 index 50236026031..00000000000 --- a/pkgs/development/compilers/ghc/osx-dylib-resolver.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/compiler/ghci/Linker.hs b/compiler/ghci/Linker.hs ---- a/compiler/ghci/Linker.hs -+++ b/compiler/ghci/Linker.hs -@@ -119,9 +119,9 @@ - -- that is really important - pkgs_loaded :: ![PackageKey], - -- -- we need to remember the name of the last temporary DLL/.so -- -- so we can link it -- last_temp_so :: !(Maybe (FilePath, String)) } -+ -- we need to remember the name of previous temporary DLL/.so -+ -- libraries so we can link them (see #10322) -+ temp_sos :: ![(FilePath, String)] } - - - emptyPLS :: DynFlags -> PersistentLinkerState -@@ -131,7 +131,7 @@ - pkgs_loaded = init_pkgs, - bcos_loaded = [], - objs_loaded = [], -- last_temp_so = Nothing } -+ temp_sos = [] } - - -- Packages that don't need loading, because the compiler - -- shares them with the interpreted program. -@@ -841,19 +841,19 @@ - dflags2 = dflags1 { - -- We don't want the original ldInputs in - -- (they're already linked in), but we do want -- -- to link against the previous dynLoadObjs -- -- library if there was one, so that the linker -+ -- to link against previous dynLoadObjs -+ -- libraries if there were any, so that the linker - -- can resolve dependencies when it loads this - -- library. - ldInputs = -- case last_temp_so pls of -- Nothing -> [] -- Just (lp, l) -> -+ concatMap -+ (\(lp, l) -> - [ Option ("-L" ++ lp) - , Option ("-Wl,-rpath") - , Option ("-Wl," ++ lp) - , Option ("-l" ++ l) -- ], -+ ]) -+ (temp_sos pls), - -- Even if we're e.g. profiling, we still want - -- the vanilla dynamic libraries, so we set the - -- ways / build tag to be just WayDyn. -@@ -868,7 +868,7 @@ - consIORef (filesToNotIntermediateClean dflags) soFile - m <- loadDLL soFile - case m of -- Nothing -> return pls { last_temp_so = Just (libPath, libName) } -+ Nothing -> return pls { temp_sos = (libPath, libName) : temp_sos pls } - Just err -> panic ("Loading temp shared object failed: " ++ err) - - rmDupLinkables :: [Linkable] -- Already loaded diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 1dee12ca12c..5ddfdc41917 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -119,5 +119,4 @@ mkDerivation (rec { license = stdenv.lib.licenses.bsd3; platforms = ghc.meta.platforms; maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; - broken = true; # depends on outdated versions of its Haskell build inputs }) diff --git a/pkgs/development/compilers/ghcjs/shims.nix b/pkgs/development/compilers/ghcjs/shims.nix index e596d57d74e..dbbf15de6c8 100644 --- a/pkgs/development/compilers/ghcjs/shims.nix +++ b/pkgs/development/compilers/ghcjs/shims.nix @@ -2,6 +2,6 @@ fetchFromGitHub { owner = "ghcjs"; repo = "shims"; - rev = "09e37565df8bbf876d4b7f36fbc19aa2140844a7"; - sha256 = "000ds78pv56v4drbdx3y7xncx9224l28n7cal9gy3inns1mq6yhj"; + rev = "45f44f5f027ec03264b61b8049951e765cc0b23a"; + sha256 = "090pz4rzwlcrjavbbzxhf6c7rq7rzmr10g89hmhw4c65c4fyyykp"; } diff --git a/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch b/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch deleted file mode 100644 index 8ee5b31925f..00000000000 --- a/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3918a2ccceb98230ff517601ad60aa6bee36e2c4 Mon Sep 17 00:00:00 2001 -From: Alex Malyshev -Date: Tue, 28 Oct 2014 15:55:34 -0700 -Subject: [PATCH] Replace use of MAX macro with std::max in ZendPack - -Summary: This has randomly bitten me in open source builds. I intermittently get -an error saying that MAX isn't defined. - -Instead of trying to figure out what's going on, I'm just gonna switch -it to std::max. - -Reviewed By: @paulbiss - -Differential Revision: D1636740 ---- - hphp/runtime/base/zend-pack.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/hphp/runtime/base/zend-pack.cpp b/hphp/runtime/base/zend-pack.cpp -index d878ea4..c3ee14d 100644 ---- a/hphp/runtime/base/zend-pack.cpp -+++ b/hphp/runtime/base/zend-pack.cpp -@@ -21,6 +21,8 @@ - #include "hphp/runtime/base/builtin-functions.h" - #include "hphp/util/tiny-vector.h" - -+#include -+ - namespace HPHP { - - #define INC_OUTPUTPOS(a,b) \ -@@ -294,7 +296,7 @@ Variant ZendPack::pack(const String& fmt, const Array& argv) { - case 'a': - case 'A': - case 'Z': { -- int arg_cp = (code != 'Z') ? arg : MAX(0, arg - 1); -+ int arg_cp = (code != 'Z') ? arg : std::max(0, arg - 1); - memset(&output[outputpos], (code != 'A') ? '\0' : ' ', arg); - val = argv[currentarg++].toString(); - s = val.c_str(); diff --git a/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch b/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch deleted file mode 100644 index f7cf29b739f..00000000000 --- a/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8207a31c26cc42fee79363a14c4a8f4fcbfffe63 Mon Sep 17 00:00:00 2001 -From: Jordan DeLong -Date: Mon, 6 Oct 2014 18:30:28 -0700 -Subject: [PATCH] Remove some MIN/MAX macro uses in the emitter - -Summary: has preferable type-safe versions that don't double-eval -their args. - -Reviewed By: @paulbiss - -Differential Revision: D1599803 ---- - hphp/compiler/analysis/emitter.cpp | 6 +++--- - hphp/util/compatibility.h | 4 ---- - 2 files changed, 3 insertions(+), 7 deletions(-) - -diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp -index 321e637..b1d3f2d 100644 ---- a/hphp/compiler/analysis/emitter.cpp -+++ b/hphp/compiler/analysis/emitter.cpp -@@ -799,8 +799,8 @@ void SymbolicStack::push(char sym) { - if (sym != StackSym::W && sym != StackSym::K && sym != StackSym::L && - sym != StackSym::T && sym != StackSym::I && sym != StackSym::H) { - m_actualStack.push_back(m_symStack.size()); -- *m_actualStackHighWaterPtr = MAX(*m_actualStackHighWaterPtr, -- (int)m_actualStack.size()); -+ *m_actualStackHighWaterPtr = std::max(*m_actualStackHighWaterPtr, -+ (int)m_actualStack.size()); - } - m_symStack.push_back(SymEntry(sym)); - } -@@ -1010,7 +1010,7 @@ int SymbolicStack::sizeActual() const { - - void SymbolicStack::pushFDesc() { - m_fdescCount += kNumActRecCells; -- *m_fdescHighWaterPtr = MAX(*m_fdescHighWaterPtr, m_fdescCount); -+ *m_fdescHighWaterPtr = std::max(*m_fdescHighWaterPtr, m_fdescCount); - } - - void SymbolicStack::popFDesc() { diff --git a/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch b/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch deleted file mode 100644 index 7c4870fb2a8..00000000000 --- a/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b9070aeab0ab672ffe321089631f9afe263b0caa Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Thu, 4 Jun 2015 12:03:32 -0500 -Subject: [PATCH] work around buggy wcwidth - ---- - test/unicode.jl | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/test/unicode.jl b/test/unicode.jl -index 52c3e6a..f1ef698 100644 ---- a/test/unicode.jl -+++ b/test/unicode.jl -@@ -103,5 +103,6 @@ end - - # handling of embedded NUL chars (#10958) - @test length("\0w") == length("\0α") == 2 --@test strwidth("\0w") == strwidth("\0α") == 1 -+@test strwidth("\0w") == charwidth('\0') + charwidth('w') -+@test strwidth("\0α") == charwidth('\0') + charwidth('α') - @test normalize_string("\0W", casefold=true) == "\0w" --- -2.4.1 - diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 6e552959fdb..a4dbfeac834 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -1,13 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "nim-0.11.2"; - - buildInputs = [ unzip ]; + name = "nim-0.13.0"; src = fetchurl { - url = "http://nim-lang.org/download/${name}.zip"; - sha256 = "0ay8gkd8fki3d8kbnw2px7rjdlr54kyqh5n1rjhq4vjmqs2wg5s4"; + url = "http://nim-lang.org/download/${name}.tar.xz"; + sha256 = "1adiij20n1cigsc44dbp60jdbydmkfp7ixbddmcn6h4dfvjzaqfd"; }; buildPhase = "sh build.sh"; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index bbbae38f6b8..45bef9819aa 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -141,6 +141,11 @@ let rm -rf $out/lib/openjdk/jre/bina ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin + # Make sure cmm/*.pf are not symlinks: + # https://youtrack.jetbrains.com/issue/IDEA-147272 + rm -rf $out/lib/openjdk/jre/lib/cmm + ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm + # Set PaX markings exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') echo "to mark: *$exes*" diff --git a/pkgs/development/compilers/openjdk/linux-4.0.patch b/pkgs/development/compilers/openjdk/linux-4.0.patch deleted file mode 100644 index c3d7cf8b6ca..00000000000 --- a/pkgs/development/compilers/openjdk/linux-4.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur openjdk-7u65-b32/hotspot/make/linux/Makefile openjdk-7u65-b32-patch/hotspot/make/linux/Makefile ---- openjdk-7u65-b32/hotspot/make/linux/Makefile 2014-07-17 03:08:38.000000000 -0700 -+++ openjdk-7u65-b32-patch/hotspot/make/linux/Makefile 2015-04-21 05:33:12.170190385 -0700 -@@ -231,7 +231,7 @@ - # Solaris 2.5.1, 2.6). - # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. - --SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% -+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% - OS_VERSION := $(shell uname -r) - EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) - diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index 258af23a1bc..b71c97d5622 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "65"; + patchVersion = "71"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "1shri8mw648piivyparbpzskiq4i0z6kain9kr7ylav5mv7h66fg"; - sha256_x86_64 = "1rr6g2sb0f1vyf3l9nvj49ah28bsid92z0lj9pfjlb12vjn2mnw8"; + sha256_i686 = "11wcizv4gvlffzn2wj34ffwrq21xwh4ikg2vjv63avdfp2hazjqv"; + sha256_x86_64 = "18jqdrlbv4sdds2hlmp437waq7r9b33f7hdp8kb6l7pkrizr9nwv"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 5900e08e19f..f4bb68500d2 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "66"; + patchVersion = "72"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "18l4r89na4z92djcdgyinjlhl6fmgz4x1sm40lwrsiwzg26nl0i1"; - sha256_x86_64 = "02nwcgplq14vj1vkz99r5x20lg86hscrxb5aaifwcny7l5gsv5by"; + sha256_i686 = "023rnlm5v7d9w4d7bgcac8j0r1vqkbv6fl20k8354pzpdjg6liaq"; + sha256_x86_64 = "167ca39a6y0n8l87kdm5nv2hrp0wf6g4mw1rbychjc04f5igkrs6"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index eda5157bb75..0d91ca2ff3b 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -51,5 +51,7 @@ in stdenv.mkDerivation rec { # support the -static flag and thus breaks the build. platforms = ["x86_64-linux"]; + broken = true; # https://github.com/UU-ComputerScience/uhc/issues/69 + }; } diff --git a/pkgs/development/coq-modules/ssreflect/threads.patch b/pkgs/development/coq-modules/ssreflect/threads.patch deleted file mode 100644 index d60a645f6ee..00000000000 --- a/pkgs/development/coq-modules/ssreflect/threads.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/Make 2015-04-20 13:37:06.000000000 +0200 -+++ b/Make 2015-04-25 11:32:53.885194600 +0200 -@@ -1,9 +1,9 @@ - ### Uncomment for static linking - ## --#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq --#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte --#-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo" --#SSRCOQ = bin/ssrcoq -+-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq -I +threads src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq -+-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte -I +threads src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte -+-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo" -+SSRCOQ = bin/ssrcoq - ## - - ## What follows should be left untouched by the final user of ssreflect diff --git a/pkgs/development/erlang-modules/hex-packages.nix b/pkgs/development/erlang-modules/hex-packages.nix index 9a165503b79..81fc1308e1e 100644 --- a/pkgs/development/erlang-modules/hex-packages.nix +++ b/pkgs/development/erlang-modules/hex-packages.nix @@ -1,3807 +1,3027 @@ -/* hex-packages.nix is an auto-generated file -- DO NOT EDIT! -* -* Unbuildable Packages: -* -* active_0_9_0 -* conferl_0_0_1 -* db_0_9_0 -* ekstat_0_2_2 -* erltrace_0_1_4 -* escalus_2_6_4 -* fqc_0_1_5 -* - libsnarlmatch_0_1_5 -* - rankmatcher_0_1_2 -* fqc_0_1_7 -* hash_ring_ex_1_1_2 -* gpb_3_18_10 -* gpb_3_18_8 -* - rebar_protobuffs_0_1_0 -* jose_1_4_2 -* jsxn_0_2_1 -* kvs_2_1_0 -* lager_2_1_1 -* - dqe_0_1_22 -* - ensq_0_1_6 -* - eplugin_0_1_4 -* - fifo_utils_0_1_18 -* - lager_watchdog_0_1_10 -* - mdns_client_0_1_7 -* - mdns_client_lib_0_1_33 -* lasp_0_0_3 -* libleofs_0_1_2 -* ezmq_0_2_0 -* mad_0_9_0 -* hackney_1_4_8 -* mmath_0_1_15 -* - ddb_client_0_1_17 -* - folsom_ddb_0_1_20 -* - dproto_0_1_12 -* - mstore_0_1_9 -* mmath_0_1_16 -* n2o_2_3_0 -* nodefinder_1_4_0 -* - cloudi_core_1_4_0_rc_4 -* - cloudi_service_db_cassandra_1_3_3 -* - cloudi_service_db_elasticsearch_1_3_3 -* - cloudi_service_db_riak_1_3_3 -* nodefinder_1_5_1 -* - cloudi_core_1_5_1 -* - cloudi_service_api_requests_1_5_1 -* - cloudi_service_db_1_5_1 -* - cloudi_service_db_cassandra_cql_1_5_1 -* - cloudi_service_db_couchdb_1_5_1 -* - cloudi_service_db_http_elli_1_5_1 -* - cloudi_service_db_memcached_1_5_1 -* - cloudi_service_db_mysql_1_5_1 -* - cloudi_service_db_pgsql_1_5_1 -* - cloudi_service_db_tokyotyrant_1_5_0 -* - cloudi_service_filesystem_1_5_1 -* - cloudi_service_http_client_1_5_1 -* - cloudi_service_http_cowboy_1_5_1 -* - cloudi_service_http_rest_1_5_1 -* - cloudi_service_map_reduce_1_5_1 -* - cloudi_service_monitoring_1_5_1 -* - cloudi_service_queue_1_5_1 -* - cloudi_service_quorum_1_5_1 -* - cloudi_service_router_1_5_1 -* - cloudi_service_tcp_1_5_1 -* - cloudi_service_timers_1_5_1 -* - cloudi_service_udp_1_5_1 -* - cloudi_service_validate_1_5_1 -* - cloudi_service_zeromq_1_5_1 -* - service_1_5_1 -* fast_yaml_1_0_1 -* parse_trans_2_9_0 -* pooler_1_4_0 -* protobuffs_0_8_2 -* - rebar3_protobuffs_0_2_0 -* - riak_pb_2_1_0 -* - riakc_2_1_1 -* locker_1_0_8 -* cowboy_1_0_4 -* - cet_0_2_0 -* amqp_client_3_5_6 -* rebar3_abnfc_plugin_0_1_0 -* rebar3_eqc_0_0_8 -* rebar3_exunit_0_1_1 -* rebar3_proper_0_5_0 -* rebar3_yang_plugin_0_2_1 -* hackney_1_1_0 -* - erlastic_search_1_1_1 -* hackney_1_3_1 -* - craterl_0_2_3 -* hackney_1_3_2 -* - epubnub_0_1_0 -* cpg_1_4_0 -* cpg_1_5_1 -* uuid_erl_1_4_0 -* uuid_erl_1_5_1 -* ucol_nif_1_1_5 -* katipo_0_2_4 -* xref_runner_0_2_4 +/* hex-packages.nix is an auto-generated file -- DO NOT EDIT! */ + +/* Unbuildable packages: + + * active_0_9_0 + * amqp_client_3_5_6 + * aws_http_0_2_4 + * barrel_jiffy_0_14_4 + * barrel_jiffy_0_14_5 + * cache_tab_1_0_1 + * certifi_0_1_1 + * cet_0_2_1 + * cloudi_core_1_4_0_rc_4 + * cloudi_core_1_5_1 + * cloudi_service_api_requests_1_5_1 + * cloudi_service_db_1_5_1 + * cloudi_service_db_cassandra_1_3_3 + * cloudi_service_db_cassandra_cql_1_5_1 + * cloudi_service_db_couchdb_1_5_1 + * cloudi_service_db_elasticsearch_1_3_3 + * cloudi_service_db_http_elli_1_5_1 + * cloudi_service_db_memcached_1_5_1 + * cloudi_service_db_mysql_1_5_1 + * cloudi_service_db_pgsql_1_5_1 + * cloudi_service_db_riak_1_3_3 + * cloudi_service_db_tokyotyrant_1_5_0 + * cloudi_service_filesystem_1_5_1 + * cloudi_service_http_client_1_5_1 + * cloudi_service_http_cowboy_1_5_1 + * cloudi_service_http_rest_1_5_1 + * cloudi_service_map_reduce_1_5_1 + * cloudi_service_monitoring_1_5_1 + * cloudi_service_queue_1_5_1 + * cloudi_service_quorum_1_5_1 + * cloudi_service_router_1_5_1 + * cloudi_service_tcp_1_5_1 + * cloudi_service_timers_1_5_1 + * cloudi_service_udp_1_5_1 + * cloudi_service_validate_1_5_1 + * cloudi_service_zeromq_1_5_1 + * cmark_0_6_2 + * comeonin_2_0_1 + * conferl_0_0_1 + * couchbeam_1_2_1 + * cowboy_1_0_4 + * cpg_1_4_0 + * cpg_1_5_1 + * craterl_0_2_3 + * cucumberl_0_0_6 + * db_0_9_0 + * ddb_client_0_1_17 + * denrei_0_2_3 + * dproto_0_1_12 + * dqe_0_1_22 + * ekstat_0_2_2 + * elibphonenumber_0_1_1 + * elli_1_0_4 + * enotify_0_1_0 + * ensq_0_1_6 + * eplugin_0_1_4 + * epubnub_0_1_0 + * eredis_cluster_0_5_4 + * erlang_lua_0_1_0 + * erlastic_search_1_1_1 + * erlaudio_0_2_3 + * erlcloud_0_12_0 + * erltrace_0_1_4 + * escalus_2_6_4 + * ex_bitcask_0_1_0 + * ezmq_0_2_0 + * fast_tls_1_0_0 + * fast_xml_1_1_2 + * fast_yaml_1_0_1 + * fifo_utils_0_1_18 + * folsom_ddb_0_1_20 + * fqc_0_1_7 + * gpb_3_18_10 + * gpb_3_18_8 + * hackney_1_1_0 + * hackney_1_3_1 + * hackney_1_3_2 + * hackney_1_4_4 + * hackney_1_4_8 + * hash_ring_ex_1_1_2 + * jc_1_0_4 + * jose_1_4_2 + * jsx_2_7_2 + * jsxn_0_2_1 + * katipo_0_2_4 + * kvs_2_1_0 + * lager_2_1_1 + * lager_watchdog_0_1_10 + * lasp_0_0_3 + * libleofs_0_1_2 + * locker_1_0_8 + * mad_0_9_0 + * mcrypt_0_1_0 + * mdns_client_0_1_7 + * mdns_client_lib_0_1_33 + * mimerl_1_0_0 + * mmath_0_1_15 + * mmath_0_1_16 + * msgpack_0_4_0 + * mstore_0_1_9 + * n2o_2_3_0 + * nacl_0_3_0 + * neotoma_1_7_3 + * nodefinder_1_4_0 + * nodefinder_1_5_1 + * observer_cli_1_0_3 + * p1_stringprep_1_0_0 + * p1_utils_1_0_0 + * p1_utils_1_0_1 + * p1_utils_1_0_2 + * p1_utils_1_0_3 + * p1_xml_1_1_1 + * parse_trans_2_9_0 + * picosat_0_1_0 + * png_0_1_1 + * pooler_1_4_0 + * protobuffs_0_8_2 + * rankmatcher_0_1_2 + * rebar3_abnfc_plugin_0_1_0 + * rebar3_auto_0_3_0 + * rebar3_eqc_0_0_8 + * rebar3_exunit_0_1_1 + * rebar3_live_0_1_3 + * rebar3_neotoma_plugin_0_2_0 + * rebar3_proper_0_5_0 + * rebar3_proper_plugin_0_1_0 + * rebar3_protobuffs_0_2_0 + * rebar3_run_0_2_0 + * rebar3_yang_plugin_0_2_1 + * rebar_protobuffs_0_1_0 + * relflow_1_0_4 + * reup_0_1_0 + * riak_pb_2_1_0 + * riakc_2_1_1 + * service_1_5_1 + * sfmt_0_12_8 + * siphash_2_1_1 + * snappy_1_1_1 + * stun_1_0_0 + * syslog_1_0_2 + * ucol_nif_1_1_5 + * ui_0_1_1 + * uuid_erl_1_4_0 + * uuid_erl_1_5_1 + * xref_runner_0_2_5 + * yomel_0_5_0 + */ { stdenv, callPackage }: let self = rec { - - aws_http_0_2_4 = callPackage - ( - { buildHex, barrel_jiffy_0_14_4, lhttpc_1_3_0 }: - buildHex { - name = "aws_http"; - version = "0.2.4"; - sha256 = - "96065da0d348a8e47e01531cfa720615e15a21c1bd4e5c82decf56026cde128f"; - - erlangDeps = [ barrel_jiffy_0_14_4 lhttpc_1_3_0 ]; - - meta = { - description = "Amazon AWS HTTP helpers"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/anha0825/erl_aws_http"; - }; - } - ) {}; - - aws_http = aws_http_0_2_4; - backoff_1_1_3 = callPackage ( - { buildHex }: - buildHex { - name = "backoff"; - version = "1.1.3"; - sha256 = - "30cead738d20e4c8d36cd37857dd5e23aeba57cb868bf64766d47d371422bdff"; - - meta = { - description = "Exponential backoffs library"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/ferd/backoff"; - }; - } + { buildHex }: + buildHex { + name = "backoff"; + version = "1.1.3"; + sha256 = + "30cead738d20e4c8d36cd37857dd5e23aeba57cb868bf64766d47d371422bdff"; + + meta = { + description = "Exponential backoffs library"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/ferd/backoff"; + }; + } ) {}; - + backoff = backoff_1_1_3; - + barrel_ibrowse_4_2_0 = callPackage ( - { buildHex }: - buildHex { - name = "barrel_ibrowse"; - version = "4.2.0"; - sha256 = - "58bd9e45932c10fd3d0ceb5c4e47952c3243ea300b388192761ac20be197b2ca"; - - meta = { - description = "Erlang HTTP client application"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/barrel-db/ibrowse"; - }; - } + { buildHex }: + buildHex { + name = "barrel_ibrowse"; + version = "4.2.0"; + sha256 = + "58bd9e45932c10fd3d0ceb5c4e47952c3243ea300b388192761ac20be197b2ca"; + + meta = { + description = "Erlang HTTP client application"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/barrel-db/ibrowse"; + }; + } ) {}; - + barrel_ibrowse = barrel_ibrowse_4_2_0; - - barrel_jiffy_0_14_4 = callPackage - ( - { buildHex }: - buildHex { - name = "barrel_jiffy"; - version = "0.14.4"; - sha256 = - "3b730d6a18e988b8411f449bbb5df3637eb7bea864302924581b2391dd6b6e71"; - compilePort = true; - - meta = { - description = "JSON Decoder/Encoder."; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/barrel-db/jiffy"; - }; - } - ) {}; - - barrel_jiffy_0_14_5 = callPackage - ( - { buildHex }: - buildHex { - name = "barrel_jiffy"; - version = "0.14.5"; - sha256 = - "8a874c6dbcf439a7d7b300b4463f47e088fd54e2b715ef7261e21807ee421f47"; - compilePort = true; - - meta = { - description = "JSON Decoder/Encoder."; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/barrel-db/jiffy"; - }; - } - ) {}; - - barrel_jiffy = barrel_jiffy_0_14_5; - + barrel_oauth_1_6_0 = callPackage ( - { buildHex }: - buildHex { - name = "barrel_oauth"; - version = "1.6.0"; - sha256 = - "b2a800b771d45f32a9a55d416054b3bdfab3a925b62e8000f2c08b719390d4dd"; - - meta = { - description = "An Erlang OAuth 1.0 implementation"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/barrel-db/erlang-oauth"; - }; - } + { buildHex }: + buildHex { + name = "barrel_oauth"; + version = "1.6.0"; + sha256 = + "b2a800b771d45f32a9a55d416054b3bdfab3a925b62e8000f2c08b719390d4dd"; + + meta = { + description = "An Erlang OAuth 1.0 implementation"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/barrel-db/erlang-oauth"; + }; + } ) {}; - + barrel_oauth = barrel_oauth_1_6_0; - + base16_1_0_0 = callPackage ( - { buildHex }: - buildHex { - name = "base16"; - version = "1.0.0"; - sha256 = - "02afd0827e61a7b07093873e063575ca3a2b07520567c7f8cec7c5d42f052d76"; - - meta = { - description = "Base16 encoding and decoding"; - license = with stdenv.lib.licenses; [ bsd3 free ]; - homepage = "https://github.com/goj/base16"; - }; - } + { buildHex }: + buildHex { + name = "base16"; + version = "1.0.0"; + sha256 = + "02afd0827e61a7b07093873e063575ca3a2b07520567c7f8cec7c5d42f052d76"; + + meta = { + description = "Base16 encoding and decoding"; + license = with stdenv.lib.licenses; [ bsd3 free ]; + homepage = "https://github.com/goj/base16"; + }; + } ) {}; - + base16 = base16_1_0_0; - + base64url_0_0_1 = callPackage ( - { buildHex }: - buildHex { - name = "base64url"; - version = "0.0.1"; - sha256 = - "fab09b20e3f5db886725544cbcf875b8e73ec93363954eb8a1a9ed834aa8c1f9"; - - meta = { - description = "URL safe base64-compatible codec"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/dvv/base64url"; - }; - } + { buildHex }: + buildHex { + name = "base64url"; + version = "0.0.1"; + sha256 = + "fab09b20e3f5db886725544cbcf875b8e73ec93363954eb8a1a9ed834aa8c1f9"; + + meta = { + description = "URL safe base64-compatible codec"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/dvv/base64url"; + }; + } ) {}; - + base64url = base64url_0_0_1; - + bbmustache_1_0_4 = callPackage ( - { buildHex }: - buildHex { - name = "bbmustache"; - version = "1.0.4"; - sha256 = - "03b0d47db66e86df993896dce7578d7e4aae5f84636809b45fa8a3e34ee59b12"; - - meta = { - description = - "Binary pattern match Based Mustache template engine for Erlang/OTP"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/soranoba/bbmustache"; - }; - } + { buildHex }: + buildHex { + name = "bbmustache"; + version = "1.0.4"; + sha256 = + "03b0d47db66e86df993896dce7578d7e4aae5f84636809b45fa8a3e34ee59b12"; + + meta = { + description = + "Binary pattern match Based Mustache template engine for Erlang/OTP"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/soranoba/bbmustache"; + }; + } ) {}; - + bbmustache_1_1_0 = callPackage ( - { buildHex }: - buildHex { - name = "bbmustache"; - version = "1.1.0"; - sha256 = - "aa22469836bb8a9928ad741bdd2038d49116228bfbe0c2d6c792e1bdd4b256d9"; - - meta = { - description = - "Binary pattern match Based Mustache template engine for Erlang/OTP"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/soranoba/bbmustache"; - }; - } + { buildHex }: + buildHex { + name = "bbmustache"; + version = "1.1.0"; + sha256 = + "aa22469836bb8a9928ad741bdd2038d49116228bfbe0c2d6c792e1bdd4b256d9"; + + meta = { + description = + "Binary pattern match Based Mustache template engine for Erlang/OTP"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/soranoba/bbmustache"; + }; + } ) {}; - + bbmustache = bbmustache_1_1_0; - + bear_0_8_3 = callPackage ( - { buildHex }: - buildHex { - name = "bear"; - version = "0.8.3"; - sha256 = - "0a04ce4702e00e0a43c0fcdd63e38c9c7d64dceb32b27ffed261709e7c3861ad"; - - meta = { - description = "Statistics functions for Erlang"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/puzza007/bear"; - }; - } + { buildHex }: + buildHex { + name = "bear"; + version = "0.8.3"; + sha256 = + "0a04ce4702e00e0a43c0fcdd63e38c9c7d64dceb32b27ffed261709e7c3861ad"; + + meta = { + description = "Statistics functions for Erlang"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/puzza007/bear"; + }; + } ) {}; - + bear = bear_0_8_3; - + bstr_0_3_0 = callPackage ( - { buildHex }: - buildHex { - name = "bstr"; - version = "0.3.0"; - sha256 = - "0fb4e05619663d48dabcd21023915741277ba392f2a5710dde7ab6034760284d"; - - meta = { - description = "Erlang library that uses binaries as strings"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/jcomellas/bstr"; - }; - } + { buildHex }: + buildHex { + name = "bstr"; + version = "0.3.0"; + sha256 = + "0fb4e05619663d48dabcd21023915741277ba392f2a5710dde7ab6034760284d"; + + meta = { + description = "Erlang library that uses binaries as strings"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/jcomellas/bstr"; + }; + } ) {}; - + bstr = bstr_0_3_0; - - cache_tab_1_0_1 = callPackage - ( - { buildHex, p1_utils_1_0_1 }: - buildHex { - name = "cache_tab"; - version = "1.0.1"; - sha256 = - "717a91101e03535ab65e4a9ce028ae3f0ddfb4ce0fd4144bf8816082c6dc2933"; - - erlangDeps = [ p1_utils_1_0_1 ]; - - meta = { - description = "In-memory cache Erlang / Elixir library"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/processone/cache_tab"; - }; - } - ) {}; - - cache_tab = cache_tab_1_0_1; - - certifi_0_1_1 = callPackage - ( - { buildHex }: - buildHex { - name = "certifi"; - version = "0.1.1"; - sha256 = - "e6d1dda48fad1b1c5b454c8402e2ac375ae12bf85a9910decaf791f330a7de29"; - - meta = { - description = "An OTP library"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/certifi/erlang-certifi"; - }; - } - ) {}; - + certifi_0_3_0 = callPackage ( - { buildHex }: - buildHex { - name = "certifi"; - version = "0.3.0"; - sha256 = - "42ae85fe91c038a634a5fb8d0c77f4fc581914c508f087c7138e9366a1517f6a"; - - meta = { - description = "An OTP library"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/certifi/erlang-certifi"; - }; - } + { buildHex }: + buildHex { + name = "certifi"; + version = "0.3.0"; + sha256 = + "42ae85fe91c038a634a5fb8d0c77f4fc581914c508f087c7138e9366a1517f6a"; + + meta = { + description = "An OTP library"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/certifi/erlang-certifi"; + }; + } ) {}; - + certifi = certifi_0_3_0; - + cf_0_1_2 = callPackage ( - { buildHex }: - buildHex { - name = "cf"; - version = "0.1.2"; - sha256 = - "c86f56bca74dd3616057b28574d920973fe665ecb064aa458dc6a2447f3f4924"; - - meta = { - description = "Terminal colour helper"; - license = stdenv.lib.licenses.mit; - }; - } + { buildHex }: + buildHex { + name = "cf"; + version = "0.1.2"; + sha256 = + "c86f56bca74dd3616057b28574d920973fe665ecb064aa458dc6a2447f3f4924"; + + meta = { + description = "Terminal colour helper"; + license = stdenv.lib.licenses.mit; + }; + } ) {}; - + cf_0_2_1 = callPackage ( - { buildHex }: - buildHex { - name = "cf"; - version = "0.2.1"; - sha256 = - "baee9aa7ec2dfa3cb4486b67211177caa293f876780f0b313b45718edef6a0a5"; - - meta = { - description = "Terminal colour helper"; - license = stdenv.lib.licenses.mit; - }; - } + { buildHex }: + buildHex { + name = "cf"; + version = "0.2.1"; + sha256 = + "baee9aa7ec2dfa3cb4486b67211177caa293f876780f0b313b45718edef6a0a5"; + + meta = { + description = "Terminal colour helper"; + license = stdenv.lib.licenses.mit; + }; + } ) {}; - + cf = cf_0_2_1; - - cmark_0_6_2 = callPackage - ( - { buildHex }: - buildHex { - name = "cmark"; - version = "0.6.2"; - sha256 = - "c17bbc354864cc8dfd352c772eb1655a5c67718c76d76df0aaf6179a833c76ef"; - compilePort = true; - - meta = { - longDescription = ''Elixir NIF for cmark (C), a parser library - following the CommonMark spec, a compatible - implementation of Markdown.''; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/asaaki/cmark.ex"; - }; - } - ) {}; - - cmark = cmark_0_6_2; - - comeonin_2_0_1 = callPackage - ( - { buildHex }: - buildHex { - name = "comeonin"; - version = "2.0.1"; - sha256 = - "7f7468625058ab1b817c00efa473d8117b0113a73a429f25cf663d5e2416572f"; - compilePort = true; - - meta = { - description = - "Password hashing (bcrypt, pbkdf2_sha512) library for Elixir."; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/elixircnx/comeonin"; - }; - } - ) {}; - - comeonin = comeonin_2_0_1; - - couchbeam_1_2_1 = callPackage - ( - { buildHex, hackney_1_4_4, jsx_2_8_0 }: - buildHex { - name = "couchbeam"; - version = "1.2.1"; - sha256 = - "ed19f0412aa0539ecf622ac8ade1ca0e316f424e3334ad015a3fb8db19e91194"; - - erlangDeps = [ hackney_1_4_4 jsx_2_8_0 ]; - - meta = { - description = "Erlang CouchDB client"; - license = stdenv.lib.licenses.free; - }; - } - ) {}; - - couchbeam = couchbeam_1_2_1; - + cowlib_1_0_0 = callPackage ( - { buildHex }: - buildHex { - name = "cowlib"; - version = "1.0.0"; - sha256 = - "4dacd60356177ec8cf93dbff399de17435b613f3318202614d3d5acbccee1474"; - - meta = { - description = "Support library for manipulating Web protocols."; - license = stdenv.lib.licenses.isc; - homepage = "https://github.com/ninenines/cowlib"; - }; - } + { buildHex }: + buildHex { + name = "cowlib"; + version = "1.0.0"; + sha256 = + "4dacd60356177ec8cf93dbff399de17435b613f3318202614d3d5acbccee1474"; + + meta = { + description = "Support library for manipulating Web protocols."; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/ninenines/cowlib"; + }; + } ) {}; - + cowlib_1_0_2 = callPackage ( - { buildHex }: - buildHex { - name = "cowlib"; - version = "1.0.2"; - sha256 = - "db622da03aa039e6366ab953e31186cc8190d32905e33788a1acb22744e6abd2"; - - meta = { - description = "Support library for manipulating Web protocols."; - license = stdenv.lib.licenses.isc; - homepage = "https://github.com/ninenines/cowlib"; - }; - } + { buildHex }: + buildHex { + name = "cowlib"; + version = "1.0.2"; + sha256 = + "db622da03aa039e6366ab953e31186cc8190d32905e33788a1acb22744e6abd2"; + + meta = { + description = "Support library for manipulating Web protocols."; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/ninenines/cowlib"; + }; + } ) {}; - + cowlib_1_3_0 = callPackage ( - { buildHex }: - buildHex { - name = "cowlib"; - version = "1.3.0"; - sha256 = - "2b1ac020ec92e7a59cb7322779870c2d3adc7c904ecb3b9fa406f04dc9816b73"; - - meta = { - description = "Support library for manipulating Web protocols."; - license = stdenv.lib.licenses.isc; - homepage = "https://github.com/ninenines/cowlib"; - }; - } + { buildHex }: + buildHex { + name = "cowlib"; + version = "1.3.0"; + sha256 = + "2b1ac020ec92e7a59cb7322779870c2d3adc7c904ecb3b9fa406f04dc9816b73"; + + meta = { + description = "Support library for manipulating Web protocols."; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/ninenines/cowlib"; + }; + } ) {}; - + cowlib = cowlib_1_3_0; - + crc_0_3_0 = callPackage ( - { buildHex }: - buildHex { - name = "crc"; - version = "0.3.0"; - sha256 = - "23d7cb6a18cca461f46f5a0f341c74fd0a680cdae62460687f1a24f0a7faabd4"; - - meta = { - description = - "A library used to calculate CRC checksums for binary data"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/TattdCodeMonkey/crc"; - }; - } + { buildHex }: + buildHex { + name = "crc"; + version = "0.3.0"; + sha256 = + "23d7cb6a18cca461f46f5a0f341c74fd0a680cdae62460687f1a24f0a7faabd4"; + + meta = { + description = + "A library used to calculate CRC checksums for binary data"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/TattdCodeMonkey/crc"; + }; + } ) {}; - + crc = crc_0_3_0; - + crypto_rsassa_pss_1_0_0 = callPackage ( - { buildHex }: - buildHex { - name = "crypto_rsassa_pss"; - version = "1.0.0"; - sha256 = - "d8f48874dbef940a8954126249499714e702d8ae0a8f23230a6c2f4a92833313"; - - meta = { - description = - "RSASSA-PSS Public Key Cryptographic Signature Algorithm for Erlang"; - license = stdenv.lib.licenses.free; - homepage = - "https://github.com/potatosalad/erlang-crypto_rsassa_pss"; - }; - } + { buildHex }: + buildHex { + name = "crypto_rsassa_pss"; + version = "1.0.0"; + sha256 = + "d8f48874dbef940a8954126249499714e702d8ae0a8f23230a6c2f4a92833313"; + + meta = { + description = + "RSASSA-PSS Public Key Cryptographic Signature Algorithm for Erlang"; + license = stdenv.lib.licenses.free; + homepage = + "https://github.com/potatosalad/erlang-crypto_rsassa_pss"; + }; + } ) {}; - + crypto_rsassa_pss = crypto_rsassa_pss_1_0_0; - + cth_readable_1_2_0 = callPackage ( - { buildHex, cf_0_2_1 }: - buildHex { - name = "cth_readable"; - version = "1.2.0"; - sha256 = - "41dee2a37e0f266c590b3ea9542ca664e84ebc781a3949115eba658afc08026d"; - - erlangDeps = [ cf_0_2_1 ]; - - meta = { - description = "Common Test hooks for more readable logs"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/ferd/cth_readable"; - }; - } + { buildHex, cf_0_2_1 }: + buildHex { + name = "cth_readable"; + version = "1.2.0"; + sha256 = + "41dee2a37e0f266c590b3ea9542ca664e84ebc781a3949115eba658afc08026d"; + + erlangDeps = [ cf_0_2_1 ]; + + meta = { + description = "Common Test hooks for more readable logs"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/ferd/cth_readable"; + }; + } ) {}; - + cth_readable = cth_readable_1_2_0; - - cucumberl_0_0_6 = callPackage - ( - { buildHex }: - buildHex { - name = "cucumberl"; - version = "0.0.6"; - sha256 = - "3b9ea813997fd8c1e3d2b004e89288496dc21d2e5027f432e5900569d2c61cf3"; - - meta = { - description = "A pure-erlang implementation of Cucumber."; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/ericbmerritt/cucumberl"; - }; - } - ) {}; - - cucumberl = cucumberl_0_0_6; - - denrei_0_2_3 = callPackage - ( - { buildHex }: - buildHex { - name = "denrei"; - version = "0.2.3"; - sha256 = - "bc0e8cf7e085dda6027df83ef5d63c41b93988bcd7f3db7c68e4dad3cd599744"; - - meta = { - description = "Denrei - a lightweight Erlang messaging system."; - license = stdenv.lib.licenses.mit; - }; - } - ) {}; - - denrei = denrei_0_2_3; - + detergent_0_3_0 = callPackage ( - { buildHex }: - buildHex { - name = "detergent"; - version = "0.3.0"; - sha256 = - "510cfb5d35b4b344762f074b73c8696b4bdde654ea046b3365cf92760ae33362"; - - meta = { - description = "An emulsifying Erlang SOAP library"; - license = with stdenv.lib.licenses; [ unlicense bsd3 ]; - homepage = "https://github.com/devinus/detergent"; - }; - } + { buildHex }: + buildHex { + name = "detergent"; + version = "0.3.0"; + sha256 = + "510cfb5d35b4b344762f074b73c8696b4bdde654ea046b3365cf92760ae33362"; + + meta = { + description = "An emulsifying Erlang SOAP library"; + license = with stdenv.lib.licenses; [ unlicense bsd3 ]; + homepage = "https://github.com/devinus/detergent"; + }; + } ) {}; - + detergent = detergent_0_3_0; - + dflow_0_1_5 = callPackage ( - { buildHex }: - buildHex { - name = "dflow"; - version = "0.1.5"; - sha256 = - "f08e73f22d4c620ef5f358a0b40f8fe3b91219ca3922fbdbe7e42f1cb58f737e"; - - meta = { - description = "Pipelined flow processing engine"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/dalmatinerdb/dflow"; - }; - } + { buildHex }: + buildHex { + name = "dflow"; + version = "0.1.5"; + sha256 = + "f08e73f22d4c620ef5f358a0b40f8fe3b91219ca3922fbdbe7e42f1cb58f737e"; + + meta = { + description = "Pipelined flow processing engine"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/dalmatinerdb/dflow"; + }; + } ) {}; - + dflow = dflow_0_1_5; - + discount_0_7_0 = callPackage ( - { buildHex }: - buildHex { - name = "discount"; - version = "0.7.0"; - sha256 = - "a37b7890620f93aa2fae06eee364cd906991588bc8897e659f51634179519c97"; - - meta = { - description = "Elixir NIF for discount, a Markdown parser"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/asaaki/discount.ex"; - }; - } + { buildHex }: + buildHex { + name = "discount"; + version = "0.7.0"; + sha256 = + "a37b7890620f93aa2fae06eee364cd906991588bc8897e659f51634179519c97"; + + meta = { + description = "Elixir NIF for discount, a Markdown parser"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/asaaki/discount.ex"; + }; + } ) {}; - + discount = discount_0_7_0; - + dynamic_compile_1_0_0 = callPackage ( - { buildHex }: - buildHex { - name = "dynamic_compile"; - version = "1.0.0"; - sha256 = - "eb73d8e9a6334914f79c15ee8214acad9659c42222d49beda3e8b6f6789a980a"; - - meta = { - description = - "compile and load erlang modules from string input"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/okeuday/dynamic_compile"; - }; - } + { buildHex }: + buildHex { + name = "dynamic_compile"; + version = "1.0.0"; + sha256 = + "eb73d8e9a6334914f79c15ee8214acad9659c42222d49beda3e8b6f6789a980a"; + + meta = { + description = + "compile and load erlang modules from string input"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/okeuday/dynamic_compile"; + }; + } ) {}; - + dynamic_compile = dynamic_compile_1_0_0; - + econfig_0_7_1 = callPackage ( - { buildHex }: - buildHex { - name = "econfig"; - version = "0.7.1"; - sha256 = - "b11d68e3d288b5cb4bd34e668e03176c4ea42790c09f1f449cdbd46a649ea7f3"; - - meta = { - description = "simple Erlang config handler using INI files"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/benoitc/econfig"; - }; - } + { buildHex }: + buildHex { + name = "econfig"; + version = "0.7.1"; + sha256 = + "b11d68e3d288b5cb4bd34e668e03176c4ea42790c09f1f449cdbd46a649ea7f3"; + + meta = { + description = "simple Erlang config handler using INI files"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/benoitc/econfig"; + }; + } ) {}; - + econfig = econfig_0_7_1; - + edown_0_7_0 = callPackage ( - { buildHex }: - buildHex { - name = "edown"; - version = "0.7.0"; - sha256 = - "6d7365a7854cd724e8d1fd005f5faa4444eae6a87eb6df9b789b6e7f6f09110a"; - - meta = { - description = "Markdown generated from Edoc."; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/uwiger/edown"; - }; - } + { buildHex }: + buildHex { + name = "edown"; + version = "0.7.0"; + sha256 = + "6d7365a7854cd724e8d1fd005f5faa4444eae6a87eb6df9b789b6e7f6f09110a"; + + meta = { + description = "Markdown generated from Edoc."; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/uwiger/edown"; + }; + } ) {}; - + edown = edown_0_7_0; - + elixir_ale_0_4_1 = callPackage ( - { buildHex }: - buildHex { - name = "elixir_ale"; - version = "0.4.1"; - sha256 = - "2ee5c6989a8005a0ab8f1aea0b4f89b5feae75be78a70bade6627c3624c59c46"; - - meta = { - description = - "Elixir access to hardware I/O interfaces such as GPIO, I2C, and SPI."; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/fhunleth/elixir_ale"; - }; - } + { buildHex }: + buildHex { + name = "elixir_ale"; + version = "0.4.1"; + sha256 = + "2ee5c6989a8005a0ab8f1aea0b4f89b5feae75be78a70bade6627c3624c59c46"; + + meta = { + description = + "Elixir access to hardware I/O interfaces such as GPIO, I2C, and SPI."; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/fhunleth/elixir_ale"; + }; + } ) {}; - + elixir_ale = elixir_ale_0_4_1; - - elli_1_0_4 = callPackage - ( - { buildHex }: - buildHex { - name = "elli"; - version = "1.0.4"; - sha256 = - "87641b9c069b1372dac4e1bdda795076ea3142af78aac0d63896a38079e89e8e"; - - meta = { - description = - "Fast and robust web server for building high-throughput, low-latency apps"; - license = stdenv.lib.licenses.free; - }; - } - ) {}; - - elli = elli_1_0_4; - - enotify_0_1_0 = callPackage - ( - { buildHex }: - buildHex { - name = "enotify"; - version = "0.1.0"; - sha256 = - "8e48da763ce15bfd75cc857ddfe5011b03189d597f47bcdd8acc6fbbe8e6b6f4"; - compilePort = true; - - meta = { - description = "Filesystem listener"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/tsloughter/enotify"; - }; - } - ) {}; - - enotify = enotify_0_1_0; - + eper_0_94_0 = callPackage ( - { buildHex }: - buildHex { - name = "eper"; - version = "0.94.0"; - sha256 = - "8d853792fa61a7fd068fe9c113a8a44bc839e11ad70cb8d5d2884566e3bede39"; - - meta = { - longDescription = ''Erlang Performance and Debugging Tools sherk - - a profiler, similar to Linux oprofile or MacOs - shark gperf - a graphical performance monitor; - shows CPU, memory and network usage dtop - - similar to unix top redbug- similar to the OTP - dbg application, but safer, better etc.''; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/massemanet/eper"; - }; - } + { buildHex }: + buildHex { + name = "eper"; + version = "0.94.0"; + sha256 = + "8d853792fa61a7fd068fe9c113a8a44bc839e11ad70cb8d5d2884566e3bede39"; + + meta = { + longDescription = ''Erlang Performance and Debugging Tools sherk + - a profiler, similar to Linux oprofile or MacOs + shark gperf - a graphical performance monitor; + shows CPU, memory and network usage dtop - + similar to unix top redbug- similar to the OTP + dbg application, but safer, better etc.''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/massemanet/eper"; + }; + } ) {}; - + eper = eper_0_94_0; - + epgsql_3_1_1 = callPackage ( - { buildHex }: - buildHex { - name = "epgsql"; - version = "3.1.1"; - sha256 = - "4b3f478ad090aed7200b2a8c9f2d5ef45c3aaa167be896b5237bba4b40f461d8"; - - meta = { - description = "PostgreSQL Client"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/epgsql/epgsql"; - }; - } + { buildHex }: + buildHex { + name = "epgsql"; + version = "3.1.1"; + sha256 = + "4b3f478ad090aed7200b2a8c9f2d5ef45c3aaa167be896b5237bba4b40f461d8"; + + meta = { + description = "PostgreSQL Client"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/epgsql/epgsql"; + }; + } ) {}; - + epgsql = epgsql_3_1_1; - + episcina_1_1_0 = callPackage ( - { buildHex, gproc_0_3_1 }: - buildHex { - name = "episcina"; - version = "1.1.0"; - sha256 = - "16238717bfbc8cb226342f6b098bb1fafb48c7547265a10ad3e6e83899abc46f"; - - erlangDeps = [ gproc_0_3_1 ]; - - meta = { - description = "Erlang Connection Pool"; - license = stdenv.lib.licenses.free; - }; - } + { buildHex, gproc_0_3_1 }: + buildHex { + name = "episcina"; + version = "1.1.0"; + sha256 = + "16238717bfbc8cb226342f6b098bb1fafb48c7547265a10ad3e6e83899abc46f"; + + erlangDeps = [ gproc_0_3_1 ]; + + meta = { + description = "Erlang Connection Pool"; + license = stdenv.lib.licenses.free; + }; + } ) {}; - + episcina = episcina_1_1_0; - + eql_0_1_2 = callPackage ( - { buildHex }: - buildHex { - name = "eql"; - version = "0.1.2"; - sha256 = - "3b1a85c491d44262802058c0de97a2c90678d5d45851b88a076b1a45a8d6d4b3"; - - meta = { - description = "Erlang with SQL"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/artemeff/eql"; - }; - } + { buildHex }: + buildHex { + name = "eql"; + version = "0.1.2"; + sha256 = + "3b1a85c491d44262802058c0de97a2c90678d5d45851b88a076b1a45a8d6d4b3"; + + meta = { + description = "Erlang with SQL"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/artemeff/eql"; + }; + } ) {}; - + eql = eql_0_1_2; - + eredis_1_0_8 = callPackage ( - { buildHex }: - buildHex { - name = "eredis"; - version = "1.0.8"; - sha256 = - "f303533e72129b264a2d8217c4ddc977c7527ff4b8a6a55f92f62b7fcc099334"; - - meta = { - description = "Erlang Redis client"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/wooga/eredis"; - }; - } + { buildHex }: + buildHex { + name = "eredis"; + version = "1.0.8"; + sha256 = + "f303533e72129b264a2d8217c4ddc977c7527ff4b8a6a55f92f62b7fcc099334"; + + meta = { + description = "Erlang Redis client"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/wooga/eredis"; + }; + } ) {}; - + eredis = eredis_1_0_8; - - erlang_lua_0_1_0 = callPackage - ( - { buildHex }: - buildHex { - name = "erlang_lua"; - version = "0.1.0"; - sha256 = - "4376a57f86e43ae1d687dca8b6c7c7f692b95d30091a9550636328358026e6eb"; - compilePort = true; - - meta = { - longDescription = ''Erlang-lua hex package, using Erlang's Port - and C Node to run Lua VM as an external Node''; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/rtraschke/erlang-lua"; - }; - } - ) {}; - - erlang_lua = erlang_lua_0_1_0; - + erlang_term_1_4_0 = callPackage ( - { buildHex }: - buildHex { - name = "erlang_term"; - version = "1.4.0"; - sha256 = - "1a4d491dbd13b7a714815af10fc658948a5a440de23755a32b741ca07d8ba592"; - - meta = { - description = "Provide the in-memory size of Erlang terms"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/okeuday/erlang_term"; - }; - } + { buildHex }: + buildHex { + name = "erlang_term"; + version = "1.4.0"; + sha256 = + "1a4d491dbd13b7a714815af10fc658948a5a440de23755a32b741ca07d8ba592"; + + meta = { + description = "Provide the in-memory size of Erlang terms"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/erlang_term"; + }; + } ) {}; - + erlang_term_1_5_1 = callPackage ( - { buildHex }: - buildHex { - name = "erlang_term"; - version = "1.5.1"; - sha256 = - "88bae81a80306e82fd3fc43e2d8228049e666f3cfe4627687832cd7edb878e06"; - - meta = { - description = "Provide the in-memory size of Erlang terms"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/okeuday/erlang_term"; - }; - } + { buildHex }: + buildHex { + name = "erlang_term"; + version = "1.5.1"; + sha256 = + "88bae81a80306e82fd3fc43e2d8228049e666f3cfe4627687832cd7edb878e06"; + + meta = { + description = "Provide the in-memory size of Erlang terms"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/erlang_term"; + }; + } ) {}; - + erlang_term = erlang_term_1_5_1; - + erlang_version_0_2_0 = callPackage ( - { buildHex }: - buildHex { - name = "erlang_version"; - version = "0.2.0"; - sha256 = - "74daddba65a247ec57913e5de8f243af42bbbc3d6a0c411a1252da81c09ae661"; - - meta = { - description = "Retrieve Erlang/OTP version like `18.1'"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/sapporo-beam/erlang_version"; - }; - } + { buildHex }: + buildHex { + name = "erlang_version"; + version = "0.2.0"; + sha256 = + "74daddba65a247ec57913e5de8f243af42bbbc3d6a0c411a1252da81c09ae661"; + + meta = { + description = "Retrieve Erlang/OTP version like `18.1'"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/sapporo-beam/erlang_version"; + }; + } ) {}; - + erlang_version = erlang_version_0_2_0; - - erlaudio_0_2_3 = callPackage - ( - { buildHex }: - buildHex { - name = "erlaudio"; - version = "0.2.3"; - sha256 = - "cb9efb0ce80faae003ab39f8cc2d3fccbb4bd1c8f5f525aea392f28662517032"; - compilePort = true; - - meta = { - description = "Erlang audio bindings to portaudio"; - license = stdenv.lib.licenses.apsl20; - homepage = "https://github.com/asonge/erlaudio"; - }; - } - ) {}; - - erlaudio = erlaudio_0_2_3; - + erlcloud_0_11_0 = callPackage ( - { buildHex, jsx_2_6_2, lhttpc_1_3_0, meck_0_8_3 }: - buildHex { - name = "erlcloud"; - version = "0.11.0"; - sha256 = - "ca9876dab57ed8fb5fb75ab6ce11e59a346387d357d7a038a2e18d1d31a30716"; - - erlangDeps = [ jsx_2_6_2 lhttpc_1_3_0 meck_0_8_3 ]; - - meta = { - description = "Cloud Computing library for erlang"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/gleber/erlcloud"; - }; - } + { buildHex, jsx_2_6_2, lhttpc_1_3_0, meck_0_8_3 }: + buildHex { + name = "erlcloud"; + version = "0.11.0"; + sha256 = + "ca9876dab57ed8fb5fb75ab6ce11e59a346387d357d7a038a2e18d1d31a30716"; + + erlangDeps = [ jsx_2_6_2 lhttpc_1_3_0 meck_0_8_3 ]; + + meta = { + description = "Cloud Computing library for erlang"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/gleber/erlcloud"; + }; + } ) {}; - - erlcloud_0_12_0 = callPackage - ( - { buildHex, jsx_2_7_2, lhttpc_1_3_0, meck_0_8_3 }: - buildHex { - name = "erlcloud"; - version = "0.12.0"; - sha256 = - "2ff2631a4e405a645cedf2713ec66728023e93ac80ed47035554a7d6205d412d"; - - erlangDeps = [ jsx_2_7_2 lhttpc_1_3_0 meck_0_8_3 ]; - - meta = { - description = "Cloud Computing library for erlang"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/gleber/erlcloud"; - }; - } - ) {}; - - erlcloud = erlcloud_0_12_0; - + erldn_1_0_2 = callPackage ( - { buildHex }: - buildHex { - name = "erldn"; - version = "1.0.2"; - sha256 = - "51a721f1aac9c5fcc6abb0fa156a97ac8e033ee7cbee1624345ec6e47dfe0aa0"; - - meta = { - description = "An edn parser for the Erlang platform. + { buildHex }: + buildHex { + name = "erldn"; + version = "1.0.2"; + sha256 = + "51a721f1aac9c5fcc6abb0fa156a97ac8e033ee7cbee1624345ec6e47dfe0aa0"; + + meta = { + description = "An edn parser for the Erlang platform. "; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/marianoguerra/erldn"; - }; - } + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/marianoguerra/erldn"; + }; + } ) {}; - + erldn = erldn_1_0_2; - + erlexec_1_0_1 = callPackage ( - { buildHex }: - buildHex { - name = "erlexec"; - version = "1.0.1"; - sha256 = - "eb1e11f16288db4ea35af08503eabf1250d5540c1e8bd35ba04312f5f703e14f"; - compilePort = true; - - meta = { - description = "OS Process Manager"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/saleyn/erlexec"; - }; - } + { buildHex }: + buildHex { + name = "erlexec"; + version = "1.0.1"; + sha256 = + "eb1e11f16288db4ea35af08503eabf1250d5540c1e8bd35ba04312f5f703e14f"; + compilePorts = true; + + meta = { + description = "OS Process Manager"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/saleyn/erlexec"; + }; + } ) {}; - + erlexec = erlexec_1_0_1; - + erlsh_0_1_0 = callPackage ( - { buildHex }: - buildHex { - name = "erlsh"; - version = "0.1.0"; - sha256 = - "94ef1492dd59fef211f01ffd40c47b6e51c0f59e2a3d0739366e4890961332d9"; - compilePort = true; - - meta = { - longDescription = ''Family of functions and ports involving - interacting with the system shell, paths and - external programs.''; - license = stdenv.lib.licenses.free; - }; - } + { buildHex }: + buildHex { + name = "erlsh"; + version = "0.1.0"; + sha256 = + "94ef1492dd59fef211f01ffd40c47b6e51c0f59e2a3d0739366e4890961332d9"; + compilePorts = true; + + meta = { + longDescription = ''Family of functions and ports involving + interacting with the system shell, paths and + external programs.''; + license = stdenv.lib.licenses.free; + }; + } ) {}; - + erlsh = erlsh_0_1_0; - + erlsom_1_2_1 = callPackage ( - { buildHex }: - buildHex { - name = "erlsom"; - version = "1.2.1"; - sha256 = - "e8f4d1d83583df7d1db8346aa30b82a6599b93fcc4b2d9165007e02ed40e7cae"; - - meta = { - description = "erlsom XSD parser"; - license = stdenv.lib.licenses.free; - }; - } + { buildHex }: + buildHex { + name = "erlsom"; + version = "1.2.1"; + sha256 = + "e8f4d1d83583df7d1db8346aa30b82a6599b93fcc4b2d9165007e02ed40e7cae"; + + meta = { + description = "erlsom XSD parser"; + license = stdenv.lib.licenses.free; + }; + } ) {}; - + erlsom = erlsom_1_2_1; - + erlware_commons_0_18_0 = callPackage ( - { buildHex, cf_0_2_1 }: - buildHex { - name = "erlware_commons"; - version = "0.18.0"; - sha256 = - "e71dda7cd5dcf34c9d07255d49c67e1d229dd230c101fdb996820bcdb5b03c49"; - - erlangDeps = [ cf_0_2_1 ]; - - meta = { - description = "Additional standard library for Erlang"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/erlware/erlware_commons"; - }; - } + { buildHex, cf_0_2_1 }: + buildHex { + name = "erlware_commons"; + version = "0.18.0"; + sha256 = + "e71dda7cd5dcf34c9d07255d49c67e1d229dd230c101fdb996820bcdb5b03c49"; + + erlangDeps = [ cf_0_2_1 ]; + + meta = { + description = "Additional standard library for Erlang"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/erlware/erlware_commons"; + }; + } ) {}; - + erlware_commons = erlware_commons_0_18_0; - + erlzk_0_6_1 = callPackage ( - { buildHex }: - buildHex { - name = "erlzk"; - version = "0.6.1"; - sha256 = - "6bba045ad0b7beb566825b463ada2464929655ce01e291022c1efed81a674759"; - - meta = { - description = "A Pure Erlang ZooKeeper Client (no C dependency)"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/huaban/erlzk"; - }; - } + { buildHex }: + buildHex { + name = "erlzk"; + version = "0.6.1"; + sha256 = + "6bba045ad0b7beb566825b463ada2464929655ce01e291022c1efed81a674759"; + + meta = { + description = "A Pure Erlang ZooKeeper Client (no C dependency)"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/huaban/erlzk"; + }; + } ) {}; - + erlzk = erlzk_0_6_1; - + esel_0_1_2 = callPackage ( - { buildHex }: - buildHex { - name = "esel"; - version = "0.1.2"; - sha256 = - "874d1775c86d27d9e88486a37351ffc09f826ef062c8ea211e65d08e103f946c"; - - meta = { - description = "An wrapper around openssl"; - license = stdenv.lib.licenses.mit; - }; - } + { buildHex }: + buildHex { + name = "esel"; + version = "0.1.2"; + sha256 = + "874d1775c86d27d9e88486a37351ffc09f826ef062c8ea211e65d08e103f946c"; + + meta = { + description = "An wrapper around openssl"; + license = stdenv.lib.licenses.mit; + }; + } ) {}; - + esel = esel_0_1_2; - + esqlite_0_2_1 = callPackage ( - { buildHex }: - buildHex { - name = "esqlite"; - version = "0.2.1"; - sha256 = - "79f2d1d05e6e29e50228af794dac8900ce47dd60bc11fbf1279f924f83752689"; - compilePort = true; - - meta = { - description = "A Sqlite3 NIF"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/mmzeeman/esqlite"; - }; - } + { buildHex }: + buildHex { + name = "esqlite"; + version = "0.2.1"; + sha256 = + "79f2d1d05e6e29e50228af794dac8900ce47dd60bc11fbf1279f924f83752689"; + compilePorts = true; + + meta = { + description = "A Sqlite3 NIF"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/mmzeeman/esqlite"; + }; + } ) {}; - + esqlite = esqlite_0_2_1; - + eunit_formatters_0_3_1 = callPackage ( - { buildHex }: - buildHex { - name = "eunit_formatters"; - version = "0.3.1"; - sha256 = - "64a40741429b7aff149c605d5a6135a48046af394a7282074e6003b3b56ae931"; - - meta = { - description = "Better output for eunit suites"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/seancribbs/eunit_formatters"; - }; - } + { buildHex }: + buildHex { + name = "eunit_formatters"; + version = "0.3.1"; + sha256 = + "64a40741429b7aff149c605d5a6135a48046af394a7282074e6003b3b56ae931"; + + meta = { + description = "Better output for eunit suites"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/seancribbs/eunit_formatters"; + }; + } ) {}; - + eunit_formatters = eunit_formatters_0_3_1; - - ex_bitcask_0_1_0 = callPackage - ( - { buildHex }: - buildHex { - name = "ex_bitcask"; - version = "0.1.0"; - sha256 = - "dc771229aae3c07c31a5523303f0c4dbe3c700d5025a09dfcca9cc357222c463"; - compilePort = true; - - meta = { - longDescription = ''Elixir wrapper of Basho's Bitcask Key/Value - store. Bitcask as a Log-Structured Hash Table - for Fast Key/Value Data. ''; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/JonGretar/ExBitcask"; - }; - } - ) {}; - - ex_bitcask = ex_bitcask_0_1_0; - + exec_1_0_1 = callPackage ( - { buildHex }: - buildHex { - name = "exec"; - version = "1.0.1"; - sha256 = - "87c7ef2dea2bb503bb0eec8cb34776172999aecc6e12d90f7629796a7a3ccb1f"; - compilePort = true; - - meta = { - description = "OS Process Manager"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/saleyn/erlexec"; - }; - } + { buildHex }: + buildHex { + name = "exec"; + version = "1.0.1"; + sha256 = + "87c7ef2dea2bb503bb0eec8cb34776172999aecc6e12d90f7629796a7a3ccb1f"; + compilePorts = true; + + meta = { + description = "OS Process Manager"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/saleyn/erlexec"; + }; + } ) {}; - + exec = exec_1_0_1; - + exmerl_0_1_1 = callPackage ( - { buildHex }: - buildHex { - name = "exmerl"; - version = "0.1.1"; - sha256 = - "4bb5d6c1863c5e381b460416c9b517a211db9abd9abf0f32c99b07e128b842aa"; - - meta = { - description = - "An Elixir wrapper for parsing XML through the xmerl_* suite of modules + { buildHex }: + buildHex { + name = "exmerl"; + version = "0.1.1"; + sha256 = + "4bb5d6c1863c5e381b460416c9b517a211db9abd9abf0f32c99b07e128b842aa"; + + meta = { + description = + "An Elixir wrapper for parsing XML through the xmerl_* suite of modules "; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/pwoolcoc/exmerl"; - }; - } + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/pwoolcoc/exmerl"; + }; + } ) {}; - + exmerl = exmerl_0_1_1; - - fast_xml_1_1_2 = callPackage - ( - { buildHex, p1_utils_1_0_1 }: - buildHex { - name = "fast_xml"; - version = "1.1.2"; - sha256 = - "becac16805254bc8399558f0eb5d3ed733a1e3c0c511d9c7e95244f43626f9bf"; - compilePort = true; - erlangDeps = [ p1_utils_1_0_1 ]; - - meta = { - description = "Fast Expat based Erlang XML parsing library"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/processone/fast_xml"; - }; - } - ) {}; - - fast_xml = fast_xml_1_1_2; - + feeder_2_0_0 = callPackage ( - { buildHex }: - buildHex { - name = "feeder"; - version = "2.0.0"; - sha256 = - "9780c5f032d3480cf7d9fd71d3f0c5f73211e0d3a8d9cdabcb1327b3a4ff758e"; - - meta = { - description = "Stream parse RSS and Atom formatted XML feeds. + { buildHex }: + buildHex { + name = "feeder"; + version = "2.0.0"; + sha256 = + "9780c5f032d3480cf7d9fd71d3f0c5f73211e0d3a8d9cdabcb1327b3a4ff758e"; + + meta = { + description = "Stream parse RSS and Atom formatted XML feeds. "; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/michaelnisi/feeder"; - }; - } + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/michaelnisi/feeder"; + }; + } ) {}; - + feeder = feeder_2_0_0; - + fn_1_0_0 = callPackage ( - { buildHex }: - buildHex { - name = "fn"; - version = "1.0.0"; - sha256 = - "1433b353c8739bb28ac0d6826c9f6a05033f158e8c8195faf01a863668b3bbc7"; - - meta = { - description = "More functional Erlang"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/artemeff/fn"; - }; - } + { buildHex }: + buildHex { + name = "fn"; + version = "1.0.0"; + sha256 = + "1433b353c8739bb28ac0d6826c9f6a05033f158e8c8195faf01a863668b3bbc7"; + + meta = { + description = "More functional Erlang"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/artemeff/fn"; + }; + } ) {}; - + fn = fn_1_0_0; - + folsom_0_8_3 = callPackage ( - { buildHex, bear_0_8_3 }: - buildHex { - name = "folsom"; - version = "0.8.3"; - sha256 = - "afaa1ea4cd2a10a32242ac5d76fa7b17e98d202883859136b791d9a383b26820"; - - erlangDeps = [ bear_0_8_3 ]; - - meta = { - description = "Erlang based metrics system"; - license = stdenv.lib.licenses.free; - }; - } + { buildHex, bear_0_8_3 }: + buildHex { + name = "folsom"; + version = "0.8.3"; + sha256 = + "afaa1ea4cd2a10a32242ac5d76fa7b17e98d202883859136b791d9a383b26820"; + + erlangDeps = [ bear_0_8_3 ]; + + meta = { + description = "Erlang based metrics system"; + license = stdenv.lib.licenses.free; + }; + } ) {}; - + folsom = folsom_0_8_3; - + folsomite_1_2_8 = callPackage ( - { buildHex, folsom_0_8_3 }: - buildHex { - name = "folsomite"; - version = "1.2.8"; - sha256 = - "9ce64603cdffb8ad55e950142146b3fe05533020906a81aa9c2f524635d813dc"; - - erlangDeps = [ folsom_0_8_3 ]; - - meta = { - description = "Blow up your Graphite server with Folsom metrics"; - license = stdenv.lib.licenses.free; - }; - } + { buildHex, folsom_0_8_3 }: + buildHex { + name = "folsomite"; + version = "1.2.8"; + sha256 = + "9ce64603cdffb8ad55e950142146b3fe05533020906a81aa9c2f524635d813dc"; + + erlangDeps = [ folsom_0_8_3 ]; + + meta = { + description = "Blow up your Graphite server with Folsom metrics"; + license = stdenv.lib.licenses.free; + }; + } ) {}; - + folsomite = folsomite_1_2_8; - + + fqc_0_1_5 = callPackage + ( + { buildHex }: + buildHex { + name = "fqc"; + version = "0.1.5"; + sha256 = + "47536dec351a12e1cbe0bc3b52bfff3b0690b0aec660472b5cf49f812eb9aa4f"; + + meta = { + description = "FiFo EQC helper"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/project-fifo/fqc"; + }; + } + ) {}; + fs_0_9_2 = callPackage ( - { buildHex }: - buildHex { - name = "fs"; - version = "0.9.2"; - sha256 = - "9a00246e8af58cdf465ae7c48fd6fd7ba2e43300413dfcc25447ecd3bf76f0c1"; - compilePort = true; - - meta = { - description = "Erlang FileSystem Listener"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/synrc/fs"; - }; - } + { buildHex }: + buildHex { + name = "fs"; + version = "0.9.2"; + sha256 = + "9a00246e8af58cdf465ae7c48fd6fd7ba2e43300413dfcc25447ecd3bf76f0c1"; + compilePorts = true; + + meta = { + description = "Erlang FileSystem Listener"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/synrc/fs"; + }; + } ) {}; - + fs = fs_0_9_2; - + fuse_2_0_0 = callPackage ( - { buildHex }: - buildHex { - name = "fuse"; - version = "2.0.0"; - sha256 = - "e2c55c0629ce418974165a65b342e54527333303d7e9c1f0493679144c9698cb"; - - meta = { - description = "A Circuit breaker implementation for Erlang"; - license = stdenv.lib.licenses.free; - }; - } + { buildHex }: + buildHex { + name = "fuse"; + version = "2.0.0"; + sha256 = + "e2c55c0629ce418974165a65b342e54527333303d7e9c1f0493679144c9698cb"; + + meta = { + description = "A Circuit breaker implementation for Erlang"; + license = stdenv.lib.licenses.free; + }; + } ) {}; - + fuse = fuse_2_0_0; - + gen_listener_tcp_0_3_2 = callPackage ( - { buildHex }: - buildHex { - name = "gen_listener_tcp"; - version = "0.3.2"; - sha256 = - "b3c3fbc525ba2b32d947b06811d38470d5b0abe2ca81b623192a71539ed22336"; - - meta = { - description = "Generic TCP Server"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/travelping/gen_listener_tcp"; - }; - } + { buildHex }: + buildHex { + name = "gen_listener_tcp"; + version = "0.3.2"; + sha256 = + "b3c3fbc525ba2b32d947b06811d38470d5b0abe2ca81b623192a71539ed22336"; + + meta = { + description = "Generic TCP Server"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/travelping/gen_listener_tcp"; + }; + } ) {}; - + gen_listener_tcp = gen_listener_tcp_0_3_2; - + gen_smtp_0_9_0 = callPackage ( - { buildHex }: - buildHex { - name = "gen_smtp"; - version = "0.9.0"; - sha256 = - "5a05f23a7cbe0c6242d290b445c6bbc0c287e3d0e09d3fcdc6bcd2c8973b6688"; - - meta = { - longDescription = ''A generic Erlang SMTP server framework that - can be extended via callback modules in the OTP - style. ''; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/Vagabond/gen_smtp"; - }; - } + { buildHex }: + buildHex { + name = "gen_smtp"; + version = "0.9.0"; + sha256 = + "5a05f23a7cbe0c6242d290b445c6bbc0c287e3d0e09d3fcdc6bcd2c8973b6688"; + + meta = { + longDescription = ''A generic Erlang SMTP server framework that + can be extended via callback modules in the OTP + style. ''; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/Vagabond/gen_smtp"; + }; + } ) {}; - + gen_smtp = gen_smtp_0_9_0; - + getopt_0_8_2 = callPackage ( - { buildHex }: - buildHex { - name = "getopt"; - version = "0.8.2"; - sha256 = - "736e6db3679fbbad46373efb96b69509f8e420281635e9d92989af9f0a0483f7"; - - meta = { - description = "Command-line options parser for Erlang"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/jcomellas/getopt"; - }; - } + { buildHex }: + buildHex { + name = "getopt"; + version = "0.8.2"; + sha256 = + "736e6db3679fbbad46373efb96b69509f8e420281635e9d92989af9f0a0483f7"; + + meta = { + description = "Command-line options parser for Erlang"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/jcomellas/getopt"; + }; + } ) {}; - + getopt = getopt_0_8_2; - + goldrush_0_1_7 = callPackage ( - { buildHex }: - buildHex { - name = "goldrush"; - version = "0.1.7"; - sha256 = - "a94a74cd363ce5f4970ed8242c551ec62b71939db1bbfd2e030142cab25a4ffe"; - - meta = { - description = - "Small, Fast event processing and monitoring for Erlang/OTP applications. + { buildHex }: + buildHex { + name = "goldrush"; + version = "0.1.7"; + sha256 = + "a94a74cd363ce5f4970ed8242c551ec62b71939db1bbfd2e030142cab25a4ffe"; + + meta = { + description = + "Small, Fast event processing and monitoring for Erlang/OTP applications. "; - license = stdenv.lib.licenses.isc; - homepage = "https://github.com/DeadZen/goldrush"; - }; - } + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/DeadZen/goldrush"; + }; + } ) {}; - + goldrush = goldrush_0_1_7; - + gproc_0_3_1 = callPackage ( - { buildHex }: - buildHex { - name = "gproc"; - version = "0.3.1"; - sha256 = - "3c449925a5cbf57cc40d13c6c282bc1080b5ed3bad97e1acdbe969fd63a65fce"; - - meta = { - longDescription = ''Gproc is a process dictionary for Erlang, - which provides a number of useful features - beyond what the built-in dictionary has: * Use - any term as a process alias * Register a process - under several aliases * Non-unique properties - can be registered simultaneously by many - processes * QLC and match specification - interface for efficient queries on the - dictionary * Await registration, let's you wait - until a process registers itself * Atomically - give away registered names and properties to - another process * Counters, and aggregated - counters, which automatically maintain the total - of all counters with a given name * Global - registry, with all the above functions applied - to a network of nodes''; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/uwiger/gproc"; - }; - } + { buildHex }: + buildHex { + name = "gproc"; + version = "0.3.1"; + sha256 = + "3c449925a5cbf57cc40d13c6c282bc1080b5ed3bad97e1acdbe969fd63a65fce"; + + meta = { + longDescription = ''Gproc is a process dictionary for Erlang, + which provides a number of useful features + beyond what the built-in dictionary has: * Use + any term as a process alias * Register a process + under several aliases * Non-unique properties + can be registered simultaneously by many + processes * QLC and match specification + interface for efficient queries on the + dictionary * Await registration, let's you wait + until a process registers itself * Atomically + give away registered names and properties to + another process * Counters, and aggregated + counters, which automatically maintain the total + of all counters with a given name * Global + registry, with all the above functions applied + to a network of nodes''; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/uwiger/gproc"; + }; + } ) {}; - + gproc_0_5_0 = callPackage ( - { buildHex }: - buildHex { - name = "gproc"; - version = "0.5.0"; - sha256 = - "5bc0fa4e999a6665b92ce57a7f12d7e9d1c26bfc39b0f657994be05cd3818b18"; - - meta = { - longDescription = ''Gproc is a process dictionary for Erlang, - which provides a number of useful features - beyond what the built-in dictionary has: * Use - any term as a process alias * Register a process - under several aliases * Non-unique properties - can be registered simultaneously by many - processes * QLC and match specification - interface for efficient queries on the - dictionary * Await registration, let's you wait - until a process registers itself * Atomically - give away registered names and properties to - another process * Counters, and aggregated - counters, which automatically maintain the total - of all counters with a given name * Global - registry, with all the above functions applied - to a network of nodes''; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/uwiger/gproc"; - }; - } + { buildHex }: + buildHex { + name = "gproc"; + version = "0.5.0"; + sha256 = + "5bc0fa4e999a6665b92ce57a7f12d7e9d1c26bfc39b0f657994be05cd3818b18"; + + meta = { + longDescription = ''Gproc is a process dictionary for Erlang, + which provides a number of useful features + beyond what the built-in dictionary has: * Use + any term as a process alias * Register a process + under several aliases * Non-unique properties + can be registered simultaneously by many + processes * QLC and match specification + interface for efficient queries on the + dictionary * Await registration, let's you wait + until a process registers itself * Atomically + give away registered names and properties to + another process * Counters, and aggregated + counters, which automatically maintain the total + of all counters with a given name * Global + registry, with all the above functions applied + to a network of nodes''; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/uwiger/gproc"; + }; + } ) {}; - + gproc = gproc_0_5_0; - + gurka_0_1_7 = callPackage ( - { buildHex }: - buildHex { - name = "gurka"; - version = "0.1.7"; - sha256 = - "b46c96446f46a53411a3b45d126ec19e724178818206ca1d2dd16abff28df6b5"; - - meta = { - description = "Erlang implementation of Cucumber"; - license = stdenv.lib.licenses.mit; - }; - } + { buildHex }: + buildHex { + name = "gurka"; + version = "0.1.7"; + sha256 = + "b46c96446f46a53411a3b45d126ec19e724178818206ca1d2dd16abff28df6b5"; + + meta = { + description = "Erlang implementation of Cucumber"; + license = stdenv.lib.licenses.mit; + }; + } ) {}; - + gurka = gurka_0_1_7; - - hackney_1_4_4 = callPackage - ( - { - buildHex, - certifi_0_1_1, - idna_1_0_2, - mimerl_1_0_0, - ssl_verify_hostname_1_0_5 - }: - buildHex { - name = "hackney"; - version = "1.4.4"; - sha256 = - "c8ab2436556d6bce7e85a85adec67f6abeb8c7508668a3e29750be3c4bf4e3a8"; - - erlangDeps = [ - certifi_0_1_1 - idna_1_0_2 - mimerl_1_0_0 - ssl_verify_hostname_1_0_5 - ]; - - meta = { - description = "simple HTTP client"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/benoitc/hackney"; - }; - } - ) {}; - + hamcrest_0_1_1 = callPackage ( - { buildHex }: - buildHex { - name = "hamcrest"; - version = "0.1.1"; - sha256 = - "5207b83e8d3168b9cbbeb3b4c4d83817a38a05f55478510e9c4db83ef83fa0ca"; - - meta = { - description = "Erlang port of Hamcrest"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/hyperthunk/hamcrest-erlang"; - }; - } + { buildHex }: + buildHex { + name = "hamcrest"; + version = "0.1.1"; + sha256 = + "5207b83e8d3168b9cbbeb3b4c4d83817a38a05f55478510e9c4db83ef83fa0ca"; + + meta = { + description = "Erlang port of Hamcrest"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/hyperthunk/hamcrest-erlang"; + }; + } ) {}; - + hamcrest = hamcrest_0_1_1; - + hlc_2_0_0 = callPackage ( - { buildHex }: - buildHex { - name = "hlc"; - version = "2.0.0"; - sha256 = - "460ac04654e920e068d1fd17aec1f78b1879cc42ac7f3def7497f0d1cc5056ad"; - - meta = { - description = "hybrid logical clock"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/barrel-db/hlc"; - }; - } + { buildHex }: + buildHex { + name = "hlc"; + version = "2.0.0"; + sha256 = + "460ac04654e920e068d1fd17aec1f78b1879cc42ac7f3def7497f0d1cc5056ad"; + + meta = { + description = "hybrid logical clock"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/barrel-db/hlc"; + }; + } ) {}; - + hlc = hlc_2_0_0; - + hooks_1_1_1 = callPackage ( - { buildHex }: - buildHex { - name = "hooks"; - version = "1.1.1"; - sha256 = - "6834ad3a2a624a5ffd49e9cb146ff49ded423b67f31905b122d24128c72c5c85"; - - meta = { - description = "generic plugin & hook system"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/barrel-db/hooks"; - }; - } + { buildHex }: + buildHex { + name = "hooks"; + version = "1.1.1"; + sha256 = + "6834ad3a2a624a5ffd49e9cb146ff49ded423b67f31905b122d24128c72c5c85"; + + meta = { + description = "generic plugin & hook system"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/barrel-db/hooks"; + }; + } ) {}; - + hooks = hooks_1_1_1; - + http_signature_1_1_0 = callPackage ( - { buildHex }: - buildHex { - name = "http_signature"; - version = "1.1.0"; - sha256 = - "3e6036d9c29289ed0e35dd6f41821dec9061ce20aad3c4d35dcbae8c84eb3baa"; - - meta = { - description = - "Erlang and Elixir implementations of Joyent's HTTP Signature Scheme."; - license = stdenv.lib.licenses.free; - homepage = - "https://github.com/potatosalad/erlang-http_signature"; - }; - } + { buildHex }: + buildHex { + name = "http_signature"; + version = "1.1.0"; + sha256 = + "3e6036d9c29289ed0e35dd6f41821dec9061ce20aad3c4d35dcbae8c84eb3baa"; + + meta = { + description = + "Erlang and Elixir implementations of Joyent's HTTP Signature Scheme."; + license = stdenv.lib.licenses.free; + homepage = + "https://github.com/potatosalad/erlang-http_signature"; + }; + } ) {}; - + http_signature = http_signature_1_1_0; - + ibrowse_4_2_2 = callPackage ( - { buildHex }: - buildHex { - name = "ibrowse"; - version = "4.2.2"; - sha256 = - "b800cb7442bcc852c6832821e9d0a7098ff626e1415bddaeff4596640b31c0ae"; - - meta = { - description = "Erlang HTTP client application"; - license = with stdenv.lib.licenses; [ free bsd3 ]; - homepage = "https://github.com/cmullaparthi/ibrowse"; - }; - } + { buildHex }: + buildHex { + name = "ibrowse"; + version = "4.2.2"; + sha256 = + "b800cb7442bcc852c6832821e9d0a7098ff626e1415bddaeff4596640b31c0ae"; + + meta = { + description = "Erlang HTTP client application"; + license = with stdenv.lib.licenses; [ free bsd3 ]; + homepage = "https://github.com/cmullaparthi/ibrowse"; + }; + } ) {}; - + ibrowse = ibrowse_4_2_2; - + idna_1_0_2 = callPackage ( - { buildHex }: - buildHex { - name = "idna"; - version = "1.0.2"; - sha256 = - "a5d645e307aa4f67efe31682f720b7eaf431ab148b3d6fb66cbaf6314499610f"; - - meta = { - description = "A pure Erlang IDNA implementation"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/benoitc/erlang-idna"; - }; - } + { buildHex }: + buildHex { + name = "idna"; + version = "1.0.2"; + sha256 = + "a5d645e307aa4f67efe31682f720b7eaf431ab148b3d6fb66cbaf6314499610f"; + + meta = { + description = "A pure Erlang IDNA implementation"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/benoitc/erlang-idna"; + }; + } ) {}; - + idna_1_0_3 = callPackage ( - { buildHex }: - buildHex { - name = "idna"; - version = "1.0.3"; - sha256 = - "357d489a51112db4f216034406834f9172b3c0ff5a12f83fb28b25ca271541d1"; - - meta = { - description = "A pure Erlang IDNA implementation"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/benoitc/erlang-idna"; - }; - } + { buildHex }: + buildHex { + name = "idna"; + version = "1.0.3"; + sha256 = + "357d489a51112db4f216034406834f9172b3c0ff5a12f83fb28b25ca271541d1"; + + meta = { + description = "A pure Erlang IDNA implementation"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/benoitc/erlang-idna"; + }; + } ) {}; - + idna = idna_1_0_3; - - inaka_aleppo_0_9_5 = callPackage + + inaka_aleppo_0_9_6 = callPackage ( - { buildHex }: - buildHex { - name = "inaka_aleppo"; - version = "0.9.5"; - sha256 = - "58e65aa708a0aae828ad8072f521edca8ce19fc3373223180a348a27a3722eb4"; - - meta = { - description = "Aleppo: ALternative Erlang Pre-ProcessOr"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/inaka/aleppo"; - }; - } + { buildHex }: + buildHex { + name = "inaka_aleppo"; + version = "0.9.6"; + sha256 = + "774171dc84a300f63a15fe732773edf535d7414286890e961e754f1f794dbc85"; + + meta = { + description = "Aleppo: ALternative Erlang Pre-ProcessOr"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/inaka/aleppo"; + }; + } ) {}; - - inaka_aleppo = inaka_aleppo_0_9_5; - + + inaka_aleppo = inaka_aleppo_0_9_6; + inaka_mixer_0_1_5 = callPackage ( - { buildHex }: - buildHex { - name = "inaka_mixer"; - version = "0.1.5"; - sha256 = - "37af35b1c17a94a0cb643cba23cba2ca68d6fe51c3ad8337629d4c3c017cc912"; - - meta = { - description = "Mix in public functions from external modules"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/inaka/mixer"; - }; - } + { buildHex }: + buildHex { + name = "inaka_mixer"; + version = "0.1.5"; + sha256 = + "37af35b1c17a94a0cb643cba23cba2ca68d6fe51c3ad8337629d4c3c017cc912"; + + meta = { + description = "Mix in public functions from external modules"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/inaka/mixer"; + }; + } ) {}; - + inaka_mixer = inaka_mixer_0_1_5; - - jc_1_0_4 = callPackage + + jiffy_0_14_7 = callPackage ( - { buildHex }: - buildHex { - name = "jc"; - version = "1.0.4"; - sha256 = - "8bcfe202084109fc80fcf521e630466fc53cbb909aff4283bed43252664023df"; - - meta = { - description = "A simple, distributed, in-memory caching system"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/jr0senblum/jc"; - }; - } + { buildHex }: + buildHex { + name = "jiffy"; + version = "0.14.7"; + sha256 = + "2b3b0f7976dae9c8266036e0d7e0398b64ac5207e3beee4c57896e44b2c17e97"; + compilePorts = true; + + meta = { + description = "JSON Decoder/Encoder."; + license = with stdenv.lib.licenses; [ mit bsd3 ]; + homepage = "https://github.com/davisp/jiffy"; + }; + } ) {}; - - jc = jc_1_0_4; - + + jiffy = jiffy_0_14_7; + jsone_1_2_0 = callPackage ( - { buildHex }: - buildHex { - name = "jsone"; - version = "1.2.0"; - sha256 = - "a60e74284d3a923cde65c00a39dd4542fd7da7c22e8385c0378ad419c54b2e08"; - - meta = { - description = "Erlang JSON Library"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/sile/jsone"; - }; - } + { buildHex }: + buildHex { + name = "jsone"; + version = "1.2.0"; + sha256 = + "a60e74284d3a923cde65c00a39dd4542fd7da7c22e8385c0378ad419c54b2e08"; + + meta = { + description = "Erlang JSON Library"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/sile/jsone"; + }; + } ) {}; - + jsone = jsone_1_2_0; - + jsx_1_4_5 = callPackage ( - { buildHex }: - buildHex { - name = "jsx"; - version = "1.4.5"; - sha256 = - "ff5115611c5dd789cebe3addc07d18b86340f701c52ad063caba6fe8da3a489b"; - - meta = { - longDescription = ''an erlang application for consuming, - producing and manipulating json. inspired by - yajl''; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/talentdeficit/jsx"; - }; - } + { buildHex }: + buildHex { + name = "jsx"; + version = "1.4.5"; + sha256 = + "ff5115611c5dd789cebe3addc07d18b86340f701c52ad063caba6fe8da3a489b"; + + meta = { + longDescription = ''an erlang application for consuming, + producing and manipulating json. inspired by + yajl''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/talentdeficit/jsx"; + }; + } ) {}; - + jsx_2_2_0 = callPackage ( - { buildHex }: - buildHex { - name = "jsx"; - version = "2.2.0"; - sha256 = - "d0bbc1ef47fd2fed84e28faed66918cf9eceed03b7ded48a23076e716fdbc84f"; - - meta = { - longDescription = ''an erlang application for consuming, - producing and manipulating json. inspired by - yajl''; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/talentdeficit/jsx"; - }; - } + { buildHex }: + buildHex { + name = "jsx"; + version = "2.2.0"; + sha256 = + "d0bbc1ef47fd2fed84e28faed66918cf9eceed03b7ded48a23076e716fdbc84f"; + + meta = { + longDescription = ''an erlang application for consuming, + producing and manipulating json. inspired by + yajl''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/talentdeficit/jsx"; + }; + } ) {}; - + jsx_2_6_2 = callPackage ( - { buildHex }: - buildHex { - name = "jsx"; - version = "2.6.2"; - sha256 = - "6bfccb6461cc3c7d5cc63f3e69ffeb2f1f8de50eca5980065311c056a69a907f"; - - meta = { - longDescription = ''an erlang application for consuming, - producing and manipulating json. inspired by - yajl''; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/talentdeficit/jsx"; - }; - } + { buildHex }: + buildHex { + name = "jsx"; + version = "2.6.2"; + sha256 = + "6bfccb6461cc3c7d5cc63f3e69ffeb2f1f8de50eca5980065311c056a69a907f"; + + meta = { + longDescription = ''an erlang application for consuming, + producing and manipulating json. inspired by + yajl''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/talentdeficit/jsx"; + }; + } ) {}; - + jsx_2_7_1 = callPackage ( - { buildHex }: - buildHex { - name = "jsx"; - version = "2.7.1"; - sha256 = - "52d0e8bda0c8624bc59c3119236eb49bb66289702ea3d59ad76fd2a56cdf9089"; - - meta = { - longDescription = ''an erlang application for consuming, - producing and manipulating json. inspired by - yajl''; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/talentdeficit/jsx"; - }; - } + { buildHex }: + buildHex { + name = "jsx"; + version = "2.7.1"; + sha256 = + "52d0e8bda0c8624bc59c3119236eb49bb66289702ea3d59ad76fd2a56cdf9089"; + + meta = { + longDescription = ''an erlang application for consuming, + producing and manipulating json. inspired by + yajl''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/talentdeficit/jsx"; + }; + } ) {}; - - jsx_2_7_2 = callPackage - ( - { buildHex }: - buildHex { - name = "jsx"; - version = "2.7.2"; - sha256 = - "36ca4772c09d69efc9e069aec7327cbd57d53d56c9a2777d8fb3bf3c1eab6df3"; - - meta = { - longDescription = ''an erlang application for consuming, - producing and manipulating json. inspired by - yajl''; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/talentdeficit/jsx"; - }; - } - ) {}; - + jsx_2_8_0 = callPackage ( - { buildHex }: - buildHex { - name = "jsx"; - version = "2.8.0"; - sha256 = - "a8ba15d5bac2c48b2be1224a0542ad794538d79e2cc16841a4e24ca75f0f8378"; - - meta = { - longDescription = ''an erlang application for consuming, - producing and manipulating json. inspired by - yajl''; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/talentdeficit/jsx"; - }; - } + { buildHex }: + buildHex { + name = "jsx"; + version = "2.8.0"; + sha256 = + "a8ba15d5bac2c48b2be1224a0542ad794538d79e2cc16841a4e24ca75f0f8378"; + + meta = { + longDescription = ''an erlang application for consuming, + producing and manipulating json. inspired by + yajl''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/talentdeficit/jsx"; + }; + } ) {}; - + jsx = jsx_2_8_0; - + jsxd_0_1_10 = callPackage ( - { buildHex }: - buildHex { - name = "jsxd"; - version = "0.1.10"; - sha256 = - "f71a8238f08a1dee130e8959ff5343524891fa6531392667a5b911cead5f5082"; - - meta = { - description = - "jsx data structire traversing and modification library."; - license = stdenv.lib.licenses.cddl; - homepage = "https://github.com/Licenser/jsxd"; - }; - } + { buildHex }: + buildHex { + name = "jsxd"; + version = "0.1.10"; + sha256 = + "f71a8238f08a1dee130e8959ff5343524891fa6531392667a5b911cead5f5082"; + + meta = { + description = + "jsx data structire traversing and modification library."; + license = stdenv.lib.licenses.cddl; + homepage = "https://github.com/Licenser/jsxd"; + }; + } ) {}; - + jsxd = jsxd_0_1_10; - + jwalk_1_1_0 = callPackage ( - { buildHex }: - buildHex { - name = "jwalk"; - version = "1.1.0"; - sha256 = - "10c150910ba3539583887cb2b5c3f70d602138471e6f6b5c22498aa18ed654e1"; - - meta = { - longDescription = ''Helper module for working with Erlang - proplist, map, EEP-18 and mochijson-style - representations of JSON''; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/jr0senblum/jwalk"; - }; - } + { buildHex }: + buildHex { + name = "jwalk"; + version = "1.1.0"; + sha256 = + "10c150910ba3539583887cb2b5c3f70d602138471e6f6b5c22498aa18ed654e1"; + + meta = { + longDescription = ''Helper module for working with Erlang + proplist, map, EEP-18 and mochijson-style + representations of JSON''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/jr0senblum/jwalk"; + }; + } ) {}; - + jwalk = jwalk_1_1_0; - + jwt_0_1_1 = callPackage ( - { buildHex, base64url_0_0_1, jsx_2_8_0 }: - buildHex { - name = "jwt"; - version = "0.1.1"; - sha256 = - "abcff4a2a42af2b7b7bdf55eeb2b73ce2e3bef760750004e74bc5835d64d2188"; - - erlangDeps = [ base64url_0_0_1 jsx_2_8_0 ]; - - meta = { - description = "Erlang JWT library"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/artemeff/jwt"; - }; - } + { buildHex, base64url_0_0_1, jsx_2_8_0 }: + buildHex { + name = "jwt"; + version = "0.1.1"; + sha256 = + "abcff4a2a42af2b7b7bdf55eeb2b73ce2e3bef760750004e74bc5835d64d2188"; + + erlangDeps = [ base64url_0_0_1 jsx_2_8_0 ]; + + meta = { + description = "Erlang JWT library"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/artemeff/jwt"; + }; + } ) {}; - + jwt = jwt_0_1_1; - + key2value_1_4_0 = callPackage ( - { buildHex }: - buildHex { - name = "key2value"; - version = "1.4.0"; - sha256 = - "ad63453fcf54ab853581b78c6d2df56be41ea691ba4bc05920264c19f35a0ded"; - - meta = { - description = "Erlang 2-way Map"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/okeuday/key2value"; - }; - } + { buildHex }: + buildHex { + name = "key2value"; + version = "1.4.0"; + sha256 = + "ad63453fcf54ab853581b78c6d2df56be41ea691ba4bc05920264c19f35a0ded"; + + meta = { + description = "Erlang 2-way Map"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/key2value"; + }; + } ) {}; - + key2value_1_5_1 = callPackage ( - { buildHex }: - buildHex { - name = "key2value"; - version = "1.5.1"; - sha256 = - "2a40464b9f8ef62e8828d869ac8d2bf9135b4956d29ba4eb044e8522b2d35ffa"; - - meta = { - description = "Erlang 2-way Map"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/okeuday/key2value"; - }; - } + { buildHex }: + buildHex { + name = "key2value"; + version = "1.5.1"; + sha256 = + "2a40464b9f8ef62e8828d869ac8d2bf9135b4956d29ba4eb044e8522b2d35ffa"; + + meta = { + description = "Erlang 2-way Map"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/key2value"; + }; + } ) {}; - + key2value = key2value_1_5_1; - + keys1value_1_5_1 = callPackage ( - { buildHex }: - buildHex { - name = "keys1value"; - version = "1.5.1"; - sha256 = - "2385132be0903c170fe21e54a0c3e746a604777b66ee458bb6e5f25650d3354f"; - - meta = { - description = "Erlang Set Associative Map For Key Lists"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/okeuday/keys1value"; - }; - } + { buildHex }: + buildHex { + name = "keys1value"; + version = "1.5.1"; + sha256 = + "2385132be0903c170fe21e54a0c3e746a604777b66ee458bb6e5f25650d3354f"; + + meta = { + description = "Erlang Set Associative Map For Key Lists"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/keys1value"; + }; + } ) {}; - + keys1value = keys1value_1_5_1; - + lager_3_0_1 = callPackage ( - { buildHex, goldrush_0_1_7 }: - buildHex { - name = "lager"; - version = "3.0.1"; - sha256 = - "d32c9233105b72dc5c1f6a8fe9a33cc205ecccc359c4449950060cee5a329e35"; - - erlangDeps = [ goldrush_0_1_7 ]; - - meta = { - description = "Erlang logging framework"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/basho/lager"; - }; - } + { buildHex, goldrush_0_1_7 }: + buildHex { + name = "lager"; + version = "3.0.1"; + sha256 = + "d32c9233105b72dc5c1f6a8fe9a33cc205ecccc359c4449950060cee5a329e35"; + + erlangDeps = [ goldrush_0_1_7 ]; + + meta = { + description = "Erlang logging framework"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/basho/lager"; + }; + } ) {}; - + lager_3_0_2 = callPackage ( - { buildHex, goldrush_0_1_7 }: - buildHex { - name = "lager"; - version = "3.0.2"; - sha256 = - "527f3b233e01b6cb68780c14ef675ed08ec02247dc029cacecbb56c78dfca100"; - - erlangDeps = [ goldrush_0_1_7 ]; - - meta = { - description = "Erlang logging framework"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/basho/lager"; - }; - } + { buildHex, goldrush_0_1_7 }: + buildHex { + name = "lager"; + version = "3.0.2"; + sha256 = + "527f3b233e01b6cb68780c14ef675ed08ec02247dc029cacecbb56c78dfca100"; + + erlangDeps = [ goldrush_0_1_7 ]; + + meta = { + description = "Erlang logging framework"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/basho/lager"; + }; + } ) {}; - + lager = lager_3_0_2; - - + + lasse_1_1_0 = callPackage + ( + { buildHex }: + buildHex { + name = "lasse"; + version = "1.1.0"; + sha256 = + "53e70ea9031f7583331a9f9bdbb29da933e591e5c4cce521b4bf85c68e7f3385"; + + meta = { + description = "Lasse: Server-Sent Event handler for Cowboy."; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/inaka/lasse"; + }; + } + ) {}; + + lasse = lasse_1_1_0; + lhttpc_1_3_0 = callPackage ( - { buildHex }: - buildHex { - name = "lhttpc"; - version = "1.3.0"; - sha256 = - "ddd2bd4b85159bc987c954b14877168e6a3c3e516105702189776e97c50296a4"; - - meta = { - description = "Lightweight HTTP/1.1 client"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/talko/lhttpc"; - }; - } + { buildHex }: + buildHex { + name = "lhttpc"; + version = "1.3.0"; + sha256 = + "ddd2bd4b85159bc987c954b14877168e6a3c3e516105702189776e97c50296a4"; + + meta = { + description = "Lightweight HTTP/1.1 client"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/talko/lhttpc"; + }; + } ) {}; - + lhttpc = lhttpc_1_3_0; - + + libsnarlmatch_0_1_5 = callPackage + ( + { buildHex, fqc_0_1_5 }: + buildHex { + name = "libsnarlmatch"; + version = "0.1.5"; + sha256 = + "11410122ca7a0685c4a7df1795d7f5a1e7bf9c5f17096414402fd9d1f0e1ac04"; + + erlangDeps = [ fqc_0_1_5 ]; + + meta = { + description = "permission matcher library"; + license = stdenv.lib.licenses.cddl; + homepage = "https://github.com/project-fifo/libsnarlmatch"; + }; + } + ) {}; + libsnarlmatch_0_1_7 = callPackage ( - { buildHex }: - buildHex { - name = "libsnarlmatch"; - version = "0.1.7"; - sha256 = - "72e9bcf7968e75774393778146ac6596116f1c60136dd607ad249183684ee380"; - - meta = { - description = "permission matcher library"; - license = stdenv.lib.licenses.cddl; - homepage = "https://github.com/project-fifo/libsnarlmatch"; - }; - } + { buildHex }: + buildHex { + name = "libsnarlmatch"; + version = "0.1.7"; + sha256 = + "72e9bcf7968e75774393778146ac6596116f1c60136dd607ad249183684ee380"; + + meta = { + description = "permission matcher library"; + license = stdenv.lib.licenses.cddl; + homepage = "https://github.com/project-fifo/libsnarlmatch"; + }; + } ) {}; - + libsnarlmatch = libsnarlmatch_0_1_7; - + lru_1_3_1 = callPackage ( - { buildHex }: - buildHex { - name = "lru"; - version = "1.3.1"; - sha256 = - "cd6ac15c383d58cd2933df9cb918617b24b12b6e5fb24d94c4c8f200fd93f619"; - - meta = { - description = "implements a fixed-size LRU cache"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/barrel-db/erlang-lru"; - }; - } + { buildHex }: + buildHex { + name = "lru"; + version = "1.3.1"; + sha256 = + "cd6ac15c383d58cd2933df9cb918617b24b12b6e5fb24d94c4c8f200fd93f619"; + + meta = { + description = "implements a fixed-size LRU cache"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/barrel-db/erlang-lru"; + }; + } ) {}; - + lru = lru_1_3_1; - + lz4_0_2_2 = callPackage ( - { buildHex }: - buildHex { - name = "lz4"; - version = "0.2.2"; - sha256 = - "a59522221e7cdfe3792bf8b3bb21cfe7ac657790e5826201fa2c5d0bc7484a2d"; - compilePort = true; - - meta = { - description = "LZ4 bindings for Erlang"; - license = stdenv.lib.licenses.isc; - homepage = "https://github.com/szktty/erlang-lz4.git"; - }; - } + { buildHex }: + buildHex { + name = "lz4"; + version = "0.2.2"; + sha256 = + "a59522221e7cdfe3792bf8b3bb21cfe7ac657790e5826201fa2c5d0bc7484a2d"; + compilePorts = true; + + meta = { + description = "LZ4 bindings for Erlang"; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/szktty/erlang-lz4.git"; + }; + } ) {}; - + lz4 = lz4_0_2_2; - - mcrypt_0_1_0 = callPackage - ( - { buildHex }: - buildHex { - name = "mcrypt"; - version = "0.1.0"; - sha256 = - "508a35ba255190f80309dcabf9c81c88b86b9ec13af180627ad51b8e5cf2a4cd"; - compilePort = true; - - meta = { - description = "NIF wrapper around libmcrypt."; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/system76/elixir-mcrypt"; - }; - } - ) {}; - - mcrypt = mcrypt_0_1_0; - + mdns_server_0_2_0 = callPackage ( - { buildHex }: - buildHex { - name = "mdns_server"; - version = "0.2.0"; - sha256 = - "bc9465880e15e57033960ab6820258b87134bef69032210c67e53e3718e289d0"; - - meta = { - description = "mDNS service discovery server"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/Licenser/erlang-mdns-server"; - }; - } + { buildHex }: + buildHex { + name = "mdns_server"; + version = "0.2.0"; + sha256 = + "bc9465880e15e57033960ab6820258b87134bef69032210c67e53e3718e289d0"; + + meta = { + description = "mDNS service discovery server"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/Licenser/erlang-mdns-server"; + }; + } ) {}; - + mdns_server = mdns_server_0_2_0; - + mdns_server_lib_0_2_3 = callPackage ( - { buildHex, lager_3_0_2, mdns_server_0_2_0, ranch_1_1_0 }: - buildHex { - name = "mdns_server_lib"; - version = "0.2.3"; - sha256 = - "078775ccea5d768095716ca6bd82f657601203352495d9726f4cc080c8c07695"; - - erlangDeps = [ lager_3_0_2 mdns_server_0_2_0 ranch_1_1_0 ]; - - meta = { - description = - "server side for mdns client server implementation"; - license = stdenv.lib.licenses.cddl; - homepage = "https://github.com/Licenser/mdns_server_lib"; - }; - } + { buildHex, lager_3_0_2, mdns_server_0_2_0, ranch_1_1_0 }: + buildHex { + name = "mdns_server_lib"; + version = "0.2.3"; + sha256 = + "078775ccea5d768095716ca6bd82f657601203352495d9726f4cc080c8c07695"; + + erlangDeps = [ lager_3_0_2 mdns_server_0_2_0 ranch_1_1_0 ]; + + meta = { + description = + "server side for mdns client server implementation"; + license = stdenv.lib.licenses.cddl; + homepage = "https://github.com/Licenser/mdns_server_lib"; + }; + } ) {}; - + mdns_server_lib = mdns_server_lib_0_2_3; - + meck_0_8_3 = callPackage ( - { buildHex }: - buildHex { - name = "meck"; - version = "0.8.3"; - sha256 = - "53bd3873d0193d6b2b4a165cfc4b9ffc3934355c3ba19e88239ef6a027cc02b6"; - - meta = { - description = "A mocking framework for Erlang"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/eproxus/meck"; - }; - } + { buildHex }: + buildHex { + name = "meck"; + version = "0.8.3"; + sha256 = + "53bd3873d0193d6b2b4a165cfc4b9ffc3934355c3ba19e88239ef6a027cc02b6"; + + meta = { + description = "A mocking framework for Erlang"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/eproxus/meck"; + }; + } ) {}; - + meck_0_8_4 = callPackage ( - { buildHex }: - buildHex { - name = "meck"; - version = "0.8.4"; - sha256 = - "2cdfbd0edd8f62b3d2061efc03c0e490282dd2ea6de44e15d2006e83f4f8eead"; - - meta = { - description = "A mocking framework for Erlang"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/eproxus/meck"; - }; - } + { buildHex }: + buildHex { + name = "meck"; + version = "0.8.4"; + sha256 = + "2cdfbd0edd8f62b3d2061efc03c0e490282dd2ea6de44e15d2006e83f4f8eead"; + + meta = { + description = "A mocking framework for Erlang"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/eproxus/meck"; + }; + } ) {}; - + meck = meck_0_8_4; - + metrics_0_2_1 = callPackage ( - { buildHex }: - buildHex { - name = "metrics"; - version = "0.2.1"; - sha256 = - "1cccc3534fa5a7861a3dcc0414afba00a616937e82c95d6172a523a5d2e97c03"; - - meta = { - description = - "A generic interface to different metrics systems in Erlang."; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/benoitc/erlang-metrics"; - }; - } + { buildHex }: + buildHex { + name = "metrics"; + version = "0.2.1"; + sha256 = + "1cccc3534fa5a7861a3dcc0414afba00a616937e82c95d6172a523a5d2e97c03"; + + meta = { + description = + "A generic interface to different metrics systems in Erlang."; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/benoitc/erlang-metrics"; + }; + } ) {}; - + metrics = metrics_0_2_1; - - mimerl_1_0_0 = callPackage - ( - { buildHex }: - buildHex { - name = "mimerl"; - version = "1.0.0"; - sha256 = - "a30b01104a29bd3a363db8646e4ce0f7980f9ecd23a98707c46c3ced918c41b4"; - - meta = { - description = "Library to handle mimetypes"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/benoitc/mimerl"; - }; - } - ) {}; - + mimerl_1_0_2 = callPackage ( - { buildHex }: - buildHex { - name = "mimerl"; - version = "1.0.2"; - sha256 = - "7a4c8e1115a2732a67d7624e28cf6c9f30c66711a9e92928e745c255887ba465"; - - meta = { - description = "Library to handle mimetypes"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/benoitc/mimerl"; - }; - } + { buildHex }: + buildHex { + name = "mimerl"; + version = "1.0.2"; + sha256 = + "7a4c8e1115a2732a67d7624e28cf6c9f30c66711a9e92928e745c255887ba465"; + + meta = { + description = "Library to handle mimetypes"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/benoitc/mimerl"; + }; + } ) {}; - + mimerl_1_1_0 = callPackage ( - { buildHex }: - buildHex { - name = "mimerl"; - version = "1.1.0"; - sha256 = - "def0f1922a5dcdeeee6e4f41139b364e7f0f40239774b528a0986b12bcb42ddc"; - - meta = { - description = "Library to handle mimetypes"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/benoitc/mimerl"; - }; - } + { buildHex }: + buildHex { + name = "mimerl"; + version = "1.1.0"; + sha256 = + "def0f1922a5dcdeeee6e4f41139b364e7f0f40239774b528a0986b12bcb42ddc"; + + meta = { + description = "Library to handle mimetypes"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/benoitc/mimerl"; + }; + } ) {}; - + mimerl = mimerl_1_1_0; - + mochiweb_2_12_2 = callPackage ( - { buildHex }: - buildHex { - name = "mochiweb"; - version = "2.12.2"; - sha256 = - "d3e681d4054b74a96cf2efcd09e94157ab83a5f55ddc4ce69f90b8144673bd7a"; - - meta = { - description = - "MochiWeb is an Erlang library for building lightweight HTTP servers. + { buildHex }: + buildHex { + name = "mochiweb"; + version = "2.12.2"; + sha256 = + "d3e681d4054b74a96cf2efcd09e94157ab83a5f55ddc4ce69f90b8144673bd7a"; + + meta = { + description = + "MochiWeb is an Erlang library for building lightweight HTTP servers. "; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/mochi/mochiweb"; - }; - } + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/mochi/mochiweb"; + }; + } ) {}; - + mochiweb = mochiweb_2_12_2; - + mtx_1_0_0 = callPackage ( - { buildHex }: - buildHex { - name = "mtx"; - version = "1.0.0"; - sha256 = - "3bdcb209fe3cdfc5a6b5b95f619ecd123b7ee1d9203ace2178c8ff73be5bb90f"; - - meta = { - description = "Metrics Client"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/synrc/mtx"; - }; - } + { buildHex }: + buildHex { + name = "mtx"; + version = "1.0.0"; + sha256 = + "3bdcb209fe3cdfc5a6b5b95f619ecd123b7ee1d9203ace2178c8ff73be5bb90f"; + + meta = { + description = "Metrics Client"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/synrc/mtx"; + }; + } ) {}; - + mtx = mtx_1_0_0; - - nacl_0_3_0 = callPackage - ( - { buildHex }: - buildHex { - name = "nacl"; - version = "0.3.0"; - sha256 = - "83a626d0ddd17a9c9528aa57a79e0e19746a42def007bc48c4984f0905098a7b"; - compilePort = true; - - meta = { - description = "Erlang-NaCl hex package"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/tonyg/erlang-nacl"; - }; - } - ) {}; - - nacl = nacl_0_3_0; - - neotoma_1_7_3 = callPackage - ( - { buildHex }: - buildHex { - name = "neotoma"; - version = "1.7.3"; - sha256 = - "2da322b9b1567ffa0706a7f30f6bbbde70835ae44a1050615f4b4a3d436e0f28"; - - meta = { - description = "PEG/Packrat toolkit and parser-generator."; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/seancribbs/neotoma"; - }; - } - ) {}; - - neotoma = neotoma_1_7_3; - - observer_cli_1_0_3 = callPackage - ( - { buildHex, recon_2_2_1 }: - buildHex { - name = "observer_cli"; - version = "1.0.3"; - sha256 = - "18e5d9aa5412ec063cf9719bcfe73bf990c5fed5c9a3c8422c2b5d9529fc8b0d"; - - erlangDeps = [ recon_2_2_1 ]; - - meta = { - description = "Visualize Erlang Nodes On The Command Line"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/zhongwencool/observer_cli"; - }; - } - ) {}; - - observer_cli = observer_cli_1_0_3; - - p1_stringprep_1_0_0 = callPackage - ( - { buildHex, p1_utils_1_0_1 }: - buildHex { - name = "p1_stringprep"; - version = "1.0.0"; - sha256 = - "2a9ce90acb64089f0a34cc592690b398830a5b6fd3c8a84689af5d2feb85d876"; - compilePort = true; - erlangDeps = [ p1_utils_1_0_1 ]; - - meta = { - description = "Fast Stringprep Erlang / Elixir implementation"; - license = with stdenv.lib.licenses; [ asl20 free ]; - homepage = "https://github.com/processone/stringprep"; - }; - } - ) {}; - - p1_stringprep = p1_stringprep_1_0_0; - - p1_utils_1_0_0 = callPackage - ( - { buildHex }: - buildHex { - name = "p1_utils"; - version = "1.0.0"; - sha256 = - "b2c6316286b071f2f667fb1c59b44fe0c996917515fa93374a4a3264affc5105"; - - meta = { - description = "Erlang utility modules from ProcessOne"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/processone/p1_utils"; - }; - } - ) {}; - - p1_utils_1_0_1 = callPackage - ( - { buildHex }: - buildHex { - name = "p1_utils"; - version = "1.0.1"; - sha256 = - "8e19478439c3ef05229fbd4fb65ff2e4aee02458a9c2b86a103a7f1384b76fdb"; - - meta = { - description = "Erlang utility modules from ProcessOne"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/processone/p1_utils"; - }; - } - ) {}; - - p1_utils_1_0_2 = callPackage - ( - { buildHex }: - buildHex { - name = "p1_utils"; - version = "1.0.2"; - sha256 = - "c4b770fd925f2fc6c301a1e27f1bfb77aff3fff8d0951cc56c06bef9835af918"; - - meta = { - description = "Erlang utility modules from ProcessOne"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/processone/p1_utils"; - }; - } - ) {}; - - p1_utils_1_0_3 = callPackage - ( - { buildHex }: - buildHex { - name = "p1_utils"; - version = "1.0.3"; - sha256 = - "6bf7dc7108eee70e036ea745faf5f55b4354e267f14371ea13338f58ce402d5e"; - - meta = { - description = "Erlang utility modules from ProcessOne"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/processone/p1_utils"; - }; - } - ) {}; - - p1_utils = p1_utils_1_0_3; - - p1_xml_1_1_1 = callPackage - ( - { buildHex, p1_utils_1_0_0 }: - buildHex { - name = "p1_xml"; - version = "1.1.1"; - sha256 = - "ab68956163cc5ff8c749c503507a36c543841259e78c58a2bbe0ebe76a0b7ce3"; - compilePort = true; - erlangDeps = [ p1_utils_1_0_0 ]; - - meta = { - description = - "XML parsing library. Now obsolete. Use fast_xml instead"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/processone/xml"; - }; - } - ) {}; - - p1_xml = p1_xml_1_1_1; - + pc_1_2_0 = callPackage ( - { buildHex }: - buildHex { - name = "pc"; - version = "1.2.0"; - sha256 = - "ef0f59d26a25af0a5247ef1a06d28d8300f8624647b02dc521ac79a7eceb8883"; - - meta = { - description = "a rebar3 port compiler for native code"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/blt/port_compiler"; - }; - } + { buildHex }: + buildHex { + name = "pc"; + version = "1.2.0"; + sha256 = + "ef0f59d26a25af0a5247ef1a06d28d8300f8624647b02dc521ac79a7eceb8883"; + + meta = { + description = "a rebar3 port compiler for native code"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/blt/port_compiler"; + }; + } ) {}; - + pc = pc_1_2_0; - - picosat_0_1_0 = callPackage - ( - { buildHex }: - buildHex { - name = "picosat"; - version = "0.1.0"; - sha256 = - "d9bfa31240906306a6dae6bdd6fb1cb452e9462a391efa63017b17b2877cab51"; - compilePort = true; - - meta = { - description = "Erlang bindings for PicoSAT"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/tsloughter/picosat"; - }; - } - ) {}; - - picosat = picosat_0_1_0; - - png_0_1_1 = callPackage - ( - { buildHex }: - buildHex { - name = "png"; - version = "0.1.1"; - sha256 = - "f8d4a17c118dcc16bb18d0fda6e26947001f9312bc6c061d2236b424fc3dd9ea"; - - meta = { - longDescription = ''A pure Erlang library for creating PNG - images. It can currently create 8 and 16 bit - RGB, RGB with alpha, indexed, grayscale and - grayscale with alpha images.''; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/yuce/png"; - }; - } - ) {}; - - png = png_0_1_1; - + poolboy_1_5_1 = callPackage ( - { buildHex }: - buildHex { - name = "poolboy"; - version = "1.5.1"; - sha256 = - "8f7168911120e13419e086e78d20e4d1a6776f1eee2411ac9f790af10813389f"; - - meta = { - description = "A hunky Erlang worker pool factory"; - license = with stdenv.lib.licenses; [ unlicense asl20 ]; - homepage = "https://github.com/devinus/poolboy"; - }; - } + { buildHex }: + buildHex { + name = "poolboy"; + version = "1.5.1"; + sha256 = + "8f7168911120e13419e086e78d20e4d1a6776f1eee2411ac9f790af10813389f"; + + meta = { + description = "A hunky Erlang worker pool factory"; + license = with stdenv.lib.licenses; [ unlicense asl20 ]; + homepage = "https://github.com/devinus/poolboy"; + }; + } ) {}; - + poolboy = poolboy_1_5_1; - + pooler_1_5_0 = callPackage ( - { buildHex }: - buildHex { - name = "pooler"; - version = "1.5.0"; - sha256 = - "f493b4b947967fa4250dd1f96e86a5440ecab51da114d2c256cced58ad991908"; - - meta = { - description = "An OTP Process Pool Application"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/seth/pooler"; - }; - } + { buildHex }: + buildHex { + name = "pooler"; + version = "1.5.0"; + sha256 = + "f493b4b947967fa4250dd1f96e86a5440ecab51da114d2c256cced58ad991908"; + + meta = { + description = "An OTP Process Pool Application"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/seth/pooler"; + }; + } ) {}; - + pooler = pooler_1_5_0; - + pot_0_9_3 = callPackage ( - { buildHex }: - buildHex { - name = "pot"; - version = "0.9.3"; - sha256 = - "752d2605c15605cd455cb3514b1ce329309eb61dfa88397dce49772dac9ad581"; - - meta = { - description = "One Time Passwords for Erlang"; - license = stdenv.lib.licenses.free; - }; - } + { buildHex }: + buildHex { + name = "pot"; + version = "0.9.3"; + sha256 = + "752d2605c15605cd455cb3514b1ce329309eb61dfa88397dce49772dac9ad581"; + + meta = { + description = "One Time Passwords for Erlang"; + license = stdenv.lib.licenses.free; + }; + } ) {}; - + pot = pot_0_9_3; - + pqueue_1_5_1 = callPackage ( - { buildHex }: - buildHex { - name = "pqueue"; - version = "1.5.1"; - sha256 = - "7ba01afe6b50ea4b239fa770f9e2c2db4871b3927ac44aea180d1fd52601b317"; - - meta = { - description = "Erlang Priority Queue Implementation"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/okeuday/pqueue"; - }; - } + { buildHex }: + buildHex { + name = "pqueue"; + version = "1.5.1"; + sha256 = + "7ba01afe6b50ea4b239fa770f9e2c2db4871b3927ac44aea180d1fd52601b317"; + + meta = { + description = "Erlang Priority Queue Implementation"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/pqueue"; + }; + } ) {}; - + pqueue = pqueue_1_5_1; - + proper_1_1_1_beta = callPackage ( - { buildHex }: - buildHex { - name = "proper"; - version = "1.1.1-beta"; - sha256 = - "bde5c0fef0f8d804a7c06aab4f293d19f42149e5880b3412b75efa608e86d342"; - - meta = { - description = - "QuickCheck-inspired property-based testing tool for Erlang."; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/manopapad/proper"; - }; - } + { buildHex }: + buildHex { + name = "proper"; + version = "1.1.1-beta"; + sha256 = + "bde5c0fef0f8d804a7c06aab4f293d19f42149e5880b3412b75efa608e86d342"; + + meta = { + description = + "QuickCheck-inspired property-based testing tool for Erlang."; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/manopapad/proper"; + }; + } ) {}; - + proper = proper_1_1_1_beta; - + providers_1_6_0 = callPackage ( - { buildHex, getopt_0_8_2 }: - buildHex { - name = "providers"; - version = "1.6.0"; - sha256 = - "0f6876529a613d34224de8c61d3660388eb981142360f2699486d8536050ce2f"; - - erlangDeps = [ getopt_0_8_2 ]; - - meta = { - description = "Providers provider."; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/tsloughter/providers"; - }; - } + { buildHex, getopt_0_8_2 }: + buildHex { + name = "providers"; + version = "1.6.0"; + sha256 = + "0f6876529a613d34224de8c61d3660388eb981142360f2699486d8536050ce2f"; + + erlangDeps = [ getopt_0_8_2 ]; + + meta = { + description = "Providers provider."; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/tsloughter/providers"; + }; + } ) {}; - + providers = providers_1_6_0; - + quickrand_1_5_1 = callPackage ( - { buildHex }: - buildHex { - name = "quickrand"; - version = "1.5.1"; - sha256 = - "0b3dcc6ddb23319c1f6a5ed143778864b8ad2f0ebd693a2d121cf5ae0c4db507"; - - meta = { - longDescription = ''Quick Random Number Generation: Provides a - simple interface to call efficient random number - generation functions based on the context. - Proper random number seeding is enforced.''; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/okeuday/quickrand"; - }; - } + { buildHex }: + buildHex { + name = "quickrand"; + version = "1.5.1"; + sha256 = + "0b3dcc6ddb23319c1f6a5ed143778864b8ad2f0ebd693a2d121cf5ae0c4db507"; + + meta = { + longDescription = ''Quick Random Number Generation: Provides a + simple interface to call efficient random number + generation functions based on the context. + Proper random number seeding is enforced.''; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/quickrand"; + }; + } ) {}; - + quickrand = quickrand_1_5_1; - + quintana_0_2_0 = callPackage ( - { buildHex, folsom_0_8_3 }: - buildHex { - name = "quintana"; - version = "0.2.0"; - sha256 = - "0646fe332ca3415ca6b0b273b4a5689ec902b9f9004ca62229ded00bd5f64cda"; - - erlangDeps = [ folsom_0_8_3 ]; - - meta = { - description = "Wrapper around some Folsom functions"; - license = stdenv.lib.licenses.free; - }; - } + { buildHex, folsom_0_8_3 }: + buildHex { + name = "quintana"; + version = "0.2.0"; + sha256 = + "0646fe332ca3415ca6b0b273b4a5689ec902b9f9004ca62229ded00bd5f64cda"; + + erlangDeps = [ folsom_0_8_3 ]; + + meta = { + description = "Wrapper around some Folsom functions"; + license = stdenv.lib.licenses.free; + }; + } ) {}; - + quintana_0_2_1 = callPackage ( - { buildHex, folsom_0_8_3 }: - buildHex { - name = "quintana"; - version = "0.2.1"; - sha256 = - "d4683eb33c71f6cab3b17b896b4fa9180f17a0a8b086440bfe0c5675182f0194"; - - erlangDeps = [ folsom_0_8_3 ]; - - meta = { - description = "Wrapper around some Folsom functions"; - license = stdenv.lib.licenses.free; - }; - } + { buildHex, folsom_0_8_3 }: + buildHex { + name = "quintana"; + version = "0.2.1"; + sha256 = + "d4683eb33c71f6cab3b17b896b4fa9180f17a0a8b086440bfe0c5675182f0194"; + + erlangDeps = [ folsom_0_8_3 ]; + + meta = { + description = "Wrapper around some Folsom functions"; + license = stdenv.lib.licenses.free; + }; + } ) {}; - + quintana = quintana_0_2_1; - + rabbit_common_3_5_6 = callPackage ( - { buildHex }: - buildHex { - name = "rabbit_common"; - version = "3.5.6"; - sha256 = - "9335ab3ebc4e8e140d7bc9b1b0e7ee99c0aa87d0a746b704184121ba35c04f1c"; - - meta = { - longDescription = ''Includes modules which are a runtime - dependency of the RabbitMQ/AMQP Erlang client - and are common to the RabbitMQ server.''; - license = stdenv.lib.licenses.mpl11; - homepage = "https://github.com/jbrisbin/rabbit_common"; - }; - } + { buildHex }: + buildHex { + name = "rabbit_common"; + version = "3.5.6"; + sha256 = + "9335ab3ebc4e8e140d7bc9b1b0e7ee99c0aa87d0a746b704184121ba35c04f1c"; + + meta = { + longDescription = ''Includes modules which are a runtime + dependency of the RabbitMQ/AMQP Erlang client + and are common to the RabbitMQ server.''; + license = stdenv.lib.licenses.mpl11; + homepage = "https://github.com/jbrisbin/rabbit_common"; + }; + } ) {}; - + rabbit_common = rabbit_common_3_5_6; - + ranch_1_1_0 = callPackage ( - { buildHex }: - buildHex { - name = "ranch"; - version = "1.1.0"; - sha256 = - "98ade939e63e6567da5dec5bc5bd93cbdc53d53f8b1aa998adec60dc4057f048"; - - meta = { - description = "Socket acceptor pool for TCP protocols."; - license = stdenv.lib.licenses.isc; - homepage = "https://github.com/ninenines/ranch"; - }; - } + { buildHex }: + buildHex { + name = "ranch"; + version = "1.1.0"; + sha256 = + "98ade939e63e6567da5dec5bc5bd93cbdc53d53f8b1aa998adec60dc4057f048"; + + meta = { + description = "Socket acceptor pool for TCP protocols."; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/ninenines/ranch"; + }; + } ) {}; - + ranch_1_2_0 = callPackage ( - { buildHex }: - buildHex { - name = "ranch"; - version = "1.2.0"; - sha256 = - "82bbb48cdad151000f7ad600d7a29afd972df409fde600bbc9b1ed4fdc08c399"; - - meta = { - description = "Socket acceptor pool for TCP protocols."; - license = stdenv.lib.licenses.isc; - homepage = "https://github.com/ninenines/ranch"; - }; - } + { buildHex }: + buildHex { + name = "ranch"; + version = "1.2.0"; + sha256 = + "82bbb48cdad151000f7ad600d7a29afd972df409fde600bbc9b1ed4fdc08c399"; + + meta = { + description = "Socket acceptor pool for TCP protocols."; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/ninenines/ranch"; + }; + } ) {}; - + ranch = ranch_1_2_0; - + ratx_0_1_0 = callPackage ( - { buildHex }: - buildHex { - name = "ratx"; - version = "0.1.0"; - sha256 = - "fbf933ff32fdc127200880f5b567820bf03504ade1bd697ffbc0535dbafc23d6"; - - meta = { - description = - "Rate limiter and overload protection for erlang and elixir applications. + { buildHex }: + buildHex { + name = "ratx"; + version = "0.1.0"; + sha256 = + "fbf933ff32fdc127200880f5b567820bf03504ade1bd697ffbc0535dbafc23d6"; + + meta = { + description = + "Rate limiter and overload protection for erlang and elixir applications. "; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/liveforeverx/ratx"; - }; - } + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/liveforeverx/ratx"; + }; + } ) {}; - + ratx = ratx_0_1_0; - + rebar3_asn1_compiler_1_0_0 = callPackage ( - { buildHex }: - buildHex { - name = "rebar3_asn1_compiler"; - version = "1.0.0"; - sha256 = - "25ec1d5c97393195650ac8c7a06a267a886a1479950ee047c43b5228c07b30b9"; - - meta = { - description = "Compile ASN.1 modules with Rebar3"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/pyykkis/rebar3_asn1_compiler"; - }; - } + { buildHex }: + buildHex { + name = "rebar3_asn1_compiler"; + version = "1.0.0"; + sha256 = + "25ec1d5c97393195650ac8c7a06a267a886a1479950ee047c43b5228c07b30b9"; + + meta = { + description = "Compile ASN.1 modules with Rebar3"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/pyykkis/rebar3_asn1_compiler"; + }; + } ) {}; - + rebar3_asn1_compiler = rebar3_asn1_compiler_1_0_0; - - rebar3_auto_0_3_0 = callPackage - ( - { buildHex, enotify_0_1_0 }: - buildHex { - name = "rebar3_auto"; - version = "0.3.0"; - sha256 = - "9fcca62411b0b7680426bd911002c0769690aef3838829583ffa4547fd5038b5"; - - erlangDeps = [ enotify_0_1_0 ]; - - meta = { - description = "Rebar3 plugin for auto compiling on changes"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/tsloughter/rebar3_auto"; - }; - } - ) {}; - - rebar3_auto = rebar3_auto_0_3_0; - + rebar3_diameter_compiler_0_3_1 = callPackage ( - { buildHex }: - buildHex { - name = "rebar3_diameter_compiler"; - version = "0.3.1"; - sha256 = - "c5965e3810ccf9ef9ba9185a81fe569ef6e9f3a9e546e99c5e900736b0c39274"; - - meta = { - description = "Compile diameter .dia files"; - license = stdenv.lib.licenses.mit; - homepage = - "https://github.com/carlosedp/rebar3_diameter_compiler"; - }; - } + { buildHex }: + buildHex { + name = "rebar3_diameter_compiler"; + version = "0.3.1"; + sha256 = + "c5965e3810ccf9ef9ba9185a81fe569ef6e9f3a9e546e99c5e900736b0c39274"; + + meta = { + description = "Compile diameter .dia files"; + license = stdenv.lib.licenses.mit; + homepage = + "https://github.com/carlosedp/rebar3_diameter_compiler"; + }; + } ) {}; - + rebar3_diameter_compiler = rebar3_diameter_compiler_0_3_1; - - rebar3_hex_1_12_0 = callPackage + + rebar3_hex_1_14_0 = callPackage ( - { buildHex }: - buildHex { - name = "rebar3_hex"; - version = "1.12.0"; - sha256 = - "45467e93ae8d776c6038fdaeaffbc55d8f2f097f300a54dab9b81c6d1cf21f73"; - - meta = { - description = "Hex.pm plugin for rebar3"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/tsloughter/rebar3_hex"; - }; - } + { buildHex }: + buildHex { + name = "rebar3_hex"; + version = "1.14.0"; + sha256 = + "e655ba352835654d41b8077695415792a0de01f3200aa1ce0c8458f785ec2311"; + + meta = { + description = "Hex.pm plugin for rebar3"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/tsloughter/rebar3_hex"; + }; + } ) {}; - - rebar3_hex = rebar3_hex_1_12_0; - + + rebar3_hex = rebar3_hex_1_14_0; + rebar3_idl_compiler_0_3_0 = callPackage ( - { buildHex }: - buildHex { - name = "rebar3_idl_compiler"; - version = "0.3.0"; - sha256 = - "31ba95205c40b990cb3c49abb397abc47b4d5f9c402db83f9daebbc44e69789d"; - - meta = { - description = "Rebar3 IDL Compiler"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/sebastiw/rebar3_idl_compiler"; - }; - } + { buildHex }: + buildHex { + name = "rebar3_idl_compiler"; + version = "0.3.0"; + sha256 = + "31ba95205c40b990cb3c49abb397abc47b4d5f9c402db83f9daebbc44e69789d"; + + meta = { + description = "Rebar3 IDL Compiler"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/sebastiw/rebar3_idl_compiler"; + }; + } ) {}; - + rebar3_idl_compiler = rebar3_idl_compiler_0_3_0; - - rebar3_live_0_1_3 = callPackage - ( - { buildHex, enotify_0_1_0 }: - buildHex { - name = "rebar3_live"; - version = "0.1.3"; - sha256 = - "d9ee2ff022fc73ac94f206c13ff8aa7591a536704f49c4cbacabf37d181a4391"; - - erlangDeps = [ enotify_0_1_0 ]; - - meta = { - description = "Rebar3 live plugin"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/pvmart/rebar3_live"; - }; - } - ) {}; - - rebar3_live = rebar3_live_0_1_3; - - rebar3_neotoma_plugin_0_2_0 = callPackage - ( - { buildHex, neotoma_1_7_3 }: - buildHex { - name = "rebar3_neotoma_plugin"; - version = "0.2.0"; - sha256 = - "c0ebbdb08c017cac90c7d3310a9bd4a5088a46abd4e2fef9e9a9805a657396b8"; - - erlangDeps = [ neotoma_1_7_3 ]; - - meta = { - description = "Neotoma rebar plugin"; - license = stdenv.lib.licenses.free; - homepage = - "https://github.com/zamotivator/rebar3_neotoma_plugin"; - }; - } - ) {}; - - rebar3_neotoma_plugin = rebar3_neotoma_plugin_0_2_0; - - rebar3_proper_plugin_0_1_0 = callPackage - ( - { buildHex }: - buildHex { - name = "rebar3_proper_plugin"; - version = "0.1.0"; - sha256 = - "7071555afb623e73a2c572de6d4379f9c197b44e68608944eb2835617faed10d"; - - meta = { - description = "A rebar plugin"; - license = stdenv.lib.licenses.free; - }; - } - ) {}; - - rebar3_proper_plugin = rebar3_proper_plugin_0_1_0; - - rebar3_run_0_2_0 = callPackage - ( - { buildHex }: - buildHex { - name = "rebar3_run"; - version = "0.2.0"; - sha256 = - "321e0647893957d1bb05a88d940a8a3b9129097d63529e13f815c4857bf29497"; - compilePort = true; - - meta = { - description = "A rebar plugin"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/tsloughter/rebar3_run"; - }; - } - ) {}; - - rebar3_run = rebar3_run_0_2_0; - + rebar_alias_0_1_0 = callPackage ( - { buildHex }: - buildHex { - name = "rebar_alias"; - version = "0.1.0"; - sha256 = - "59fb42b39964af3a29ebe94c11247f618dd4d5e4e1a69cfaffabbed03ccff70f"; - - meta = { - description = "A rebar plugin"; - license = stdenv.lib.licenses.free; - }; - } + { buildHex }: + buildHex { + name = "rebar_alias"; + version = "0.1.0"; + sha256 = + "59fb42b39964af3a29ebe94c11247f618dd4d5e4e1a69cfaffabbed03ccff70f"; + + meta = { + description = "A rebar plugin"; + license = stdenv.lib.licenses.free; + }; + } ) {}; - + rebar_alias = rebar_alias_0_1_0; - + rebar_erl_vsn_0_1_0 = callPackage ( - { buildHex }: - buildHex { - name = "rebar_erl_vsn"; - version = "0.1.0"; - sha256 = - "7cf1e2e85a80785a4e4e1529a2c837dbd2d540214cf791214e56f931e5e9865d"; - - meta = { - description = "defines for erlang versions"; - license = stdenv.lib.licenses.mit; - }; - } + { buildHex }: + buildHex { + name = "rebar_erl_vsn"; + version = "0.1.0"; + sha256 = + "7cf1e2e85a80785a4e4e1529a2c837dbd2d540214cf791214e56f931e5e9865d"; + + meta = { + description = "defines for erlang versions"; + license = stdenv.lib.licenses.mit; + }; + } ) {}; - + rebar_erl_vsn = rebar_erl_vsn_0_1_0; - + recon_2_2_1 = callPackage ( - { buildHex }: - buildHex { - name = "recon"; - version = "2.2.1"; - sha256 = - "6c548ad0f4916495a78977674a251847869f85b5125b7c2a44da3178955adfd1"; - - meta = { - longDescription = ''Recon wants to be a set of tools usable in - production to diagnose Erlang problems or - inspect production environment safely.''; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/ferd/recon"; - }; - } + { buildHex }: + buildHex { + name = "recon"; + version = "2.2.1"; + sha256 = + "6c548ad0f4916495a78977674a251847869f85b5125b7c2a44da3178955adfd1"; + + meta = { + longDescription = ''Recon wants to be a set of tools usable in + production to diagnose Erlang problems or + inspect production environment safely.''; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/ferd/recon"; + }; + } ) {}; - + recon = recon_2_2_1; - + redo_2_0_1 = callPackage ( - { buildHex }: - buildHex { - name = "redo"; - version = "2.0.1"; - sha256 = - "f7b2be8c825ec34413c54d8f302cc935ce4ecac8421ae3914c5dadd816dcb1e6"; - - meta = { - description = "Pipelined Redis Erlang Driver"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/heroku/redo"; - }; - } + { buildHex }: + buildHex { + name = "redo"; + version = "2.0.1"; + sha256 = + "f7b2be8c825ec34413c54d8f302cc935ce4ecac8421ae3914c5dadd816dcb1e6"; + + meta = { + description = "Pipelined Redis Erlang Driver"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/heroku/redo"; + }; + } ) {}; - + redo = redo_2_0_1; - - relflow_1_0_4 = callPackage - ( - { buildHex }: - buildHex { - name = "relflow"; - version = "1.0.4"; - sha256 = - "e6d9652ed7511aea18fa012d5abc19301acd8cbe81a44a159391086a5be12e1f"; - - meta = { - description = "Rebar3 release workflow plugin"; - license = stdenv.lib.licenses.free; - }; - } - ) {}; - - relflow = relflow_1_0_4; - + reltool_util_1_4_0 = callPackage ( - { buildHex }: - buildHex { - name = "reltool_util"; - version = "1.4.0"; - sha256 = - "a625874976fffe8ab56d4b5b7d5fd37620a2692462bbe24ae003ab13052ef0d3"; - - meta = { - description = "Erlang reltool utility functionality application"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/okeuday/reltool_util"; - }; - } + { buildHex }: + buildHex { + name = "reltool_util"; + version = "1.4.0"; + sha256 = + "a625874976fffe8ab56d4b5b7d5fd37620a2692462bbe24ae003ab13052ef0d3"; + + meta = { + description = "Erlang reltool utility functionality application"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/reltool_util"; + }; + } ) {}; - + reltool_util_1_5_1 = callPackage ( - { buildHex }: - buildHex { - name = "reltool_util"; - version = "1.5.1"; - sha256 = - "746e16871afdcf85d8a115389193c8d660d0df1d26d6ac700590e0ad252646b1"; - - meta = { - description = "Erlang reltool utility functionality application"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/okeuday/reltool_util"; - }; - } + { buildHex }: + buildHex { + name = "reltool_util"; + version = "1.5.1"; + sha256 = + "746e16871afdcf85d8a115389193c8d660d0df1d26d6ac700590e0ad252646b1"; + + meta = { + description = "Erlang reltool utility functionality application"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/reltool_util"; + }; + } ) {}; - + reltool_util = reltool_util_1_5_1; - - relx_3_11_0 = callPackage + + relx_3_13_0 = callPackage ( - { - buildHex, - bbmustache_1_0_4, - cf_0_2_1, - erlware_commons_0_18_0, - getopt_0_8_2, - providers_1_6_0 - }: - buildHex { - name = "relx"; - version = "3.11.0"; - sha256 = - "cf212af96003417ff710e0c9df46034ae14c880a74919df91563e4f149d5c798"; - - erlangDeps = [ - bbmustache_1_0_4 - cf_0_2_1 - erlware_commons_0_18_0 - getopt_0_8_2 - providers_1_6_0 - ]; - - meta = { - description = "Release assembler for Erlang/OTP Releases"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/erlware/relx"; - }; - } + { + buildHex, + bbmustache_1_0_4, + cf_0_2_1, + erlware_commons_0_18_0, + getopt_0_8_2, + providers_1_6_0 + }: + buildHex { + name = "relx"; + version = "3.13.0"; + sha256 = + "1ccadc6c9c6883807be0a6250411d2c299c532928e0a6d07db812400a2303ec1"; + + erlangDeps = [ + bbmustache_1_0_4 + cf_0_2_1 + erlware_commons_0_18_0 + getopt_0_8_2 + providers_1_6_0 + ]; + + meta = { + description = "Release assembler for Erlang/OTP Releases"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/erlware/relx"; + }; + } ) {}; - - relx = relx_3_11_0; - - reup_0_1_0 = callPackage - ( - { buildHex }: - buildHex { - name = "reup"; - version = "0.1.0"; - sha256 = - "949a672190119f8b24160167e3685fdd5397474f98dc875ccfd31378ebd68506"; - - meta = { - description = - "dev watcher that auto compiles and reloads modules"; - license = stdenv.lib.licenses.free; - }; - } - ) {}; - - reup = reup_0_1_0; - + + relx = relx_3_13_0; + savory_0_0_2 = callPackage ( - { buildHex }: - buildHex { - name = "savory"; - version = "0.0.2"; - sha256 = - "a45ef32a6f45092e1328bc1eb47bda3c8f992afe863aaa73c455f31b0c8591b9"; - - meta = { - longDescription = ''An Elixir implementation of Freza's salt_nif - which interfaces with libsodium, a wrapper for - the cryptographic primitive libary NaCl. ''; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/electricFeel/savory"; - }; - } + { buildHex }: + buildHex { + name = "savory"; + version = "0.0.2"; + sha256 = + "a45ef32a6f45092e1328bc1eb47bda3c8f992afe863aaa73c455f31b0c8591b9"; + + meta = { + longDescription = ''An Elixir implementation of Freza's salt_nif + which interfaces with libsodium, a wrapper for + the cryptographic primitive libary NaCl. ''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/electricFeel/savory"; + }; + } ) {}; - + savory = savory_0_0_2; - + sbroker_0_7_0 = callPackage ( - { buildHex }: - buildHex { - name = "sbroker"; - version = "0.7.0"; - sha256 = - "5bc0bfd79896fd5b92072a71fa4a1e120f4110f2cf9562a0b9dd2fcfe9e5cfd2"; - - meta = { - description = - "Process broker for dispatching with backpressure and load shedding"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/fishcakez/sbroker"; - }; - } + { buildHex }: + buildHex { + name = "sbroker"; + version = "0.7.0"; + sha256 = + "5bc0bfd79896fd5b92072a71fa4a1e120f4110f2cf9562a0b9dd2fcfe9e5cfd2"; + + meta = { + description = + "Process broker for dispatching with backpressure and load shedding"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/fishcakez/sbroker"; + }; + } ) {}; - + sbroker = sbroker_0_7_0; - + serial_0_1_2 = callPackage ( - { buildHex }: - buildHex { - name = "serial"; - version = "0.1.2"; - sha256 = - "c0aed287f565b7ce1e1091a6a3dd08fd99bf0884c81b53ecf978c502ef652231"; - - meta = { - description = "Serial communication through Elixir ports"; - license = stdenv.lib.licenses.isc; - homepage = "https://github.com/bitgamma/elixir_serial"; - }; - } + { buildHex }: + buildHex { + name = "serial"; + version = "0.1.2"; + sha256 = + "c0aed287f565b7ce1e1091a6a3dd08fd99bf0884c81b53ecf978c502ef652231"; + + meta = { + description = "Serial communication through Elixir ports"; + license = stdenv.lib.licenses.isc; + homepage = "https://github.com/bitgamma/elixir_serial"; + }; + } ) {}; - + serial = serial_0_1_2; - - sfmt_0_10_1 = callPackage - ( - { buildHex }: - buildHex { - name = "sfmt"; - version = "0.10.1"; - sha256 = - "5f9d8206762306743986a3f35602bb40b35bcff68752a8ae12519c0b7c25fab2"; - compilePort = true; - - meta = { - description = - "SIMD-oriented Fast Mersenne Twister (SFMT) for Erlang. -"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/jj1bdx/sfmt-erlang/"; - }; - } - ) {}; - - sfmt = sfmt_0_10_1; - + sidejob_2_0_0 = callPackage ( - { buildHex }: - buildHex { - name = "sidejob"; - version = "2.0.0"; - sha256 = - "19fea24060a1d0d37e78480fbd79d6b95e07f445aad725f7124a23194641c743"; - - meta = { - longDescription = ''sidejob is an Erlang library that implements - a parallel, capacity-limited request pool. In - sidejob, these pools are called resources. A - resource is managed by multiple gen_server like - processes which can be sent calls and casts - using sidejob:call or sidejob:cast respectively. - This library was originally written to support - process bounding in Riak using the - sidejob_supervisor behavior. In Riak, this is - used to limit the number of concurrent get/put - FSMs that can be active, failing client requests - with {error, overload} if the limit is ever hit. - The purpose being to provide a fail-safe - mechanism during extreme overload scenarios. ''; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/basho/sidejob"; - }; - } + { buildHex }: + buildHex { + name = "sidejob"; + version = "2.0.0"; + sha256 = + "19fea24060a1d0d37e78480fbd79d6b95e07f445aad725f7124a23194641c743"; + + meta = { + longDescription = ''sidejob is an Erlang library that implements + a parallel, capacity-limited request pool. In + sidejob, these pools are called resources. A + resource is managed by multiple gen_server like + processes which can be sent calls and casts + using sidejob:call or sidejob:cast respectively. + This library was originally written to support + process bounding in Riak using the + sidejob_supervisor behavior. In Riak, this is + used to limit the number of concurrent get/put + FSMs that can be active, failing client requests + with {error, overload} if the limit is ever hit. + The purpose being to provide a fail-safe + mechanism during extreme overload scenarios. ''; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/basho/sidejob"; + }; + } ) {}; - + sidejob = sidejob_2_0_0; - - siphash_2_1_1 = callPackage - ( - { buildHex }: - buildHex { - name = "siphash"; - version = "2.1.1"; - sha256 = - "69f2a3b8acac101f7894ea80c15b29dbf7dfa55ea2800731cd5d04621cc22eee"; - compilePort = true; - - meta = { - description = "Elixir implementation of the SipHash hash family"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/zackehh/siphash-elixir"; - }; - } - ) {}; - - siphash = siphash_2_1_1; - + slp_0_0_2 = callPackage ( - { buildHex }: - buildHex { - name = "slp"; - version = "0.0.2"; - sha256 = - "27e5f7330c7ce631f16e3ec5781b31cbb2247d2bcdeab1e979a66dcc4397bd77"; - - meta = { - longDescription = ''An Elixir application for using the Service - Location Protocol. SLP is a commonly used - service discovery protocol.''; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/stuart/elixir_slp"; - }; - } + { buildHex }: + buildHex { + name = "slp"; + version = "0.0.2"; + sha256 = + "27e5f7330c7ce631f16e3ec5781b31cbb2247d2bcdeab1e979a66dcc4397bd77"; + + meta = { + longDescription = ''An Elixir application for using the Service + Location Protocol. SLP is a commonly used + service discovery protocol.''; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/stuart/elixir_slp"; + }; + } ) {}; - + slp = slp_0_0_2; - + smurf_0_1_3 = callPackage ( - { buildHex }: - buildHex { - name = "smurf"; - version = "0.1.3"; - sha256 = - "5ed8e18ec8eea0647e7e938ce15cc76e59497d0a259cea15124520a48f0d6be6"; - - meta = { - description = "SMF interfacing library for erlang"; - license = stdenv.lib.licenses.cddl; - homepage = "https://github.com/project-fifo/smurf"; - }; - } + { buildHex }: + buildHex { + name = "smurf"; + version = "0.1.3"; + sha256 = + "5ed8e18ec8eea0647e7e938ce15cc76e59497d0a259cea15124520a48f0d6be6"; + + meta = { + description = "SMF interfacing library for erlang"; + license = stdenv.lib.licenses.cddl; + homepage = "https://github.com/project-fifo/smurf"; + }; + } ) {}; - + smurf = smurf_0_1_3; - - snappy_1_1_1 = callPackage - ( - { buildHex }: - buildHex { - name = "snappy"; - version = "1.1.1"; - sha256 = - "7faed3ec6bcac363c2a6f09b4f000a12c8166b42b3bf70228d532f8afcfbcb6a"; - compilePort = true; - - meta = { - description = - "snappy compressor/decompressor Erlang NIF wrapper"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/barrel-db/snappy"; - }; - } - ) {}; - - snappy = snappy_1_1_1; - + ssl_verify_hostname_1_0_5 = callPackage ( - { buildHex }: - buildHex { - name = "ssl_verify_hostname"; - version = "1.0.5"; - sha256 = - "f2cb11e6144e10ab39d1e14bf9fb2437b690979c70bf5428e9dc4bfaf1dfeabf"; - - meta = { - description = "Hostname verification library for Erlang"; - license = stdenv.lib.licenses.mit; - homepage = - "https://github.com/deadtrickster/ssl_verify_hostname.erl"; - }; - } + { buildHex }: + buildHex { + name = "ssl_verify_hostname"; + version = "1.0.5"; + sha256 = + "f2cb11e6144e10ab39d1e14bf9fb2437b690979c70bf5428e9dc4bfaf1dfeabf"; + + meta = { + description = "Hostname verification library for Erlang"; + license = stdenv.lib.licenses.mit; + homepage = + "https://github.com/deadtrickster/ssl_verify_hostname.erl"; + }; + } ) {}; - + ssl_verify_hostname_1_0_6 = callPackage ( - { buildHex }: - buildHex { - name = "ssl_verify_hostname"; - version = "1.0.6"; - sha256 = - "72b2fc8a8e23d77eed4441137fefa491bbf4a6dc52e9c0045f3f8e92e66243b5"; - - meta = { - description = "Hostname verification library for Erlang"; - license = stdenv.lib.licenses.mit; - homepage = - "https://github.com/deadtrickster/ssl_verify_hostname.erl"; - }; - } + { buildHex }: + buildHex { + name = "ssl_verify_hostname"; + version = "1.0.6"; + sha256 = + "72b2fc8a8e23d77eed4441137fefa491bbf4a6dc52e9c0045f3f8e92e66243b5"; + + meta = { + description = "Hostname verification library for Erlang"; + license = stdenv.lib.licenses.mit; + homepage = + "https://github.com/deadtrickster/ssl_verify_hostname.erl"; + }; + } ) {}; - + ssl_verify_hostname = ssl_verify_hostname_1_0_6; - - strftimerl_0_1_0 = callPackage + + strftimerl_0_1_1 = callPackage ( - { buildHex }: - buildHex { - name = "strftimerl"; - version = "0.1.0"; - sha256 = - "8c372b282b31f3de24ed1281d4974087421fc44a27d0f31b285ad97a9e6bb616"; - - meta = { - description = "strftime formatting in erlang"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/gmr/strftimerl"; - }; - } + { buildHex }: + buildHex { + name = "strftimerl"; + version = "0.1.1"; + sha256 = + "c09c7cd6a421bcbc1020c1440a2e73e312b852adbb3034d11f3dffa27d7953b1"; + + meta = { + description = "strftime formatting in erlang"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/gmr/strftimerl"; + }; + } ) {}; - - strftimerl = strftimerl_0_1_0; - + + strftimerl = strftimerl_0_1_1; + supool_1_5_1 = callPackage ( - { buildHex }: - buildHex { - name = "supool"; - version = "1.5.1"; - sha256 = - "c191d63ff19ae177bf4cfba02303ae4552d8b48ec4133e24053e037513dfae09"; - - meta = { - description = "Erlang Process Pool as a Supervisor"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/okeuday/supool"; - }; - } + { buildHex }: + buildHex { + name = "supool"; + version = "1.5.1"; + sha256 = + "c191d63ff19ae177bf4cfba02303ae4552d8b48ec4133e24053e037513dfae09"; + + meta = { + description = "Erlang Process Pool as a Supervisor"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/supool"; + }; + } ) {}; - + supool = supool_1_5_1; - - syslog_1_0_2 = callPackage - ( - { buildHex }: - buildHex { - name = "syslog"; - version = "1.0.2"; - sha256 = - "ca158a84afe482f77cb4668383a6108f1e9190fcdf3035858f426b91b2021bf6"; - compilePort = true; - - meta = { - description = - "Erlang port driver for interacting with syslog via syslog"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/Vagabond/erlang-syslog"; - }; - } - ) {}; - - syslog = syslog_1_0_2; - + tea_crypto_1_0_0 = callPackage ( - { buildHex }: - buildHex { - name = "tea_crypto"; - version = "1.0.0"; - sha256 = - "0e7e60d0afe79f0624faa8a358a3a00c912cfa548f3632383927abca4db29cc6"; - - meta = { - description = "A TEA implementation in Erlang. + { buildHex }: + buildHex { + name = "tea_crypto"; + version = "1.0.0"; + sha256 = + "0e7e60d0afe79f0624faa8a358a3a00c912cfa548f3632383927abca4db29cc6"; + + meta = { + description = "A TEA implementation in Erlang. "; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/keichan34/tea_crypto"; - }; - } + license = stdenv.lib.licenses.free; + homepage = "https://github.com/keichan34/tea_crypto"; + }; + } ) {}; - + tea_crypto = tea_crypto_1_0_0; - + termcap_0_1_0 = callPackage ( - { buildHex }: - buildHex { - name = "termcap"; - version = "0.1.0"; - sha256 = - "8c5167d68759bd1cd020eeaf5fd94153430fd19fa5a5fdeeb0b3129f0aba2a21"; - - meta = { - description = "Pure erlang termcap library"; - license = stdenv.lib.licenses.mit; - }; - } + { buildHex }: + buildHex { + name = "termcap"; + version = "0.1.0"; + sha256 = + "8c5167d68759bd1cd020eeaf5fd94153430fd19fa5a5fdeeb0b3129f0aba2a21"; + + meta = { + description = "Pure erlang termcap library"; + license = stdenv.lib.licenses.mit; + }; + } ) {}; - + termcap = termcap_0_1_0; - - tinymt_0_2_0 = callPackage + + tinymt_0_3_1 = callPackage ( - { buildHex }: - buildHex { - name = "tinymt"; - version = "0.2.0"; - sha256 = - "1ab2b2bd4e02ccf3f83ca6b2429c41110adaf2068c727d37a2e27a0207eccfe0"; - - meta = { - description = "Tiny Mersenne Twister (TinyMT) for Erlang -"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/jj1bdx/tinymt-erlang/"; - }; - } + { buildHex }: + buildHex { + name = "tinymt"; + version = "0.3.1"; + sha256 = + "9de8fcedf254661bc4aa550aac317e28be35d4a5d91adf3fa3689dfad6cc1e5a"; + + meta = { + description = "Tiny Mersenne Twister (TinyMT) for Erlang"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/jj1bdx/tinymt-erlang/"; + }; + } ) {}; - - tinymt = tinymt_0_2_0; - + + tinymt = tinymt_0_3_1; + trie_1_5_0 = callPackage ( - { buildHex }: - buildHex { - name = "trie"; - version = "1.5.0"; - sha256 = - "613981536e33f58d92e44bd31801376f71deee0e57c63372fe8ab5fbbc37f7dc"; - - meta = { - description = "Erlang Trie Implementation"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/okeuday/trie"; - }; - } + { buildHex }: + buildHex { + name = "trie"; + version = "1.5.0"; + sha256 = + "613981536e33f58d92e44bd31801376f71deee0e57c63372fe8ab5fbbc37f7dc"; + + meta = { + description = "Erlang Trie Implementation"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/trie"; + }; + } ) {}; - + trie_1_5_1 = callPackage ( - { buildHex }: - buildHex { - name = "trie"; - version = "1.5.1"; - sha256 = - "4b845dccfca8962b90584e98d270e2ff43e2e181bb046c4aae0e0f457679f98d"; - - meta = { - description = "Erlang Trie Implementation"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/okeuday/trie"; - }; - } + { buildHex }: + buildHex { + name = "trie"; + version = "1.5.1"; + sha256 = + "4b845dccfca8962b90584e98d270e2ff43e2e181bb046c4aae0e0f457679f98d"; + + meta = { + description = "Erlang Trie Implementation"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/trie"; + }; + } ) {}; - + trie = trie_1_5_1; - + tsuru_1_0_2 = callPackage ( - { buildHex }: - buildHex { - name = "tsuru"; - version = "1.0.2"; - sha256 = - "b586ad8d47799a086e4225494f5e3cf4e306ca255a173a4b48fe51d542cefb6b"; - - meta = { - description = - "A collection of useful tools for Erlang applications"; - license = stdenv.lib.licenses.mit; - }; - } + { buildHex }: + buildHex { + name = "tsuru"; + version = "1.0.2"; + sha256 = + "b586ad8d47799a086e4225494f5e3cf4e306ca255a173a4b48fe51d542cefb6b"; + + meta = { + description = + "A collection of useful tools for Erlang applications"; + license = stdenv.lib.licenses.mit; + }; + } ) {}; - + tsuru = tsuru_1_0_2; - - ui_0_1_1 = callPackage - ( - { buildHex }: - buildHex { - name = "ui"; - version = "0.1.1"; - sha256 = - "492da59ca39055c0dfc794a2ebd564adb9ed635402c7b46659981f32aa9d94c1"; - - meta = { - description = "An OTP application"; - license = stdenv.lib.licenses.free; - }; - } - ) {}; - - ui = ui_0_1_1; - + uri_0_1_0 = callPackage ( - { buildHex }: - buildHex { - name = "uri"; - version = "0.1.0"; - sha256 = - "3833c3b5745fc0822df86c3a3591219048026fea8a535223b440d26029218996"; - - meta = { - description = "URI Parsing/Encoding Library"; - license = stdenv.lib.licenses.free; - }; - } + { buildHex }: + buildHex { + name = "uri"; + version = "0.1.0"; + sha256 = + "3833c3b5745fc0822df86c3a3591219048026fea8a535223b440d26029218996"; + + meta = { + description = "URI Parsing/Encoding Library"; + license = stdenv.lib.licenses.free; + }; + } ) {}; - + uri = uri_0_1_0; - + varpool_1_5_1 = callPackage ( - { buildHex }: - buildHex { - name = "varpool"; - version = "1.5.1"; - sha256 = - "ff6059bdcd0efad606e8c54ee623cfeaef59778c18e343dd772e84d99d188e26"; - - meta = { - description = "Erlang Process Pools as a Local Variable"; - license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/okeuday/varpool"; - }; - } + { buildHex }: + buildHex { + name = "varpool"; + version = "1.5.1"; + sha256 = + "ff6059bdcd0efad606e8c54ee623cfeaef59778c18e343dd772e84d99d188e26"; + + meta = { + description = "Erlang Process Pools as a Local Variable"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/okeuday/varpool"; + }; + } ) {}; - + varpool = varpool_1_5_1; - + weber_0_1_0 = callPackage ( - { buildHex }: - buildHex { - name = "weber"; - version = "0.1.0"; - sha256 = - "742c45b3c99e207dd0aeccb818edd2ace4af10699c96fbcee0ce2f692dc5fe12"; - - meta = { - description = "weber - is Elixir MVC web framework."; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/elixir-web/weber"; - }; - } + { buildHex }: + buildHex { + name = "weber"; + version = "0.1.0"; + sha256 = + "742c45b3c99e207dd0aeccb818edd2ace4af10699c96fbcee0ce2f692dc5fe12"; + + meta = { + description = "weber - is Elixir MVC web framework."; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/elixir-web/weber"; + }; + } ) {}; - + weber = weber_0_1_0; - + websocket_client_1_1_0 = callPackage ( - { buildHex }: - buildHex { - name = "websocket_client"; - version = "1.1.0"; - sha256 = - "21c3d0df073634f2ca349af5b54a61755d637d6390c34d8d57c064f68ca92acd"; - - meta = { - description = "Erlang websocket client"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/sanmiguel/websocket_client"; - }; - } + { buildHex }: + buildHex { + name = "websocket_client"; + version = "1.1.0"; + sha256 = + "21c3d0df073634f2ca349af5b54a61755d637d6390c34d8d57c064f68ca92acd"; + + meta = { + description = "Erlang websocket client"; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/sanmiguel/websocket_client"; + }; + } ) {}; - + websocket_client = websocket_client_1_1_0; - + worker_pool_1_0_4 = callPackage ( - { buildHex }: - buildHex { - name = "worker_pool"; - version = "1.0.4"; - sha256 = - "7854a3b94e9624728db3a0475d00e7d0728adf3bf2ee3802bbf8ca10356d6f64"; - - meta = { - description = "Erlang Worker Pool"; - license = stdenv.lib.licenses.free; - homepage = "https://github.com/inaka/worker_pool"; - }; - } + { buildHex }: + buildHex { + name = "worker_pool"; + version = "1.0.4"; + sha256 = + "7854a3b94e9624728db3a0475d00e7d0728adf3bf2ee3802bbf8ca10356d6f64"; + + meta = { + description = "Erlang Worker Pool"; + license = stdenv.lib.licenses.free; + homepage = "https://github.com/inaka/worker_pool"; + }; + } ) {}; - + worker_pool = worker_pool_1_0_4; - + wpa_supplicant_0_1_0 = callPackage ( - { buildHex }: - buildHex { - name = "wpa_supplicant"; - version = "0.1.0"; - sha256 = - "8a73ca51203401755d42ba636918106540aa3723006dab344dc8a7ec8fa2f3d5"; - - meta = { - longDescription = ''Elixir interface to the wpa_supplicant - daemon. The wpa_supplicant provides application - support for scanning for access points, managing - Wi-Fi connections, and handling all of the - security and other parameters associated with - Wi-Fi. ''; - license = with stdenv.lib.licenses; [ asl20 free ]; - homepage = "https://github.com/fhunleth/wpa_supplicant.ex"; - }; - } + { buildHex }: + buildHex { + name = "wpa_supplicant"; + version = "0.1.0"; + sha256 = + "8a73ca51203401755d42ba636918106540aa3723006dab344dc8a7ec8fa2f3d5"; + + meta = { + longDescription = ''Elixir interface to the wpa_supplicant + daemon. The wpa_supplicant provides application + support for scanning for access points, managing + Wi-Fi connections, and handling all of the + security and other parameters associated with + Wi-Fi. ''; + license = with stdenv.lib.licenses; [ asl20 free ]; + homepage = "https://github.com/fhunleth/wpa_supplicant.ex"; + }; + } ) {}; - + wpa_supplicant = wpa_supplicant_0_1_0; - - zipper_0_1_4 = callPackage + + zipper_0_1_5 = callPackage ( - { buildHex }: - buildHex { - name = "zipper"; - version = "0.1.4"; - sha256 = - "0037f29a5c5a96a9db49e9131f1071a48fcbd5959b74f1d8b6d22945a7ac46b9"; - - meta = { - description = "Generic Zipper Implementation for Erlang"; - license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/inaka/zipper"; - }; - } + { buildHex }: + buildHex { + name = "zipper"; + version = "0.1.5"; + sha256 = + "7df5552f41169a8feb1a2e81e2753ec4e4debb7d48cdf1edc77037205782d547"; + + meta = { + description = "Generic Zipper Implementation for Erlang"; + license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/inaka/zipper"; + }; + } ) {}; - - zipper = zipper_0_1_4; - + + zipper = zipper_0_1_5; + }; -in self +in self \ No newline at end of file diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index bd2289723f8..260e8d66c58 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -112,6 +112,9 @@ go.stdenv.mkDerivation ( } export -f buildGoDir # parallel needs to see the function + if [ -z "$enableParallelBuilding" ]; then + export NIX_BUILD_CORES=1 + fi getGoDirs "" | parallel -j $NIX_BUILD_CORES buildGoDir install runHook postBuild diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e562d910f8f..1b5b3b74f18 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -21,13 +21,14 @@ self: super: { clock = dontCheck super.clock; Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres; - hspec_2_1_10 = super.hspec_2_1_10.override { stringbuilder = dontCheck super.stringbuilder; }; hspec_2_1_2 = super.hspec_2_1_2.override { stringbuilder = dontCheck super.stringbuilder; }; hspec_2_1_3 = super.hspec_2_1_3.override { stringbuilder = dontCheck super.stringbuilder; }; hspec_2_1_4 = super.hspec_2_1_4.override { stringbuilder = dontCheck super.stringbuilder; }; hspec_2_1_5 = super.hspec_2_1_5.override { stringbuilder = dontCheck super.stringbuilder; }; hspec_2_1_6 = super.hspec_2_1_6.override { stringbuilder = dontCheck super.stringbuilder; }; hspec_2_1_7 = super.hspec_2_1_7.override { stringbuilder = dontCheck super.stringbuilder; }; + hspec_2_1_10 = super.hspec_2_1_10.override { stringbuilder = dontCheck super.stringbuilder; }; + hspec_2_2_1 = super.hspec_2_2_1.override { stringbuilder = dontCheck super.stringbuilder; }; hspec-expectations_0_6_1_1 = dontCheck super.hspec-expectations_0_6_1_1; hspec-expectations_0_6_1 = dontCheck super.hspec-expectations_0_6_1; hspec-expectations_0_7_1 = dontCheck super.hspec-expectations_0_7_1; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index cc5034008bb..dd544a76972 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -51,4 +51,7 @@ self: super: { # https://github.com/hspec/HUnit/issues/7 HUnit = dontCheck super.HUnit; + # Older versions don't support our version of base. + async = self.async_2_1_0; + } diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 6f68dec78e4..9bea0519151 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -1,5 +1,10 @@ { pkgs }: +let + removeLibraryHaskellDepends = pnames: depends: + builtins.filter (e: !(builtins.elem (e.pname or "") pnames)) depends; +in + with import ./lib.nix { inherit pkgs; }; self: super: { @@ -58,7 +63,7 @@ self: super: { # These packages are core libraries in GHC 7.10.x, but not here. bin-package-db = null; haskeline = self.haskeline_0_7_2_1; - hoopl = self.hoopl_3_10_2_0; + hoopl = self.hoopl_3_10_2_1; hpc = self.hpc_0_6_0_2; terminfo = self.terminfo_0_4_0_1; xhtml = self.xhtml_3000_2_1; @@ -85,8 +90,10 @@ self: super: { }); ghcjs-dom = overrideCabal super.ghcjs-dom (drv: { - buildDepends = [ self.base self.mtl self.text self.ghcjs-base ]; - libraryHaskellDepends = [ ]; + libraryHaskellDepends = + removeLibraryHaskellDepends [ + "glib" "gtk" "gtk3" "webkitgtk" "webkitgtk3" + ] drv.libraryHaskellDepends; }); ghc-paths = overrideCabal super.ghc-paths (drv: { @@ -96,72 +103,25 @@ self: super: { # reflex 0.3, made compatible with the newest GHCJS. reflex = overrideCabal super.reflex (drv: { src = pkgs.fetchFromGitHub { - owner = "k0001"; + owner = "ryantrinkle"; repo = "reflex"; - rev = "e9b2f777ad07875149614e8337507afd5b1a2466"; - sha256 = "005hr3s6y369pxfdlixi4wabgav0bb653j98788kq9q9ssgijlwn"; + rev = "cc62c11a6cde31412582758c236919d4bb766ada"; + sha256 = "1j4vw0636bkl46lj8ry16i04vgpivjc6bs3ls54ppp1wfp63q7w4"; }; - libraryHaskellDepends = [ - self.base self.containers self.dependent-map_0_1_1_3 - self.dependent-sum_0_2_0_1 self.exception-transformers self.mtl - self.primitive self.ref-tf self.semigroups self.template-haskell - self.these self.transformers self.transformers-compat - ]; }); # reflex-dom 0.2, made compatible with the newest GHCJS. reflex-dom = overrideCabal super.reflex-dom (drv: { src = pkgs.fetchFromGitHub { - owner = "k0001"; + owner = "ryantrinkle"; repo = "reflex-dom"; - rev = "a117eae8e101198977611f87605a5cb2ae752fc7"; - sha256 = "18m8ng2fgsfbqdvx5jxy23ndyyhafnxflq8apg5psdz3aqkfimzh"; + rev = "639d9ca13c2def075e83344c9afca6eafaf24219"; + sha256 = "0166ihbh3dbfjiym9w561svpgvj0x4i8i8ws70xaafi0cmpsxrar"; }; - libraryHaskellDepends = [ - self.aeson self.base self.bifunctors self.bytestring self.containers - self.data-default self.dependent-map_0_1_1_3 self.dependent-sum_0_2_0_1 - self.dependent-sum-template self.directory - self.exception-transformers self.ghcjs-dom self.lens self.mtl self.ref-tf - self.reflex self.safe self.semigroups self.text self.these self.time - self.transformers - ]; - }); - - # required by reflex, reflex-dom - dependent-map_0_1_1_3 = self.callPackage ( - { mkDerivation, base, containers, dependent-sum_0_2_0_1, stdenv - }: - mkDerivation { - pname = "dependent-map"; - version = "0.1.1.3"; - sha256 = "1by83rrv8dfn5lxrpx3qzs1lg31fhnzlqy979h8ampyxd0w93pa4"; - libraryHaskellDepends = [ base containers dependent-sum_0_2_0_1 ]; - homepage = "https://github.com/mokus0/dependent-map"; - description = "Dependent finite maps (partial dependent products)"; - license = "unknown"; - } - ) {}; - - # required by reflex, reflex-dom - dependent-sum_0_2_0_1 = self.callPackage ( - { mkDerivation, base, stdenv - }: - mkDerivation { - pname = "dependent-sum"; - version = "0.2.1.0"; - sha256 = "1h6wsrh206k6q3jcfdxvlsswbm47x30psp6x30l2z0j9jyf7jpl3"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/mokus0/dependent-sum"; - description = "Dependent sum type"; - license = stdenv.lib.licenses.publicDomain; - } - ) {}; - - # required by reflex-dom - dependent-sum-template = overrideCabal super.dependent-sum-template (drv: { - libraryHaskellDepends = [ - self.base self.dependent-sum_0_2_0_1 self.template-haskell self.th-extras - ]; + libraryHaskellDepends = + removeLibraryHaskellDepends [ + "glib" "gtk3" "webkitgtk3" "webkitgtk3-javascriptcore" "raw-strings-qq" "unix" + ] drv.libraryHaskellDepends; }); } diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 43a49c4da4e..4e3fda8b5d2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -380,6 +380,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -770,6 +771,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1156,6 +1158,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1486,6 +1489,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1787,6 +1792,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -2026,6 +2032,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2449,6 +2456,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2615,6 +2623,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2733,8 +2742,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2"; "djinn-th" = dontDistribute super."djinn-th"; @@ -3050,6 +3061,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3381,6 +3393,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_0_3"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3707,6 +3720,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_1"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3939,6 +3953,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4178,6 +4193,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -5448,6 +5464,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5701,6 +5718,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5749,6 +5767,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6228,6 +6247,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6239,6 +6259,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6299,6 +6320,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_4"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6509,6 +6531,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -8672,6 +8695,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index 0b06311a980..a9ab5b58210 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -380,6 +380,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -770,6 +771,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1156,6 +1158,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1486,6 +1489,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1787,6 +1792,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -2026,6 +2032,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2449,6 +2456,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2615,6 +2623,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2733,8 +2742,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2"; "djinn-th" = dontDistribute super."djinn-th"; @@ -3050,6 +3061,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3381,6 +3393,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_0_3"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3707,6 +3720,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_1"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3939,6 +3953,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4178,6 +4193,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -5448,6 +5464,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5701,6 +5718,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5749,6 +5767,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6228,6 +6247,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6239,6 +6259,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6299,6 +6320,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_4"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6509,6 +6531,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -8672,6 +8695,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 1d59562cc85..6818ecf8d0f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -380,6 +380,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -770,6 +771,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1156,6 +1158,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1486,6 +1489,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1787,6 +1792,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -2026,6 +2032,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2449,6 +2456,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2615,6 +2623,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2733,8 +2742,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2"; "djinn-th" = dontDistribute super."djinn-th"; @@ -3050,6 +3061,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3381,6 +3393,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_0_3"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3707,6 +3720,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_1"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3939,6 +3953,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4178,6 +4193,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -5448,6 +5464,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5701,6 +5718,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5749,6 +5767,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6228,6 +6247,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6239,6 +6259,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6299,6 +6320,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_4"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6509,6 +6531,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -8672,6 +8695,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 0cb0c6e68f1..295e11b60b2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -380,6 +380,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -770,6 +771,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1156,6 +1158,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1486,6 +1489,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1787,6 +1792,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -2026,6 +2032,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2449,6 +2456,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2615,6 +2623,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2733,8 +2742,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2"; "djinn-th" = dontDistribute super."djinn-th"; @@ -3050,6 +3061,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3381,6 +3393,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_0_3"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3707,6 +3720,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_1"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3939,6 +3953,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4178,6 +4193,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -5448,6 +5464,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5701,6 +5718,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5749,6 +5767,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6228,6 +6247,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6239,6 +6259,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6299,6 +6320,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_4"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6509,6 +6531,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -8672,6 +8695,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 22c6d25ab42..0334003db16 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -380,6 +380,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -770,6 +771,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1156,6 +1158,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1486,6 +1489,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1787,6 +1792,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -2026,6 +2032,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2449,6 +2456,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2614,6 +2622,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2732,8 +2741,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2"; "djinn-th" = dontDistribute super."djinn-th"; @@ -3049,6 +3060,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3380,6 +3392,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_0_4"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3706,6 +3719,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_1"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3936,6 +3950,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4175,6 +4190,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -5445,6 +5461,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5698,6 +5715,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5746,6 +5764,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6225,6 +6244,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6236,6 +6256,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6296,6 +6317,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6506,6 +6528,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -8668,6 +8691,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 8c2d85f2499..4042ab797b9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -380,6 +380,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -770,6 +771,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1156,6 +1158,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1486,6 +1489,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1787,6 +1792,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -2026,6 +2032,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2449,6 +2456,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2614,6 +2622,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2732,8 +2741,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2"; "djinn-th" = dontDistribute super."djinn-th"; @@ -3049,6 +3060,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3380,6 +3392,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_0_4"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3706,6 +3719,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_1"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3936,6 +3950,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4175,6 +4190,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -5445,6 +5461,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5698,6 +5715,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5746,6 +5764,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6225,6 +6244,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6236,6 +6256,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6296,6 +6317,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6506,6 +6528,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -8668,6 +8691,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 71b640e0c70..f1ef0fc4011 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -380,6 +380,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -769,6 +770,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1155,6 +1157,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1469,6 +1472,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1483,6 +1487,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1784,6 +1790,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -2023,6 +2030,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2446,6 +2454,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2611,6 +2620,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2729,8 +2739,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2"; "djinn-th" = dontDistribute super."djinn-th"; @@ -3046,6 +3058,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3377,6 +3390,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_0_4"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3703,6 +3717,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_1"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3933,6 +3948,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4171,6 +4187,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -5441,6 +5458,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5694,6 +5712,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5742,6 +5761,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6220,6 +6240,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6231,6 +6252,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6291,6 +6313,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6501,6 +6524,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -8662,6 +8686,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index c1ac7b7a686..56377c59a86 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -380,6 +380,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -769,6 +770,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1155,6 +1157,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1469,6 +1472,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1483,6 +1487,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1784,6 +1790,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -2023,6 +2030,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2446,6 +2454,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2611,6 +2620,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2729,8 +2739,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2"; "djinn-th" = dontDistribute super."djinn-th"; @@ -3046,6 +3058,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3377,6 +3390,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_0_4"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3703,6 +3717,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_1"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3933,6 +3948,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4171,6 +4187,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -5441,6 +5458,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5694,6 +5712,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5742,6 +5761,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6220,6 +6240,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6231,6 +6252,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6291,6 +6313,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6501,6 +6524,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -8662,6 +8686,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index b6218ae4ab2..4ddb79ea5c3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -378,6 +378,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -765,6 +766,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1151,6 +1153,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1465,6 +1468,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1479,6 +1483,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1779,6 +1785,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -2016,6 +2023,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2437,6 +2445,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2602,6 +2611,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2720,8 +2730,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2"; "djinn-th" = dontDistribute super."djinn-th"; @@ -3036,6 +3048,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3367,6 +3380,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_0_4"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3692,6 +3706,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3923,6 +3938,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4161,6 +4177,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -5429,6 +5446,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5682,6 +5700,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5730,6 +5749,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6208,6 +6228,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6219,6 +6240,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6279,6 +6301,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6489,6 +6512,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -8647,6 +8671,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index c86e0ee5569..3ff3228c11e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -378,6 +378,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -765,6 +766,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1151,6 +1153,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1465,6 +1468,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1479,6 +1483,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1779,6 +1785,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1979,6 +1986,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -2014,6 +2022,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2434,6 +2443,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2599,6 +2609,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2717,8 +2728,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1"; @@ -3032,6 +3045,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3363,6 +3377,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3688,6 +3703,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3918,6 +3934,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4156,6 +4173,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -5422,6 +5440,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5674,6 +5693,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5722,6 +5742,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6200,6 +6221,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6211,6 +6233,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6271,6 +6294,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6481,6 +6505,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -8633,6 +8658,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index b74623b09d7..156834d1b01 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -378,6 +378,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -764,6 +765,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1150,6 +1152,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1464,6 +1467,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1478,6 +1482,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1778,6 +1784,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1977,6 +1984,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -2012,6 +2020,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2430,6 +2439,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2595,6 +2605,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2713,8 +2724,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1"; @@ -3028,6 +3041,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3355,6 +3369,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3679,6 +3694,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3908,6 +3924,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4145,6 +4162,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4870,6 +4888,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5404,6 +5423,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5656,6 +5676,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5704,6 +5725,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6179,6 +6201,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6190,6 +6213,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6250,6 +6274,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6460,6 +6485,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7964,6 +7990,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_8_3"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8603,6 +8630,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 79ab2e6f67f..68580bd646a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -378,6 +378,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -764,6 +765,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1150,6 +1152,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1464,6 +1467,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1478,6 +1482,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1778,6 +1784,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1977,6 +1984,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -2012,6 +2020,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2430,6 +2439,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2595,6 +2605,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2713,8 +2724,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1"; @@ -3028,6 +3041,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3354,6 +3368,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3678,6 +3693,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3907,6 +3923,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4144,6 +4161,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4867,6 +4885,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5400,6 +5419,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5652,6 +5672,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5700,6 +5721,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6175,6 +6197,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6186,6 +6209,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6246,6 +6270,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6456,6 +6481,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7960,6 +7986,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_8_3"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8599,6 +8626,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index be460c8f810..94567fa0531 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -378,6 +378,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -764,6 +765,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1150,6 +1152,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1464,6 +1467,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1478,6 +1482,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1778,6 +1784,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1977,6 +1984,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -2012,6 +2020,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2430,6 +2439,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2595,6 +2605,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2713,8 +2724,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1"; @@ -3028,6 +3041,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3354,6 +3368,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3678,6 +3693,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3907,6 +3923,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4143,6 +4160,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4866,6 +4884,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5399,6 +5418,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5651,6 +5671,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5699,6 +5720,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6174,6 +6196,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6185,6 +6208,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6245,6 +6269,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6455,6 +6480,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7505,6 +7531,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7957,6 +7984,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_8_3"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8596,6 +8624,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 610bba03009..0dca6ed6feb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -378,6 +378,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -764,6 +765,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1150,6 +1152,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1464,6 +1467,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1478,6 +1482,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1778,6 +1784,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1977,6 +1984,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -2012,6 +2020,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2430,6 +2439,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2595,6 +2605,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2713,8 +2724,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1"; @@ -3028,6 +3041,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3354,6 +3368,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3678,6 +3693,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3906,6 +3922,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4142,6 +4159,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4865,6 +4883,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5398,6 +5417,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5650,6 +5670,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5698,6 +5719,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6173,6 +6195,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6184,6 +6207,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6244,6 +6268,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6454,6 +6479,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7504,6 +7530,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7955,6 +7982,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_8_3"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8594,6 +8622,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index 2d8fb74ed50..25759fe1307 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -377,6 +377,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -763,6 +764,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1149,6 +1151,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1463,6 +1466,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1477,6 +1481,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1776,6 +1782,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1975,6 +1982,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -2010,6 +2018,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_2"; @@ -2427,6 +2436,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2592,6 +2602,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2710,8 +2721,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -3025,6 +3038,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3351,6 +3365,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_1"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3675,6 +3690,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3903,6 +3919,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4138,6 +4155,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4861,6 +4879,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5393,6 +5412,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5644,6 +5664,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5692,6 +5713,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5714,6 +5736,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6166,6 +6189,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6177,6 +6201,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6237,6 +6262,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6447,6 +6473,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7496,6 +7523,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7947,6 +7975,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_8_3"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8586,6 +8615,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index f4f7b038eef..f03bbb95490 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -377,6 +377,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -763,6 +764,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1148,6 +1150,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1462,6 +1465,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1476,6 +1480,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1775,6 +1781,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1974,6 +1981,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -2009,6 +2017,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_2"; @@ -2194,6 +2203,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2423,6 +2433,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2588,6 +2599,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2706,8 +2718,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -3020,6 +3034,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3346,6 +3361,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3670,6 +3686,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3898,6 +3915,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4133,6 +4151,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4856,6 +4875,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5388,6 +5408,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5639,6 +5660,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5687,6 +5709,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5709,6 +5732,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6159,6 +6183,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6170,6 +6195,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6230,6 +6256,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6440,6 +6467,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -6663,6 +6691,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7487,6 +7516,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7936,6 +7966,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_8_3"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8575,6 +8606,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index c386c5791a7..0a3a26697eb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -378,6 +378,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -765,6 +766,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1151,6 +1153,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1465,6 +1468,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1479,6 +1483,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1779,6 +1785,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1979,6 +1986,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -2014,6 +2022,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2432,6 +2441,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2597,6 +2607,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2715,8 +2726,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1"; @@ -3030,6 +3043,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3361,6 +3375,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3685,6 +3700,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3915,6 +3931,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4153,6 +4170,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -5419,6 +5437,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5671,6 +5690,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5719,6 +5739,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6196,6 +6217,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6207,6 +6229,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6267,6 +6290,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6477,6 +6501,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -8627,6 +8652,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 883954c9575..11546e04a4a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -378,6 +378,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -764,6 +765,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1150,6 +1152,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1464,6 +1467,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1478,6 +1482,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1778,6 +1784,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1978,6 +1985,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -2013,6 +2021,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2431,6 +2440,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2596,6 +2606,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2714,8 +2725,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1"; @@ -3029,6 +3042,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3359,6 +3373,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3683,6 +3698,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3913,6 +3929,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4150,6 +4167,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -5416,6 +5434,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5668,6 +5687,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5716,6 +5736,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6192,6 +6213,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6203,6 +6225,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6263,6 +6286,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6473,6 +6497,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -8622,6 +8647,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 8410cc12012..974e9e05186 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -378,6 +378,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -764,6 +765,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1150,6 +1152,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1464,6 +1467,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1478,6 +1482,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1778,6 +1784,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1977,6 +1984,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -2012,6 +2020,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2430,6 +2439,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2595,6 +2605,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2713,8 +2724,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1"; @@ -3028,6 +3041,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3358,6 +3372,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3682,6 +3697,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3912,6 +3928,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4149,6 +4166,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -5415,6 +5433,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5667,6 +5686,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5715,6 +5735,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6191,6 +6212,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6202,6 +6224,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6262,6 +6285,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6472,6 +6496,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -8619,6 +8644,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 36c41b867d8..554ba8f0420 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -378,6 +378,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -764,6 +765,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1150,6 +1152,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1464,6 +1467,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1478,6 +1482,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1778,6 +1784,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1977,6 +1984,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -2012,6 +2020,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2430,6 +2439,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2595,6 +2605,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2713,8 +2724,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1"; @@ -3028,6 +3041,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3358,6 +3372,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3682,6 +3697,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3912,6 +3928,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4149,6 +4166,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4874,6 +4892,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5409,6 +5428,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5661,6 +5681,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5709,6 +5730,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6185,6 +6207,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6196,6 +6219,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6256,6 +6280,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6466,6 +6491,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -8613,6 +8639,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 6348ae3020d..d79f2da11d6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -378,6 +378,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -764,6 +765,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1150,6 +1152,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1464,6 +1467,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1478,6 +1482,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1778,6 +1784,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1977,6 +1984,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -2012,6 +2020,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2430,6 +2439,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2595,6 +2605,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2713,8 +2724,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1"; @@ -3028,6 +3041,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3356,6 +3370,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3680,6 +3695,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3909,6 +3925,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4146,6 +4163,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4871,6 +4889,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5405,6 +5424,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5657,6 +5677,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5705,6 +5726,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6181,6 +6203,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6192,6 +6215,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6252,6 +6276,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6462,6 +6487,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -8608,6 +8634,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index d8a3baeb71f..64c8026b729 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -378,6 +378,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -764,6 +765,7 @@ self: super: { "PDBtools" = dontDistribute super."PDBtools"; "PSQueue" = dontDistribute super."PSQueue"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1150,6 +1152,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1464,6 +1467,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authenticate-oauth" = dontDistribute super."authenticate-oauth"; @@ -1478,6 +1482,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1778,6 +1784,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1977,6 +1984,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -2012,6 +2020,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_1"; @@ -2430,6 +2439,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2595,6 +2605,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2713,8 +2724,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1"; @@ -3028,6 +3041,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "fair-predicates" = dontDistribute super."fair-predicates"; "fake-type" = dontDistribute super."fake-type"; @@ -3355,6 +3369,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = dontDistribute super."generic-xmlpickler"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3679,6 +3694,7 @@ self: super: { "graphs" = doDistribute super."graphs_0_5_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gravatar" = doDistribute super."gravatar_0_6"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3908,6 +3924,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4145,6 +4162,7 @@ self: super: { "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; "here" = doDistribute super."here_1_2_6"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4870,6 +4888,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5404,6 +5423,7 @@ self: super: { "logfloat" = doDistribute super."logfloat_0_12_1"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5656,6 +5676,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5704,6 +5725,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -6180,6 +6202,7 @@ self: super: { "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; "pager" = dontDistribute super."pager"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palette" = dontDistribute super."palette"; "palindromes" = dontDistribute super."palindromes"; @@ -6191,6 +6214,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6251,6 +6275,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_1_5"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6461,6 +6486,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -8607,6 +8633,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 6fabd0b50d9..3a14233ea2e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -375,6 +376,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -756,6 +758,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1140,6 +1143,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1453,6 +1457,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1466,6 +1471,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1763,6 +1770,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1963,6 +1971,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1997,6 +2006,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_2"; @@ -2181,6 +2191,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2407,6 +2418,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2572,6 +2584,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2690,8 +2703,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2815,6 +2830,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -3003,6 +3019,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3327,6 +3344,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3646,8 +3664,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3875,6 +3895,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4110,6 +4131,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4823,6 +4845,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5348,6 +5371,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5597,6 +5621,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5641,6 +5666,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5662,6 +5688,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6118,6 +6145,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6177,6 +6205,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6385,6 +6414,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6607,6 +6637,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7427,6 +7458,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7873,6 +7905,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8509,6 +8542,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index a960694c520..82b1a353a11 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -375,6 +376,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -756,6 +758,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1140,6 +1143,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1453,6 +1457,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1466,6 +1471,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1763,6 +1770,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1962,6 +1970,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1996,6 +2005,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_2"; @@ -2180,6 +2190,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2406,6 +2417,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2571,6 +2583,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2689,8 +2702,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2814,6 +2829,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -3002,6 +3018,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3326,6 +3343,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3645,8 +3663,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3874,6 +3894,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4075,6 +4096,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4108,6 +4130,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4821,6 +4844,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5346,6 +5370,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5595,6 +5620,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5639,6 +5665,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5660,6 +5687,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6116,6 +6144,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6175,6 +6204,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6383,6 +6413,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6605,6 +6636,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7425,6 +7457,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7871,6 +7904,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8506,6 +8540,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index a27fd4535ee..5ebadb1e29b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -374,6 +375,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -754,6 +756,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1135,6 +1138,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1446,6 +1450,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1459,6 +1464,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1754,6 +1761,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1950,6 +1958,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1984,6 +1993,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2167,6 +2177,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2392,6 +2403,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2556,6 +2568,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2674,8 +2687,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2798,6 +2813,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2985,6 +3001,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3307,6 +3324,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_2"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3436,6 +3454,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3625,8 +3644,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3852,6 +3873,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4053,6 +4075,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4086,6 +4109,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4794,6 +4818,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -4986,6 +5011,7 @@ self: super: { "keycode" = dontDistribute super."keycode"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5314,6 +5340,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5559,6 +5586,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5603,6 +5631,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5624,6 +5653,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6078,6 +6108,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6137,6 +6168,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6342,6 +6374,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6563,6 +6596,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7380,6 +7414,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7459,6 +7494,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7818,6 +7854,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8451,6 +8488,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 2bc005894d8..623c5715254 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -374,6 +375,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -754,6 +756,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1135,6 +1138,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1445,6 +1449,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1458,6 +1463,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1753,6 +1760,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1949,6 +1957,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1983,6 +1992,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2166,6 +2176,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2391,6 +2402,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2555,6 +2567,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2673,8 +2686,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2797,6 +2812,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2984,6 +3000,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3306,6 +3323,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_2"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3434,6 +3452,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3623,8 +3642,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3850,6 +3871,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4050,6 +4072,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4083,6 +4106,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4791,6 +4815,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -4982,6 +5007,7 @@ self: super: { "keycode" = dontDistribute super."keycode"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5310,6 +5336,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5555,6 +5582,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5598,6 +5626,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5619,6 +5648,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6072,6 +6102,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6131,6 +6162,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6336,6 +6368,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6557,6 +6590,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7373,6 +7407,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7452,6 +7487,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7809,6 +7845,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8442,6 +8479,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index e8bb7cb1583..60498ad14a0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -374,6 +375,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -754,6 +756,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1135,6 +1138,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1445,6 +1449,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1458,6 +1463,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1753,6 +1760,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1949,6 +1957,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1983,6 +1992,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2166,6 +2176,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2391,6 +2402,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2555,6 +2567,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2673,8 +2686,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2797,6 +2812,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2984,6 +3000,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3306,6 +3323,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_2"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3434,6 +3452,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3623,8 +3642,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3850,6 +3871,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4050,6 +4072,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4083,6 +4106,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4791,6 +4815,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -4982,6 +5007,7 @@ self: super: { "keycode" = dontDistribute super."keycode"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5310,6 +5336,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5555,6 +5582,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5598,6 +5626,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5619,6 +5648,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6072,6 +6102,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6131,6 +6162,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6336,6 +6368,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6557,6 +6590,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7372,6 +7406,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7451,6 +7486,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7808,6 +7844,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8441,6 +8478,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 6391bc0180e..37ab6fddf3a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -374,6 +375,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -754,6 +756,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1135,6 +1138,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1445,6 +1449,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1458,6 +1463,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1753,6 +1760,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1949,6 +1957,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1983,6 +1992,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2166,6 +2176,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2391,6 +2402,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2555,6 +2567,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2673,8 +2686,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2797,6 +2812,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2984,6 +3000,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3306,6 +3323,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_2"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3434,6 +3452,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3623,8 +3642,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3849,6 +3870,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4049,6 +4071,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4082,6 +4105,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4789,6 +4813,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -4980,6 +5005,7 @@ self: super: { "keycode" = dontDistribute super."keycode"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5308,6 +5334,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5553,6 +5580,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5596,6 +5624,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5617,6 +5646,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5807,6 +5837,7 @@ self: super: { "netrc" = dontDistribute super."netrc"; "netspec" = dontDistribute super."netspec"; "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = doDistribute super."nettle_0_1_1"; "nettle-frp" = dontDistribute super."nettle-frp"; "nettle-netkit" = dontDistribute super."nettle-netkit"; "nettle-openflow" = dontDistribute super."nettle-openflow"; @@ -6069,6 +6100,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6128,6 +6160,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6333,6 +6366,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6554,6 +6588,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7369,6 +7404,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7448,6 +7484,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7805,6 +7842,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8438,6 +8476,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 19f39ecba30..e5f971b07b8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -374,6 +375,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -754,6 +756,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1135,6 +1138,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1444,6 +1448,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1457,6 +1462,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1752,6 +1759,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1948,6 +1956,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1982,6 +1991,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2165,6 +2175,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2390,6 +2401,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2554,6 +2566,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2672,8 +2685,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2796,6 +2811,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2983,6 +2999,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3304,6 +3321,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_2"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3432,6 +3450,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3621,8 +3640,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3847,6 +3868,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4047,6 +4069,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4080,6 +4103,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4786,6 +4810,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -4977,6 +5002,7 @@ self: super: { "keycode" = dontDistribute super."keycode"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5305,6 +5331,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5550,6 +5577,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5593,6 +5621,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5614,6 +5643,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5804,6 +5834,7 @@ self: super: { "netrc" = dontDistribute super."netrc"; "netspec" = dontDistribute super."netspec"; "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = doDistribute super."nettle_0_1_1"; "nettle-frp" = dontDistribute super."nettle-frp"; "nettle-netkit" = dontDistribute super."nettle-netkit"; "nettle-openflow" = dontDistribute super."nettle-openflow"; @@ -6066,6 +6097,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6125,6 +6157,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6330,6 +6363,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6437,6 +6471,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6550,6 +6585,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7364,6 +7400,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7443,6 +7480,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7800,6 +7838,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8433,6 +8472,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 9efae29b78d..daf74d57f49 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -374,6 +375,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -754,6 +756,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1135,6 +1138,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1444,6 +1448,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1457,6 +1462,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1752,6 +1759,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1948,6 +1956,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1982,6 +1991,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2165,6 +2175,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2390,6 +2401,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2554,6 +2566,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2672,8 +2685,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2796,6 +2811,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2982,6 +2998,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3303,6 +3320,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_2"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3431,6 +3449,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3620,8 +3639,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3846,6 +3867,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4046,6 +4068,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4079,6 +4102,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4785,6 +4809,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -4976,6 +5001,7 @@ self: super: { "keycode" = dontDistribute super."keycode"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5304,6 +5330,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5549,6 +5576,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5591,6 +5619,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5612,6 +5641,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5802,6 +5832,7 @@ self: super: { "netrc" = dontDistribute super."netrc"; "netspec" = dontDistribute super."netspec"; "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = doDistribute super."nettle_0_1_1"; "nettle-frp" = dontDistribute super."nettle-frp"; "nettle-netkit" = dontDistribute super."nettle-netkit"; "nettle-openflow" = dontDistribute super."nettle-openflow"; @@ -6062,6 +6093,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6121,6 +6153,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6326,6 +6359,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6433,6 +6467,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6546,6 +6581,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7360,6 +7396,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7438,6 +7475,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7795,6 +7833,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8428,6 +8467,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 51e0764f82f..9d7781af7e7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -227,6 +227,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -373,6 +374,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -753,6 +755,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1134,6 +1137,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1443,6 +1447,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1456,6 +1461,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1751,6 +1758,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1947,6 +1955,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1981,6 +1990,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2163,6 +2173,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2387,6 +2398,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2551,6 +2563,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2668,8 +2681,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2792,6 +2807,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2978,6 +2994,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3298,6 +3315,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_2"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3426,6 +3444,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3615,8 +3634,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3841,6 +3862,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4041,6 +4063,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4074,6 +4097,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4780,6 +4804,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -4971,6 +4996,7 @@ self: super: { "keycode" = dontDistribute super."keycode"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5298,6 +5324,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5543,6 +5570,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5585,6 +5613,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5606,6 +5635,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5796,6 +5826,7 @@ self: super: { "netrc" = dontDistribute super."netrc"; "netspec" = dontDistribute super."netspec"; "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = doDistribute super."nettle_0_1_1"; "nettle-frp" = dontDistribute super."nettle-frp"; "nettle-netkit" = dontDistribute super."nettle-netkit"; "nettle-openflow" = dontDistribute super."nettle-openflow"; @@ -6056,6 +6087,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6115,6 +6147,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6320,6 +6353,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6427,6 +6461,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6540,6 +6575,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7354,6 +7390,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7432,6 +7469,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7789,6 +7827,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8422,6 +8461,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 4ab2085f1bc..994024d5298 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -227,6 +227,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -373,6 +374,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -753,6 +755,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1134,6 +1137,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1442,6 +1446,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1455,6 +1460,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1749,6 +1756,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1945,6 +1953,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1979,6 +1988,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2161,6 +2171,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2385,6 +2396,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2549,6 +2561,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2666,8 +2679,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2790,6 +2805,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2975,6 +2991,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3293,6 +3310,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3421,6 +3439,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3610,8 +3629,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3836,6 +3857,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4036,6 +4058,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4069,6 +4092,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4775,6 +4799,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -4966,6 +4991,7 @@ self: super: { "keycode" = dontDistribute super."keycode"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5293,6 +5319,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5538,6 +5565,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5580,6 +5608,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5601,6 +5630,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5791,6 +5821,7 @@ self: super: { "netrc" = dontDistribute super."netrc"; "netspec" = dontDistribute super."netspec"; "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = doDistribute super."nettle_0_1_1"; "nettle-frp" = dontDistribute super."nettle-frp"; "nettle-netkit" = dontDistribute super."nettle-netkit"; "nettle-openflow" = dontDistribute super."nettle-openflow"; @@ -6050,6 +6081,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6109,6 +6141,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6314,6 +6347,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6421,6 +6455,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6534,6 +6569,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7348,6 +7384,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7426,6 +7463,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7783,6 +7821,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8416,6 +8455,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index 71ad819477a..ddbb61c0e6c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -227,6 +227,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -373,6 +374,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -753,6 +755,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1134,6 +1137,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1442,6 +1446,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1455,6 +1460,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1749,6 +1756,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1944,6 +1952,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1978,6 +1987,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2160,6 +2170,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2384,6 +2395,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2548,6 +2560,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2665,8 +2678,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2788,6 +2803,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2973,6 +2989,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3291,6 +3308,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3419,6 +3437,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3608,8 +3627,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3834,6 +3855,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4034,6 +4056,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4066,6 +4089,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4772,6 +4796,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -4963,6 +4988,7 @@ self: super: { "keycode" = dontDistribute super."keycode"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5290,6 +5316,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5535,6 +5562,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5577,6 +5605,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5598,6 +5627,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5788,6 +5818,7 @@ self: super: { "netrc" = dontDistribute super."netrc"; "netspec" = dontDistribute super."netspec"; "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = doDistribute super."nettle_0_1_1"; "nettle-frp" = dontDistribute super."nettle-frp"; "nettle-netkit" = dontDistribute super."nettle-netkit"; "nettle-openflow" = dontDistribute super."nettle-openflow"; @@ -6046,6 +6077,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6105,6 +6137,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6309,6 +6342,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6416,6 +6450,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6529,6 +6564,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7343,6 +7379,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7421,6 +7458,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7777,6 +7815,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8410,6 +8449,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index 80547ee44ab..0806b361a3a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -227,6 +227,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -373,6 +374,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -753,6 +755,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1134,6 +1137,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1442,6 +1446,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1455,6 +1460,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1749,6 +1756,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1944,6 +1952,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1978,6 +1987,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2160,6 +2170,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2384,6 +2395,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2548,6 +2560,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2665,8 +2678,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2788,6 +2803,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2973,6 +2989,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3290,6 +3307,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3418,6 +3436,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3607,8 +3626,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3833,6 +3854,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4033,6 +4055,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4065,6 +4088,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4771,6 +4795,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -4962,6 +4987,7 @@ self: super: { "keycode" = dontDistribute super."keycode"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5289,6 +5315,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5533,6 +5560,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5575,6 +5603,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5596,6 +5625,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5785,6 +5815,7 @@ self: super: { "netrc" = dontDistribute super."netrc"; "netspec" = dontDistribute super."netspec"; "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = doDistribute super."nettle_0_1_1"; "nettle-frp" = dontDistribute super."nettle-frp"; "nettle-netkit" = dontDistribute super."nettle-netkit"; "nettle-openflow" = dontDistribute super."nettle-openflow"; @@ -6043,6 +6074,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6102,6 +6134,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6306,6 +6339,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6413,6 +6447,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6526,6 +6561,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7338,6 +7374,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7416,6 +7453,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7772,6 +7810,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8405,6 +8444,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index f465fc7d0e0..a9525906dda 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -375,6 +376,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -756,6 +758,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1139,6 +1142,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1452,6 +1456,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1465,6 +1470,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1762,6 +1769,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1959,6 +1967,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1993,6 +2002,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_2"; @@ -2177,6 +2187,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2403,6 +2414,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2568,6 +2580,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2686,8 +2699,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2811,6 +2826,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2999,6 +3015,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3323,6 +3340,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3642,8 +3660,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3871,6 +3891,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4072,6 +4093,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4105,6 +4127,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4818,6 +4841,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5343,6 +5367,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5592,6 +5617,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5636,6 +5662,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5657,6 +5684,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6113,6 +6141,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6172,6 +6201,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6380,6 +6410,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6602,6 +6633,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7422,6 +7454,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7868,6 +7901,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8503,6 +8537,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 4564473ba13..6e027c87206 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -227,6 +227,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -373,6 +374,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -753,6 +755,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1134,6 +1137,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1442,6 +1446,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1455,6 +1460,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1749,6 +1756,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1944,6 +1952,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1978,6 +1987,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2159,6 +2169,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2383,6 +2394,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2547,6 +2559,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2664,8 +2677,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2787,6 +2802,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2972,6 +2988,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3289,6 +3306,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3417,6 +3435,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3606,8 +3625,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3832,6 +3853,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3847,6 +3869,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -4031,6 +4054,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4063,6 +4087,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4769,6 +4794,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -4960,6 +4986,7 @@ self: super: { "keycode" = dontDistribute super."keycode"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5287,6 +5314,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = doDistribute super."logging-facade_0_0_0"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5531,6 +5559,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5573,6 +5602,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5594,6 +5624,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5783,6 +5814,7 @@ self: super: { "netrc" = dontDistribute super."netrc"; "netspec" = dontDistribute super."netspec"; "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = doDistribute super."nettle_0_1_1"; "nettle-frp" = dontDistribute super."nettle-frp"; "nettle-netkit" = dontDistribute super."nettle-netkit"; "nettle-openflow" = dontDistribute super."nettle-openflow"; @@ -6041,6 +6073,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6100,6 +6133,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6303,6 +6337,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6410,6 +6445,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6523,6 +6559,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7334,6 +7371,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7412,6 +7450,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7768,6 +7807,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8401,6 +8441,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 22d82a721f2..dadf8a23dd4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -227,6 +227,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -373,6 +374,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -753,6 +755,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1134,6 +1137,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1442,6 +1446,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1455,6 +1460,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1749,6 +1756,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1944,6 +1952,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1978,6 +1987,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2159,6 +2169,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2383,6 +2394,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2547,6 +2559,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2664,8 +2677,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2787,6 +2802,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2972,6 +2988,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3289,6 +3306,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3417,6 +3435,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3606,8 +3625,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3832,6 +3853,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3847,6 +3869,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -4031,6 +4054,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4063,6 +4087,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4769,6 +4794,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -4960,6 +4986,7 @@ self: super: { "keycode" = dontDistribute super."keycode"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5286,6 +5313,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = doDistribute super."logging-facade_0_0_0"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5530,6 +5558,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5572,6 +5601,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5593,6 +5623,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5782,6 +5813,7 @@ self: super: { "netrc" = dontDistribute super."netrc"; "netspec" = dontDistribute super."netspec"; "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = doDistribute super."nettle_0_1_1"; "nettle-frp" = dontDistribute super."nettle-frp"; "nettle-netkit" = dontDistribute super."nettle-netkit"; "nettle-openflow" = dontDistribute super."nettle-openflow"; @@ -6040,6 +6072,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6099,6 +6132,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6302,6 +6336,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6408,6 +6443,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6521,6 +6557,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7332,6 +7369,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7410,6 +7448,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7766,6 +7805,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8397,6 +8437,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 2d29666323a..e08526634eb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -227,6 +227,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -373,6 +374,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -753,6 +755,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1134,6 +1137,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1442,6 +1446,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1455,6 +1460,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1749,6 +1756,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1944,6 +1952,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1978,6 +1987,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2159,6 +2169,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2383,6 +2394,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2547,6 +2559,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2664,8 +2677,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_2_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2787,6 +2802,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2972,6 +2988,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3289,6 +3306,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3417,6 +3435,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3606,8 +3625,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3832,6 +3853,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3847,6 +3869,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -4031,6 +4054,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4063,6 +4087,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4768,6 +4793,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -4959,6 +4985,7 @@ self: super: { "keycode" = dontDistribute super."keycode"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5285,6 +5312,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = doDistribute super."logging-facade_0_0_0"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5529,6 +5557,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5570,6 +5599,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5591,6 +5621,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5780,6 +5811,7 @@ self: super: { "netrc" = dontDistribute super."netrc"; "netspec" = dontDistribute super."netspec"; "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = doDistribute super."nettle_0_1_1"; "nettle-frp" = dontDistribute super."nettle-frp"; "nettle-netkit" = dontDistribute super."nettle-netkit"; "nettle-openflow" = dontDistribute super."nettle-openflow"; @@ -6038,6 +6070,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6097,6 +6130,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6300,6 +6334,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6406,6 +6441,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6519,6 +6555,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7330,6 +7367,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7408,6 +7446,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7764,6 +7803,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8395,6 +8435,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 9ce164f18ae..a7b174ac697 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -375,6 +376,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -756,6 +758,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1139,6 +1142,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1452,6 +1456,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1465,6 +1470,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1762,6 +1769,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1959,6 +1967,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1993,6 +2002,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_2"; @@ -2177,6 +2187,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2403,6 +2414,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2568,6 +2580,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2686,8 +2699,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2811,6 +2826,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2999,6 +3015,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3322,6 +3339,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3641,8 +3659,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3870,6 +3890,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4071,6 +4092,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4104,6 +4126,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4816,6 +4839,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5341,6 +5365,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5590,6 +5615,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5634,6 +5660,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5655,6 +5682,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6111,6 +6139,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6170,6 +6199,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6378,6 +6408,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6600,6 +6631,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7420,6 +7452,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7866,6 +7899,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8501,6 +8535,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 9f312a97132..bd91cd5d3ab 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -375,6 +376,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -756,6 +758,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1139,6 +1142,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1452,6 +1456,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1465,6 +1470,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1761,6 +1768,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1958,6 +1966,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1992,6 +2001,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_2"; @@ -2176,6 +2186,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2402,6 +2413,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2567,6 +2579,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2685,8 +2698,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2810,6 +2825,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2998,6 +3014,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3321,6 +3338,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3640,8 +3658,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3869,6 +3889,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4070,6 +4091,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4103,6 +4125,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4815,6 +4838,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5340,6 +5364,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5588,6 +5613,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5632,6 +5658,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5653,6 +5680,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6108,6 +6136,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6167,6 +6196,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6374,6 +6404,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6596,6 +6627,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7415,6 +7447,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7861,6 +7894,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8496,6 +8530,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 72c3763423f..635a2891ed7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -375,6 +376,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -756,6 +758,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1139,6 +1142,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1452,6 +1456,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1465,6 +1470,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1761,6 +1768,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1958,6 +1966,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1992,6 +2001,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_2"; @@ -2176,6 +2186,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2401,6 +2412,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2566,6 +2578,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2684,8 +2697,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2809,6 +2824,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2997,6 +3013,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3320,6 +3337,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3639,8 +3657,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3868,6 +3888,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4069,6 +4090,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4102,6 +4124,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4814,6 +4837,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5338,6 +5362,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5586,6 +5611,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5630,6 +5656,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5651,6 +5678,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6106,6 +6134,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6165,6 +6194,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6372,6 +6402,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6594,6 +6625,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7413,6 +7445,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7497,6 +7530,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7858,6 +7892,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8493,6 +8528,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 6a7f7dbb61c..8f980cca42f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -375,6 +376,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -756,6 +758,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1137,6 +1140,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1450,6 +1454,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1463,6 +1468,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1758,6 +1765,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1955,6 +1963,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1989,6 +1998,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2173,6 +2183,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2398,6 +2409,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2563,6 +2575,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2681,8 +2694,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2806,6 +2821,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2994,6 +3010,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3317,6 +3334,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3636,8 +3654,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3863,6 +3883,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4064,6 +4085,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4097,6 +4119,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4809,6 +4832,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5333,6 +5357,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5581,6 +5606,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5625,6 +5651,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5646,6 +5673,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6100,6 +6128,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6159,6 +6188,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6366,6 +6396,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6588,6 +6619,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7407,6 +7439,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7491,6 +7524,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7852,6 +7886,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8485,6 +8520,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 75470676e94..374c8cb12a0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -374,6 +375,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -755,6 +757,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1136,6 +1139,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1449,6 +1453,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1462,6 +1467,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1757,6 +1764,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1954,6 +1962,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1988,6 +1997,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2172,6 +2182,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2397,6 +2408,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2562,6 +2574,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2680,8 +2693,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2805,6 +2820,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2993,6 +3009,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3316,6 +3333,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3635,8 +3653,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3862,6 +3882,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4063,6 +4084,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4096,6 +4118,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4808,6 +4831,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5332,6 +5356,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5580,6 +5605,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5624,6 +5650,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5645,6 +5672,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6099,6 +6127,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6158,6 +6187,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6365,6 +6395,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6587,6 +6618,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7406,6 +7438,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7490,6 +7523,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7851,6 +7885,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8484,6 +8519,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 2c63de232a5..0f7c80b6b1c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -374,6 +375,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -754,6 +756,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1135,6 +1138,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1448,6 +1452,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1461,6 +1466,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1756,6 +1763,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1953,6 +1961,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1987,6 +1996,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2171,6 +2181,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2396,6 +2407,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2561,6 +2573,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2679,8 +2692,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2804,6 +2819,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2992,6 +3008,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3314,6 +3331,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3633,8 +3651,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3860,6 +3880,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4061,6 +4082,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4094,6 +4116,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4805,6 +4828,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5329,6 +5353,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5577,6 +5602,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5621,6 +5647,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5642,6 +5669,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6096,6 +6124,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6155,6 +6184,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6362,6 +6392,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6584,6 +6615,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7401,6 +7433,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7483,6 +7516,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7844,6 +7878,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8477,6 +8512,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index ecaa0525791..5fac6754c24 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -228,6 +228,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -374,6 +375,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -754,6 +756,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1135,6 +1138,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1446,6 +1450,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1459,6 +1464,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1754,6 +1761,7 @@ self: super: { "bowntz" = dontDistribute super."bowntz"; "boxes" = dontDistribute super."boxes"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1950,6 +1958,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1984,6 +1993,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2168,6 +2178,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2393,6 +2404,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2558,6 +2570,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2676,8 +2689,10 @@ self: super: { "distributed-static" = doDistribute super."distributed-static_0_3_1_0"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2800,6 +2815,7 @@ self: super: { "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; "editor-open" = dontDistribute super."editor-open"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2987,6 +3003,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3309,6 +3326,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3438,6 +3456,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_0_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3627,8 +3646,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = doDistribute super."graphviz_2999_17_0_2"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3854,6 +3875,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -4055,6 +4077,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = dontDistribute super."hedis"; @@ -4088,6 +4111,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4797,6 +4821,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = dontDistribute super."invariant"; @@ -5320,6 +5345,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade" = dontDistribute super."logging-facade"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; @@ -5567,6 +5593,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5611,6 +5638,7 @@ self: super: { "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; "monad-peel" = dontDistribute super."monad-peel"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = dontDistribute super."monad-skeleton"; @@ -5632,6 +5660,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -6086,6 +6115,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -6145,6 +6175,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = dontDistribute super."path"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6351,6 +6382,7 @@ self: super: { "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6573,6 +6605,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7390,6 +7423,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7470,6 +7504,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-canvas" = dontDistribute super."static-canvas"; @@ -7829,6 +7864,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_11_1"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8462,6 +8498,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index e81f80f76ff..b9924f20fbd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -217,6 +217,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -363,6 +364,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -740,6 +742,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1110,6 +1113,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1401,6 +1405,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1413,6 +1418,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1466,6 +1473,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1537,6 +1545,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1691,6 +1700,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1881,6 +1891,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1894,6 +1905,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1914,6 +1926,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2091,6 +2104,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2216,6 +2230,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2311,6 +2326,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2471,6 +2487,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2581,8 +2598,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2701,6 +2720,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2747,6 +2767,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2879,6 +2900,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -3188,6 +3210,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3242,6 +3265,7 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3"; @@ -3314,6 +3338,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3501,8 +3526,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3722,6 +3749,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3737,6 +3765,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3919,6 +3948,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3951,6 +3981,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4636,6 +4667,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = doDistribute super."invariant_0_2"; @@ -4820,6 +4852,7 @@ self: super: { "keycode" = doDistribute super."keycode_0_1"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5127,6 +5160,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5294,6 +5328,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5361,6 +5397,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5400,6 +5437,7 @@ self: super: { "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5419,6 +5457,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5854,6 +5893,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5912,6 +5952,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6106,6 +6147,7 @@ self: super: { "poly-arity" = doDistribute super."poly-arity_0_0_4_1"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6212,6 +6254,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6324,6 +6367,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7124,6 +7168,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7182,6 +7227,7 @@ self: super: { "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7195,6 +7241,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7545,6 +7592,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8152,6 +8200,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 63c55b1c023..c81484ff3fb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -217,6 +217,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -363,6 +364,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -740,6 +742,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1110,6 +1113,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1400,6 +1404,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1412,6 +1417,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1465,6 +1472,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1536,6 +1544,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1690,6 +1699,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1880,6 +1890,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1893,6 +1904,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1913,6 +1925,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2090,6 +2103,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2215,6 +2229,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2310,6 +2325,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2470,6 +2486,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2580,8 +2597,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dlist" = doDistribute super."dlist_0_7_1_1"; @@ -2700,6 +2719,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2746,6 +2766,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2878,6 +2899,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2946,6 +2968,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -3184,6 +3207,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3238,6 +3262,7 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3"; @@ -3310,6 +3335,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3497,8 +3523,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3718,6 +3746,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3733,6 +3762,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3915,6 +3945,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3947,6 +3978,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4632,6 +4664,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = doDistribute super."invariant_0_2"; @@ -4816,6 +4849,7 @@ self: super: { "keycode" = doDistribute super."keycode_0_1"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5123,6 +5157,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5289,6 +5324,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5356,6 +5393,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5395,6 +5433,7 @@ self: super: { "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5414,6 +5453,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5848,6 +5888,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5906,6 +5947,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6099,6 +6141,7 @@ self: super: { "poly-arity" = doDistribute super."poly-arity_0_0_4_1"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6205,6 +6248,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6317,6 +6361,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -7116,6 +7161,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7174,6 +7220,7 @@ self: super: { "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7187,6 +7234,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7537,6 +7585,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8143,6 +8192,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index 2e42946cd2a..c9947c4a0ca 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -214,6 +214,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -359,6 +360,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -733,6 +735,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1102,6 +1105,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1385,6 +1390,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1397,6 +1403,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1450,6 +1458,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1521,6 +1530,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1672,6 +1682,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1836,6 +1847,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1858,6 +1870,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1871,6 +1884,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1891,6 +1905,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2067,6 +2082,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2119,6 +2135,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2188,6 +2205,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2283,6 +2301,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2443,6 +2462,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2547,8 +2567,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2664,6 +2686,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2710,6 +2733,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2797,6 +2821,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = doDistribute super."exhaustive_1_1_1"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -2839,6 +2864,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2869,6 +2895,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2905,6 +2932,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2978,6 +3006,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3139,6 +3168,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3192,6 +3222,7 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3"; @@ -3262,6 +3293,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3449,8 +3481,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3669,6 +3703,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3684,6 +3719,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3864,6 +3900,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3896,6 +3933,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4575,8 +4613,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4755,6 +4795,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5059,6 +5100,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5139,6 +5181,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5223,6 +5266,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5289,6 +5334,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5327,6 +5373,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5346,6 +5393,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5775,6 +5823,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5831,6 +5880,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6020,6 +6070,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6091,6 +6142,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6121,6 +6173,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6231,6 +6284,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6694,6 +6748,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -7017,6 +7072,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7074,6 +7130,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7087,6 +7144,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7431,6 +7489,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8026,6 +8085,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index d80c005eb5d..a2908fa2174 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -214,6 +214,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -359,6 +360,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -733,6 +735,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1102,6 +1105,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1385,6 +1390,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1397,6 +1403,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1450,6 +1458,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1521,6 +1530,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1671,6 +1681,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1834,6 +1845,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1856,6 +1868,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1869,6 +1882,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1889,6 +1903,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2065,6 +2080,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2117,6 +2133,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2186,6 +2203,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2281,6 +2299,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2441,6 +2460,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2545,8 +2565,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2662,6 +2684,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2708,6 +2731,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2795,6 +2819,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2836,6 +2861,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2866,6 +2892,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2902,6 +2929,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2975,6 +3003,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3136,6 +3165,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3189,8 +3219,10 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3258,6 +3290,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3445,8 +3478,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3665,6 +3700,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3680,6 +3716,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3860,6 +3897,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3892,6 +3930,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4571,8 +4610,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4751,6 +4792,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5055,6 +5097,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5135,6 +5178,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5219,6 +5263,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5285,6 +5331,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5323,6 +5370,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5342,6 +5390,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5771,6 +5820,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5827,6 +5877,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6015,6 +6066,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6086,6 +6138,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6116,6 +6169,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6226,6 +6280,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6578,6 +6633,7 @@ self: super: { "safe-length" = dontDistribute super."safe-length"; "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; + "safecopy" = doDistribute super."safecopy_0_8_6"; "safeint" = dontDistribute super."safeint"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; @@ -6688,6 +6744,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -7010,6 +7067,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7067,6 +7125,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7080,6 +7139,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7424,6 +7484,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8019,6 +8080,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index e0f180cdc61..84dc56c88d0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -213,6 +213,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -358,6 +359,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -732,6 +734,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1101,6 +1104,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1384,6 +1389,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1396,6 +1402,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1449,6 +1457,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1520,6 +1529,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1670,6 +1680,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1833,6 +1844,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1855,6 +1867,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1868,6 +1881,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1888,6 +1902,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "chell-hunit" = dontDistribute super."chell-hunit"; @@ -2060,6 +2075,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2112,6 +2128,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2181,6 +2198,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2276,6 +2294,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2436,6 +2455,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2540,8 +2560,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2657,6 +2679,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2703,6 +2726,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2790,6 +2814,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2831,6 +2856,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2861,6 +2887,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2897,6 +2924,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2970,6 +2998,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3131,6 +3160,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3184,8 +3214,10 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3253,6 +3285,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3439,8 +3472,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3659,6 +3694,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3674,6 +3710,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3854,6 +3891,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3886,6 +3924,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4565,8 +4604,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4745,6 +4786,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5049,6 +5091,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5129,6 +5172,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5213,6 +5257,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5279,6 +5325,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5317,6 +5364,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5336,6 +5384,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5765,6 +5814,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5821,6 +5871,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -6008,6 +6059,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6079,6 +6131,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6109,6 +6162,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6219,6 +6273,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6571,6 +6626,7 @@ self: super: { "safe-length" = dontDistribute super."safe-length"; "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; + "safecopy" = doDistribute super."safecopy_0_8_6"; "safeint" = dontDistribute super."safeint"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; @@ -6681,6 +6737,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -7003,6 +7060,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7060,6 +7118,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7073,6 +7132,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7415,6 +7475,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8010,6 +8071,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index f77465dd8e8..47528726e07 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -213,6 +213,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -358,6 +359,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -732,6 +734,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1101,6 +1104,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1384,6 +1389,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1396,6 +1402,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1449,6 +1457,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1520,6 +1529,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1670,6 +1680,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1833,6 +1844,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1855,6 +1867,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1868,6 +1881,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1888,6 +1902,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "chell-hunit" = dontDistribute super."chell-hunit"; @@ -2060,6 +2075,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2112,6 +2128,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2181,6 +2198,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2276,6 +2294,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2436,6 +2455,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2540,8 +2560,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2657,6 +2679,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2703,6 +2726,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2790,6 +2814,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2831,6 +2856,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2861,6 +2887,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2897,6 +2924,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2970,6 +2998,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3131,6 +3160,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3184,8 +3214,10 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3253,6 +3285,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3439,8 +3472,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3659,6 +3694,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3674,6 +3710,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3854,6 +3891,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3886,6 +3924,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4564,8 +4603,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4744,6 +4785,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5047,6 +5089,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5127,6 +5170,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5211,6 +5255,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5277,6 +5323,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5315,6 +5362,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5334,6 +5382,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5763,6 +5812,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5819,6 +5869,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -6005,6 +6056,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6076,6 +6128,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6106,6 +6159,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6216,6 +6270,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6568,6 +6623,7 @@ self: super: { "safe-length" = dontDistribute super."safe-length"; "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; + "safecopy" = doDistribute super."safecopy_0_8_6"; "safeint" = dontDistribute super."safeint"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; @@ -6678,6 +6734,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -7000,6 +7057,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7057,6 +7115,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7070,6 +7129,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7411,6 +7471,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8005,6 +8066,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index c825eb20d7c..296fbd0b720 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -213,6 +213,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -358,6 +359,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -732,6 +734,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1099,6 +1102,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1382,6 +1387,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1394,6 +1400,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1447,6 +1455,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1518,6 +1527,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1668,6 +1678,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1830,6 +1841,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1852,6 +1864,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1865,6 +1878,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1885,6 +1899,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "chell-hunit" = dontDistribute super."chell-hunit"; @@ -2057,6 +2072,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2109,6 +2125,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2177,6 +2194,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2272,6 +2290,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2432,6 +2451,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2534,8 +2554,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2650,6 +2672,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2696,6 +2719,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2783,6 +2807,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2824,6 +2849,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2854,6 +2880,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2890,6 +2917,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2963,6 +2991,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3124,6 +3153,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3177,8 +3207,10 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3246,6 +3278,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3432,8 +3465,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3652,6 +3687,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3667,6 +3703,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3847,6 +3884,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3879,6 +3917,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4556,8 +4595,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4736,6 +4777,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5039,6 +5081,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5118,6 +5161,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5202,6 +5246,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5268,6 +5314,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5306,6 +5353,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5325,6 +5373,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5753,6 +5802,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5809,6 +5859,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5912,6 +5963,7 @@ self: super: { "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; @@ -5994,6 +6046,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6065,6 +6118,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6095,6 +6149,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6205,6 +6260,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6557,6 +6613,7 @@ self: super: { "safe-length" = dontDistribute super."safe-length"; "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; + "safecopy" = doDistribute super."safecopy_0_8_6"; "safeint" = dontDistribute super."safeint"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; @@ -6667,6 +6724,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -6989,6 +7047,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7046,6 +7105,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7059,6 +7119,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7283,6 +7344,7 @@ self: super: { "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; + "tasty-silver" = doDistribute super."tasty-silver_3_1_8"; "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; @@ -7399,6 +7461,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -7991,6 +8054,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index 196ce630791..62c422826bc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -213,6 +213,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -358,6 +359,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -650,6 +652,7 @@ self: super: { "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; "MonadCompose" = dontDistribute super."MonadCompose"; "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandom" = doDistribute super."MonadRandom_0_4_1"; "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; "MonadStack" = dontDistribute super."MonadStack"; "Monadius" = dontDistribute super."Monadius"; @@ -731,6 +734,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1098,6 +1102,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1381,6 +1387,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1393,6 +1400,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1446,6 +1455,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1517,6 +1527,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1667,6 +1678,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1829,6 +1841,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1851,6 +1864,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1864,6 +1878,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1884,6 +1899,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "chell-hunit" = dontDistribute super."chell-hunit"; @@ -2056,6 +2072,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2108,6 +2125,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2176,6 +2194,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2271,6 +2290,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2431,6 +2451,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2533,8 +2554,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2649,6 +2672,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2695,6 +2719,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2782,6 +2807,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2823,6 +2849,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2853,6 +2880,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2889,6 +2917,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2962,6 +2991,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3122,6 +3152,7 @@ self: super: { "generic-tree" = dontDistribute super."generic-tree"; "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3175,8 +3206,10 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3244,6 +3277,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3430,8 +3464,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3650,6 +3686,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3665,6 +3702,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3844,6 +3882,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3876,6 +3915,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4551,8 +4591,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4731,6 +4773,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5034,6 +5077,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5113,6 +5157,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5197,6 +5242,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5263,6 +5310,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5301,6 +5349,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5320,6 +5369,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5747,6 +5797,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5803,6 +5854,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5906,6 +5958,7 @@ self: super: { "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; @@ -5988,6 +6041,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6059,6 +6113,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6089,6 +6144,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6198,6 +6254,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6550,6 +6607,7 @@ self: super: { "safe-length" = dontDistribute super."safe-length"; "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; + "safecopy" = doDistribute super."safecopy_0_8_6"; "safeint" = dontDistribute super."safeint"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; @@ -6660,6 +6718,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -6981,6 +7040,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7038,6 +7098,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7051,6 +7112,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7275,6 +7337,7 @@ self: super: { "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; + "tasty-silver" = doDistribute super."tasty-silver_3_1_8"; "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; @@ -7387,9 +7450,11 @@ self: super: { "th-instances" = dontDistribute super."th-instances"; "th-kinds" = dontDistribute super."th-kinds"; "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift" = doDistribute super."th-lift_0_7_5"; "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -7982,6 +8047,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index 61f0822da0d..5bd2c57df75 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -213,6 +213,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -358,6 +359,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -649,6 +651,7 @@ self: super: { "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; "MonadCompose" = dontDistribute super."MonadCompose"; "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandom" = doDistribute super."MonadRandom_0_4_1"; "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; "MonadStack" = dontDistribute super."MonadStack"; "Monadius" = dontDistribute super."Monadius"; @@ -730,6 +733,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1097,6 +1101,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1380,6 +1386,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1392,6 +1399,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1444,6 +1453,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1515,6 +1525,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1665,6 +1676,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1827,6 +1839,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1849,6 +1862,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1862,6 +1876,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1882,6 +1897,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "chell-hunit" = dontDistribute super."chell-hunit"; @@ -2054,6 +2070,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2106,6 +2123,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2174,6 +2192,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2269,6 +2288,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2429,6 +2449,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2531,8 +2552,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2647,6 +2670,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2693,6 +2717,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2779,6 +2804,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2820,6 +2846,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2850,6 +2877,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2886,6 +2914,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2959,6 +2988,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3119,6 +3149,7 @@ self: super: { "generic-tree" = dontDistribute super."generic-tree"; "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3172,8 +3203,10 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3241,6 +3274,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3427,8 +3461,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3646,6 +3682,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3661,6 +3698,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3840,6 +3878,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3872,6 +3911,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4547,8 +4587,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4727,6 +4769,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5029,6 +5072,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5108,6 +5152,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5191,6 +5236,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5257,6 +5304,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5295,6 +5343,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5314,6 +5363,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5741,6 +5791,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5796,6 +5847,7 @@ self: super: { "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5899,6 +5951,7 @@ self: super: { "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; @@ -5981,6 +6034,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6051,6 +6105,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6081,6 +6136,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6190,6 +6246,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6541,6 +6598,7 @@ self: super: { "safe-length" = dontDistribute super."safe-length"; "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; + "safecopy" = doDistribute super."safecopy_0_8_6"; "safeint" = dontDistribute super."safeint"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; @@ -6650,6 +6708,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -6971,6 +7030,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7028,6 +7088,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7041,6 +7102,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7263,6 +7325,7 @@ self: super: { "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; + "tasty-silver" = doDistribute super."tasty-silver_3_1_8"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7374,9 +7437,11 @@ self: super: { "th-instances" = dontDistribute super."th-instances"; "th-kinds" = dontDistribute super."th-kinds"; "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift" = doDistribute super."th-lift_0_7_5"; "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -7968,6 +8033,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix index 2fe2d0755b0..c0b0a8b92a1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix @@ -213,6 +213,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -358,6 +359,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -648,6 +650,7 @@ self: super: { "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; "MonadCompose" = dontDistribute super."MonadCompose"; "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandom" = doDistribute super."MonadRandom_0_4_1"; "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; "MonadStack" = dontDistribute super."MonadStack"; "Monadius" = dontDistribute super."Monadius"; @@ -729,6 +732,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1096,6 +1100,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1378,6 +1384,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1390,6 +1397,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1442,6 +1451,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1513,6 +1523,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1663,6 +1674,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1701,6 +1713,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1824,6 +1837,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1846,6 +1860,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -1858,6 +1873,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1878,6 +1894,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "chell-hunit" = dontDistribute super."chell-hunit"; @@ -2050,6 +2067,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2101,6 +2119,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2169,6 +2188,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2264,6 +2284,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2424,6 +2445,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2442,6 +2464,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_1"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; @@ -2525,8 +2548,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2641,6 +2666,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2687,6 +2713,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2773,6 +2800,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2814,6 +2842,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2844,6 +2873,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2880,6 +2910,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2953,6 +2984,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3113,6 +3145,7 @@ self: super: { "generic-tree" = dontDistribute super."generic-tree"; "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3166,8 +3199,10 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3235,6 +3270,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3421,8 +3457,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3639,6 +3677,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3654,6 +3693,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3833,6 +3873,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3865,6 +3906,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4539,8 +4581,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4719,6 +4763,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5020,6 +5065,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5099,6 +5145,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5182,6 +5229,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5248,6 +5297,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5286,6 +5336,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-state" = dontDistribute super."monad-state"; @@ -5304,6 +5355,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5731,6 +5783,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5786,6 +5839,7 @@ self: super: { "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5846,6 +5900,7 @@ self: super: { "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_2"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; @@ -5888,6 +5943,7 @@ self: super: { "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; @@ -5970,6 +6026,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6040,6 +6097,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6070,6 +6128,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6085,6 +6144,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_2"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6178,6 +6238,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6528,6 +6589,7 @@ self: super: { "safe-length" = dontDistribute super."safe-length"; "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; + "safecopy" = doDistribute super."safecopy_0_8_6"; "safeint" = dontDistribute super."safeint"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; @@ -6637,6 +6699,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -6958,6 +7021,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7015,6 +7079,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7028,6 +7093,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7250,6 +7316,7 @@ self: super: { "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; + "tasty-silver" = doDistribute super."tasty-silver_3_1_8"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7361,9 +7428,11 @@ self: super: { "th-instances" = dontDistribute super."th-instances"; "th-kinds" = dontDistribute super."th-kinds"; "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift" = doDistribute super."th-lift_0_7_5"; "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -7954,6 +8023,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; @@ -8107,6 +8177,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_2"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -8132,6 +8203,7 @@ 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_11"; "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"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix index 478bbdcfa28..2ae19af57cd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix @@ -213,6 +213,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -358,6 +359,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -648,6 +650,7 @@ self: super: { "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; "MonadCompose" = dontDistribute super."MonadCompose"; "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandom" = doDistribute super."MonadRandom_0_4_1"; "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; "MonadStack" = dontDistribute super."MonadStack"; "Monadius" = dontDistribute super."Monadius"; @@ -729,6 +732,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1096,6 +1100,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1378,6 +1384,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1390,6 +1397,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1442,6 +1451,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1513,6 +1523,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1663,6 +1674,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1701,6 +1713,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1823,6 +1836,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1845,6 +1859,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -1857,6 +1872,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1877,6 +1893,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "chell-hunit" = dontDistribute super."chell-hunit"; @@ -2049,6 +2066,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2100,6 +2118,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2168,6 +2187,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2263,6 +2283,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2423,6 +2444,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2441,6 +2463,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_1"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; @@ -2524,8 +2547,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2640,6 +2665,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2686,6 +2712,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2772,6 +2799,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2813,6 +2841,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2843,6 +2872,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2879,6 +2909,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2952,6 +2983,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3112,6 +3144,7 @@ self: super: { "generic-tree" = dontDistribute super."generic-tree"; "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3165,8 +3198,10 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3233,6 +3268,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3418,8 +3454,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3573,6 +3611,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_2"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3634,6 +3673,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3649,6 +3689,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3827,6 +3868,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3859,6 +3901,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4529,8 +4572,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4709,6 +4754,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5010,6 +5056,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5089,6 +5136,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5172,6 +5220,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5238,6 +5288,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5276,6 +5327,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-state" = dontDistribute super."monad-state"; @@ -5294,6 +5346,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5721,6 +5774,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5775,6 +5829,7 @@ self: super: { "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5835,6 +5890,7 @@ self: super: { "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_2"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; @@ -5877,6 +5933,7 @@ self: super: { "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes" = doDistribute super."pipes_4_1_7"; "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; @@ -5959,6 +6016,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6029,6 +6087,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6059,6 +6118,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6074,6 +6134,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_2"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6165,6 +6226,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6515,6 +6577,7 @@ self: super: { "safe-length" = dontDistribute super."safe-length"; "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; + "safecopy" = doDistribute super."safecopy_0_8_6"; "safeint" = dontDistribute super."safeint"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; @@ -6624,6 +6687,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -6944,6 +7008,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7001,6 +7066,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7014,6 +7080,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7236,6 +7303,7 @@ self: super: { "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; + "tasty-silver" = doDistribute super."tasty-silver_3_1_8"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7346,9 +7414,11 @@ self: super: { "th-instances" = dontDistribute super."th-instances"; "th-kinds" = dontDistribute super."th-kinds"; "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift" = doDistribute super."th-lift_0_7_5"; "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -7822,6 +7892,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_5_0"; "wai-accept-language" = dontDistribute super."wai-accept-language"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_3"; @@ -7937,6 +8008,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; @@ -8090,6 +8162,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_2"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -8115,6 +8188,7 @@ 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_11"; "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"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix index 2aee00860bc..736b8349409 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix @@ -212,6 +212,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -357,6 +358,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -647,6 +649,7 @@ self: super: { "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; "MonadCompose" = dontDistribute super."MonadCompose"; "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandom" = doDistribute super."MonadRandom_0_4_1"; "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; "MonadStack" = dontDistribute super."MonadStack"; "Monadius" = dontDistribute super."Monadius"; @@ -728,6 +731,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1095,6 +1099,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1376,6 +1382,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1387,6 +1394,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1439,9 +1448,11 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; + "base-orphans" = doDistribute super."base-orphans_0_4_5"; "base-prelude" = doDistribute super."base-prelude_0_1_20"; "base32-bytestring" = dontDistribute super."base32-bytestring"; "base58-bytestring" = dontDistribute super."base58-bytestring"; @@ -1509,6 +1520,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1658,6 +1670,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1695,6 +1708,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1817,6 +1831,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1839,6 +1854,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -1851,6 +1867,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1871,6 +1888,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "chell-hunit" = dontDistribute super."chell-hunit"; @@ -2042,6 +2060,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2093,6 +2112,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2161,6 +2181,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2256,6 +2277,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2416,6 +2438,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2434,6 +2457,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_1"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; @@ -2517,8 +2541,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2633,6 +2659,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2679,6 +2706,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2765,6 +2793,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2806,6 +2835,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2836,6 +2866,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2872,6 +2903,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2945,6 +2977,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3105,6 +3138,7 @@ self: super: { "generic-tree" = dontDistribute super."generic-tree"; "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3158,8 +3192,10 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3226,6 +3262,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3411,8 +3448,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3566,6 +3605,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_2"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3627,6 +3667,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3642,6 +3683,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3820,6 +3862,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3852,6 +3895,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4519,8 +4563,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4698,6 +4744,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -4998,6 +5045,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5077,6 +5125,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5160,6 +5209,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5226,6 +5277,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5264,6 +5316,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-state" = dontDistribute super."monad-state"; @@ -5282,6 +5335,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5708,6 +5762,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5762,6 +5817,7 @@ self: super: { "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5821,6 +5877,7 @@ self: super: { "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_2"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; @@ -5863,6 +5920,7 @@ self: super: { "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes" = doDistribute super."pipes_4_1_7"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; @@ -5944,6 +6002,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6014,6 +6073,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6044,6 +6104,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6059,6 +6120,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_2"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6150,6 +6212,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6499,6 +6562,7 @@ self: super: { "safe-length" = dontDistribute super."safe-length"; "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; + "safecopy" = doDistribute super."safecopy_0_8_6"; "safeint" = dontDistribute super."safeint"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; @@ -6608,6 +6672,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -6927,6 +6992,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -6984,6 +7050,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6997,6 +7064,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7219,6 +7287,7 @@ self: super: { "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; + "tasty-silver" = doDistribute super."tasty-silver_3_1_8"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7329,9 +7398,11 @@ self: super: { "th-instances" = dontDistribute super."th-instances"; "th-kinds" = dontDistribute super."th-kinds"; "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift" = doDistribute super."th-lift_0_7_5"; "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -7805,6 +7876,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_5_0"; "wai-accept-language" = dontDistribute super."wai-accept-language"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_4"; @@ -7920,6 +7992,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; @@ -8072,6 +8145,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_2"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -8097,6 +8171,7 @@ 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_11"; "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"; @@ -8112,6 +8187,7 @@ self: super: { "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_18_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.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 27ea82620b7..32d91ba7c6a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -217,6 +217,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -362,6 +363,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -738,6 +740,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1108,6 +1111,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1397,6 +1401,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1409,6 +1414,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1462,6 +1469,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1533,6 +1541,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1687,6 +1696,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1877,6 +1887,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1890,6 +1901,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1910,6 +1922,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2087,6 +2100,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2212,6 +2226,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2307,6 +2322,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2467,6 +2483,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2577,8 +2594,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dns" = doDistribute super."dns_2_0_0"; @@ -2696,6 +2715,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2742,6 +2762,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2874,6 +2895,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2942,6 +2964,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -3180,6 +3203,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3233,6 +3257,7 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3"; @@ -3305,6 +3330,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3492,8 +3518,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3713,6 +3741,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3728,6 +3757,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3910,6 +3940,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3942,6 +3973,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4627,6 +4659,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = doDistribute super."invariant_0_2"; @@ -4810,6 +4843,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5116,6 +5150,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5282,6 +5317,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5349,6 +5386,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5388,6 +5426,7 @@ self: super: { "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5407,6 +5446,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5841,6 +5881,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5899,6 +5940,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6091,6 +6133,7 @@ self: super: { "poly-arity" = doDistribute super."poly-arity_0_0_5"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6197,6 +6240,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6309,6 +6353,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6776,6 +6821,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -7104,6 +7150,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7162,6 +7209,7 @@ self: super: { "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7175,6 +7223,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7524,6 +7573,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8129,6 +8179,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix index b310053158e..acb0e1c24b5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix @@ -212,6 +212,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -357,6 +358,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -646,6 +648,7 @@ self: super: { "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; "MonadCompose" = dontDistribute super."MonadCompose"; "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandom" = doDistribute super."MonadRandom_0_4_1"; "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; "MonadStack" = dontDistribute super."MonadStack"; "Monadius" = dontDistribute super."Monadius"; @@ -727,6 +730,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -875,6 +879,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_2"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1093,6 +1098,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1373,6 +1380,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1384,6 +1392,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1436,9 +1446,11 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; + "base-orphans" = doDistribute super."base-orphans_0_4_5"; "base-prelude" = doDistribute super."base-prelude_0_1_20"; "base32-bytestring" = dontDistribute super."base32-bytestring"; "base58-bytestring" = dontDistribute super."base58-bytestring"; @@ -1505,6 +1517,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1654,6 +1667,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1691,6 +1705,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1812,6 +1827,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1834,6 +1850,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -1846,6 +1863,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1866,6 +1884,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "chell-hunit" = dontDistribute super."chell-hunit"; @@ -2037,6 +2056,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2088,6 +2108,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2156,6 +2177,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2251,6 +2273,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2411,6 +2434,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2429,6 +2453,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_1"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; @@ -2512,8 +2537,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2628,6 +2655,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2674,6 +2702,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2760,6 +2789,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2801,6 +2831,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2831,6 +2862,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2867,6 +2899,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2940,6 +2973,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3100,6 +3134,7 @@ self: super: { "generic-tree" = dontDistribute super."generic-tree"; "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3153,8 +3188,10 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3221,6 +3258,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3406,8 +3444,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3561,6 +3601,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_2"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3622,6 +3663,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3637,6 +3679,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3815,6 +3858,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3847,6 +3891,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4299,6 +4344,7 @@ self: super: { "htsn-import" = dontDistribute super."htsn-import"; "http-accept" = dontDistribute super."http-accept"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_26_2"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4513,8 +4559,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4692,6 +4740,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -4991,6 +5040,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5070,6 +5120,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5153,6 +5204,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5219,6 +5272,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5257,6 +5311,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-state" = dontDistribute super."monad-state"; @@ -5275,6 +5330,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5701,6 +5757,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5755,6 +5812,7 @@ self: super: { "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5814,6 +5872,7 @@ self: super: { "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_2"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; @@ -5855,6 +5914,7 @@ self: super: { "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes" = doDistribute super."pipes_4_1_7"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; @@ -5936,6 +5996,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6006,6 +6067,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6036,6 +6098,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6051,6 +6114,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_2"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6142,6 +6206,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6490,6 +6555,7 @@ self: super: { "safe-length" = dontDistribute super."safe-length"; "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; + "safecopy" = doDistribute super."safecopy_0_8_6"; "safeint" = dontDistribute super."safeint"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; @@ -6599,6 +6665,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -6918,6 +6985,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -6975,6 +7043,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6988,6 +7057,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7209,6 +7279,7 @@ self: super: { "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; + "tasty-silver" = doDistribute super."tasty-silver_3_1_8"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7318,9 +7389,11 @@ self: super: { "th-instances" = dontDistribute super."th-instances"; "th-kinds" = dontDistribute super."th-kinds"; "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift" = doDistribute super."th-lift_0_7_5"; "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -7794,6 +7867,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_5_0"; "wai-accept-language" = dontDistribute super."wai-accept-language"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-app-static" = doDistribute super."wai-app-static_3_1_4"; @@ -7909,6 +7983,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; @@ -8059,6 +8134,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_2"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -8084,6 +8160,7 @@ 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_11"; "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"; @@ -8099,6 +8176,7 @@ self: super: { "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_18_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.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix index 24b1a57b29b..03242664366 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix @@ -212,6 +212,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -357,6 +358,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -645,6 +647,7 @@ self: super: { "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; "MonadCompose" = dontDistribute super."MonadCompose"; "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandom" = doDistribute super."MonadRandom_0_4_1"; "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; "MonadStack" = dontDistribute super."MonadStack"; "Monadius" = dontDistribute super."Monadius"; @@ -726,6 +729,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -874,6 +878,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_2"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1092,6 +1097,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1372,6 +1379,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1383,6 +1391,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1435,9 +1445,11 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; + "base-orphans" = doDistribute super."base-orphans_0_4_5"; "base32-bytestring" = dontDistribute super."base32-bytestring"; "base58-bytestring" = dontDistribute super."base58-bytestring"; "base58address" = dontDistribute super."base58address"; @@ -1503,6 +1515,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1651,6 +1664,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1688,6 +1702,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1809,6 +1824,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1831,6 +1847,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -1843,6 +1860,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1863,6 +1881,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "chell-hunit" = dontDistribute super."chell-hunit"; @@ -2033,6 +2052,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2083,6 +2103,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2151,6 +2172,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2246,6 +2268,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2406,6 +2429,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2424,6 +2448,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_1"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; @@ -2507,8 +2532,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2623,6 +2650,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2669,6 +2697,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2755,6 +2784,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2796,6 +2826,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2824,6 +2855,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2860,6 +2892,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2933,6 +2966,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3093,6 +3127,7 @@ self: super: { "generic-tree" = dontDistribute super."generic-tree"; "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3146,8 +3181,10 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3214,6 +3251,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3399,8 +3437,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3553,6 +3593,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_2"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3614,6 +3655,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3629,6 +3671,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3807,6 +3850,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3839,6 +3883,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4291,6 +4336,7 @@ self: super: { "htsn-import" = dontDistribute super."htsn-import"; "http-accept" = dontDistribute super."http-accept"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_26_2"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4503,8 +4549,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4682,6 +4730,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -4981,6 +5030,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5060,6 +5110,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5143,6 +5194,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5209,6 +5262,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5247,6 +5301,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-state" = dontDistribute super."monad-state"; @@ -5265,6 +5320,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5690,6 +5746,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5743,6 +5800,7 @@ self: super: { "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5802,6 +5860,7 @@ self: super: { "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_2"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; @@ -5843,6 +5902,7 @@ self: super: { "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes" = doDistribute super."pipes_4_1_7"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; @@ -5923,6 +5983,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5993,6 +6054,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6023,6 +6085,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6038,6 +6101,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_2"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6129,6 +6193,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6475,6 +6540,7 @@ self: super: { "safe-length" = dontDistribute super."safe-length"; "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; + "safecopy" = doDistribute super."safecopy_0_8_6"; "safeint" = dontDistribute super."safeint"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; @@ -6583,6 +6649,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -6893,6 +6960,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -6950,6 +7018,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6963,6 +7032,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7184,6 +7254,7 @@ self: super: { "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; + "tasty-silver" = doDistribute super."tasty-silver_3_1_8"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7293,9 +7364,11 @@ self: super: { "th-instances" = dontDistribute super."th-instances"; "th-kinds" = dontDistribute super."th-kinds"; "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift" = doDistribute super."th-lift_0_7_5"; "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -7768,6 +7841,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_5_0"; "wai-accept-language" = dontDistribute super."wai-accept-language"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-devel" = dontDistribute super."wai-devel"; @@ -7878,6 +7952,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; @@ -8028,6 +8103,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_2"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -8053,6 +8129,7 @@ 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_11"; "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"; @@ -8068,6 +8145,7 @@ self: super: { "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_18_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.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix index 43b306a20fe..4f35f7def84 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix @@ -212,6 +212,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -357,6 +358,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -645,6 +647,7 @@ self: super: { "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; "MonadCompose" = dontDistribute super."MonadCompose"; "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandom" = doDistribute super."MonadRandom_0_4_1"; "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; "MonadStack" = dontDistribute super."MonadStack"; "Monadius" = dontDistribute super."Monadius"; @@ -726,6 +729,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -874,6 +878,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_2"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1092,6 +1097,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1372,6 +1379,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1383,6 +1391,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1435,9 +1445,11 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; + "base-orphans" = doDistribute super."base-orphans_0_4_5"; "base32-bytestring" = dontDistribute super."base32-bytestring"; "base58-bytestring" = dontDistribute super."base58-bytestring"; "base58address" = dontDistribute super."base58address"; @@ -1503,6 +1515,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1651,6 +1664,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1688,6 +1702,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_1"; "byteset" = dontDistribute super."byteset"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; @@ -1809,6 +1824,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1831,6 +1847,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -1843,6 +1860,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1863,6 +1881,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "chell-hunit" = dontDistribute super."chell-hunit"; @@ -2033,6 +2052,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2083,6 +2103,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2151,6 +2172,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2246,6 +2268,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2406,6 +2429,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2424,6 +2448,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_1"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; @@ -2507,8 +2532,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2623,6 +2650,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2669,6 +2697,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2755,6 +2784,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2795,6 +2825,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2823,6 +2854,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2858,6 +2890,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2931,6 +2964,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3091,6 +3125,7 @@ self: super: { "generic-tree" = dontDistribute super."generic-tree"; "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3144,8 +3179,10 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3212,6 +3249,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3397,8 +3435,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3551,6 +3591,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_2"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3612,6 +3653,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3627,6 +3669,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3805,6 +3848,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis-config" = dontDistribute super."hedis-config"; @@ -3836,6 +3880,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4288,6 +4333,7 @@ self: super: { "htsn-import" = dontDistribute super."htsn-import"; "http-accept" = dontDistribute super."http-accept"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_26_2"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4498,8 +4544,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4676,6 +4724,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -4975,6 +5024,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5054,6 +5104,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5137,6 +5188,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5203,6 +5256,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5241,6 +5295,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-state" = dontDistribute super."monad-state"; @@ -5259,6 +5314,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5684,6 +5740,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5737,6 +5794,7 @@ self: super: { "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5796,6 +5854,7 @@ self: super: { "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_2"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; @@ -5837,6 +5896,7 @@ self: super: { "pinchot" = dontDistribute super."pinchot"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes" = doDistribute super."pipes_4_1_7"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-cacophony" = dontDistribute super."pipes-cacophony"; @@ -5917,6 +5977,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5987,6 +6048,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6017,6 +6079,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6032,6 +6095,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_2"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6123,6 +6187,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6469,6 +6534,7 @@ self: super: { "safe-length" = dontDistribute super."safe-length"; "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; + "safecopy" = doDistribute super."safecopy_0_8_6"; "safeint" = dontDistribute super."safeint"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; @@ -6577,6 +6643,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -6887,6 +6954,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -6944,6 +7012,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6957,6 +7026,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7178,6 +7248,7 @@ self: super: { "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; + "tasty-silver" = doDistribute super."tasty-silver_3_1_8"; "tasty-tap" = dontDistribute super."tasty-tap"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; @@ -7287,9 +7358,11 @@ self: super: { "th-instances" = dontDistribute super."th-instances"; "th-kinds" = dontDistribute super."th-kinds"; "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift" = doDistribute super."th-lift_0_7_5"; "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -7762,6 +7835,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_5_0"; "wai-accept-language" = dontDistribute super."wai-accept-language"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-devel" = dontDistribute super."wai-devel"; @@ -7872,6 +7946,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; @@ -8022,6 +8097,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_2"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light" = dontDistribute super."yaml-light"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; @@ -8047,6 +8123,7 @@ 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_11"; "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"; @@ -8061,6 +8138,7 @@ self: super: { "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_18_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.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index 285564af249..23ee3d7e7bb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -217,6 +217,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -362,6 +363,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -738,6 +740,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1108,6 +1111,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1396,6 +1400,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1408,6 +1413,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1461,6 +1468,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1532,6 +1540,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1686,6 +1695,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1876,6 +1886,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1889,6 +1900,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1909,6 +1921,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2085,6 +2098,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2208,6 +2222,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2303,6 +2318,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2463,6 +2479,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2573,8 +2590,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dns" = doDistribute super."dns_2_0_0"; @@ -2692,6 +2711,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2738,6 +2758,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2870,6 +2891,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2938,6 +2960,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -3175,6 +3198,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3228,6 +3252,7 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3"; @@ -3300,6 +3325,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3487,8 +3513,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3708,6 +3736,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3723,6 +3752,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3905,6 +3935,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3937,6 +3968,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4620,6 +4652,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = doDistribute super."invariant_0_2"; @@ -4803,6 +4836,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5109,6 +5143,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5275,6 +5310,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5342,6 +5379,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5381,6 +5419,7 @@ self: super: { "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5400,6 +5439,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5834,6 +5874,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5892,6 +5933,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6084,6 +6126,7 @@ self: super: { "poly-arity" = doDistribute super."poly-arity_0_0_5"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6190,6 +6233,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6302,6 +6346,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6768,6 +6813,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -7095,6 +7141,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7153,6 +7200,7 @@ self: super: { "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7166,6 +7214,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7514,6 +7563,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8118,6 +8168,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index eccead0048d..f3c454184d9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -217,6 +217,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -362,6 +363,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -738,6 +740,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1108,6 +1111,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1396,6 +1400,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1408,6 +1413,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1461,6 +1468,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1532,6 +1540,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1686,6 +1695,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1853,6 +1863,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1875,6 +1886,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1888,6 +1900,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1908,6 +1921,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2084,6 +2098,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2207,6 +2222,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2302,6 +2318,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2462,6 +2479,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2572,8 +2590,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dns" = doDistribute super."dns_2_0_0"; @@ -2691,6 +2711,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2737,6 +2758,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2869,6 +2891,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2937,6 +2960,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -3174,6 +3198,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3227,6 +3252,7 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3"; @@ -3299,6 +3325,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3486,8 +3513,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3707,6 +3736,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3722,6 +3752,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3904,6 +3935,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3936,6 +3968,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4619,6 +4652,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = doDistribute super."invariant_0_2"; @@ -4802,6 +4836,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5108,6 +5143,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5274,6 +5310,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5341,6 +5379,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5380,6 +5419,7 @@ self: super: { "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5399,6 +5439,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5833,6 +5874,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5891,6 +5933,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6083,6 +6126,7 @@ self: super: { "poly-arity" = doDistribute super."poly-arity_0_0_5"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6189,6 +6233,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6301,6 +6346,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6766,6 +6812,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -7093,6 +7140,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7150,6 +7198,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7163,6 +7212,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7511,6 +7561,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8114,6 +8165,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 46addfdb0a8..c7dc33ed044 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -217,6 +217,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -362,6 +363,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -738,6 +740,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1108,6 +1111,7 @@ self: super: { "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; "adjunctions" = doDistribute super."adjunctions_4_2_1"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1395,6 +1399,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1407,6 +1412,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1460,6 +1467,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1531,6 +1539,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1685,6 +1694,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1851,6 +1861,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1873,6 +1884,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1886,6 +1898,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1906,6 +1919,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2082,6 +2096,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2134,6 +2149,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2204,6 +2220,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2299,6 +2316,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2459,6 +2477,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2569,8 +2588,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dns" = doDistribute super."dns_2_0_0"; @@ -2688,6 +2709,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2734,6 +2756,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2866,6 +2889,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2896,6 +2920,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2932,6 +2957,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -3169,6 +3195,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3222,6 +3249,7 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3"; @@ -3294,6 +3322,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3481,8 +3510,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3702,6 +3733,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3717,6 +3749,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3898,6 +3931,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3930,6 +3964,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4609,6 +4644,7 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; "invariant" = doDistribute super."invariant_0_2"; @@ -4792,6 +4828,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5098,6 +5135,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5264,6 +5302,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5331,6 +5371,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5370,6 +5411,7 @@ self: super: { "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5389,6 +5431,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5822,6 +5865,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5879,6 +5923,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6070,6 +6115,7 @@ self: super: { "poly-arity" = doDistribute super."poly-arity_0_0_6"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6142,6 +6188,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6174,6 +6221,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6286,6 +6334,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6751,6 +6800,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -7078,6 +7128,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7135,6 +7186,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7148,6 +7200,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7493,6 +7546,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8096,6 +8150,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 9e490a7387c..d86b8a1b53a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -217,6 +217,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -362,6 +363,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -738,6 +740,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1107,6 +1110,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1394,6 +1399,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1406,6 +1412,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1459,6 +1467,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1530,6 +1539,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1684,6 +1694,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1850,6 +1861,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1872,6 +1884,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1885,6 +1898,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1905,6 +1919,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2081,6 +2096,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2133,6 +2149,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2203,6 +2220,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2298,6 +2316,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2458,6 +2477,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2568,8 +2588,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dns" = doDistribute super."dns_2_0_0"; @@ -2687,6 +2709,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2733,6 +2756,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2865,6 +2889,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2895,6 +2920,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2931,6 +2957,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -3167,6 +3194,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3220,6 +3248,7 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3"; @@ -3290,6 +3319,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3477,8 +3507,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3698,6 +3730,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3713,6 +3746,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3894,6 +3928,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3926,6 +3961,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4605,8 +4641,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4786,6 +4824,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5090,6 +5129,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5256,6 +5296,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5323,6 +5365,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5362,6 +5405,7 @@ self: super: { "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5381,6 +5425,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5813,6 +5858,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5870,6 +5916,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6060,6 +6107,7 @@ self: super: { "poly-arity" = doDistribute super."poly-arity_0_0_6"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6132,6 +6180,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6164,6 +6213,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6276,6 +6326,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6741,6 +6792,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -7068,6 +7120,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7125,6 +7178,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7138,6 +7192,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7483,6 +7538,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8083,6 +8139,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 4dea3fcf33a..0e57de42429 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -217,6 +217,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -362,6 +363,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -738,6 +740,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1107,6 +1110,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1391,6 +1396,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1403,6 +1409,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1456,6 +1464,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1527,6 +1536,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1681,6 +1691,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1847,6 +1858,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1869,6 +1881,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1882,6 +1895,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1902,6 +1916,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2078,6 +2093,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2130,6 +2146,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2199,6 +2216,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2294,6 +2312,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2454,6 +2473,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2563,8 +2583,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dns" = doDistribute super."dns_2_0_0"; @@ -2682,6 +2704,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2728,6 +2751,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2860,6 +2884,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2890,6 +2915,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2926,6 +2952,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -3000,6 +3027,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3161,6 +3189,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3214,6 +3243,7 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3"; @@ -3284,6 +3314,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3471,8 +3502,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3692,6 +3725,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3707,6 +3741,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3887,6 +3922,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3919,6 +3955,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4598,8 +4635,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4778,6 +4817,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5082,6 +5122,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5163,6 +5204,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5247,6 +5289,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5314,6 +5358,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5353,6 +5398,7 @@ self: super: { "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5372,6 +5418,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5804,6 +5851,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5860,6 +5908,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6049,6 +6098,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6121,6 +6171,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6152,6 +6203,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6263,6 +6315,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6727,6 +6780,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -7052,6 +7106,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7109,6 +7164,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7122,6 +7178,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7467,6 +7524,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8066,6 +8124,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index 150196e22de..f7e8e71727f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -217,6 +217,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -362,6 +363,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -738,6 +740,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1107,6 +1110,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1391,6 +1396,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1403,6 +1409,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1456,6 +1464,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1527,6 +1536,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1679,6 +1689,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1844,6 +1855,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1866,6 +1878,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1879,6 +1892,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1899,6 +1913,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2075,6 +2090,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2127,6 +2143,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2196,6 +2213,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2291,6 +2309,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2451,6 +2470,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2555,8 +2575,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dns" = doDistribute super."dns_2_0_0"; @@ -2674,6 +2696,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2720,6 +2743,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2852,6 +2876,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2882,6 +2907,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2918,6 +2944,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2992,6 +3019,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3153,6 +3181,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3206,6 +3235,7 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3"; @@ -3276,6 +3306,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3463,8 +3494,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3684,6 +3717,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3699,6 +3733,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3879,6 +3914,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3911,6 +3947,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4590,8 +4627,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4770,6 +4809,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5074,6 +5114,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5154,6 +5195,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5238,6 +5280,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5304,6 +5348,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5343,6 +5388,7 @@ self: super: { "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5362,6 +5408,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5794,6 +5841,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5850,6 +5898,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6039,6 +6088,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6110,6 +6160,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6141,6 +6192,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6251,6 +6303,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6714,6 +6767,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -7039,6 +7093,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7096,6 +7151,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7109,6 +7165,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7453,6 +7510,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8052,6 +8110,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index 6cfc9e6a4dc..32d43a1a611 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -217,6 +217,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -362,6 +363,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -736,6 +738,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -1105,6 +1108,8 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; @@ -1389,6 +1394,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1401,6 +1407,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1454,6 +1462,7 @@ self: super: { "barrie" = dontDistribute super."barrie"; "barrier" = dontDistribute super."barrier"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; "base-noprelude" = dontDistribute super."base-noprelude"; @@ -1525,6 +1534,7 @@ self: super: { "binary-parser" = dontDistribute super."binary-parser"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1676,6 +1686,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; "break" = dontDistribute super."break"; @@ -1840,6 +1851,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1862,6 +1874,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; @@ -1875,6 +1888,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1895,6 +1909,7 @@ self: super: { "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; "cheapskate" = dontDistribute super."cheapskate"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "checkers" = doDistribute super."checkers_0_4_3"; @@ -2071,6 +2086,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "condor" = dontDistribute super."condor"; @@ -2123,6 +2139,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "contravariant-extras" = dontDistribute super."contravariant-extras"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; @@ -2192,6 +2209,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2287,6 +2305,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2447,6 +2466,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2551,8 +2571,10 @@ self: super: { "distributed-static" = dontDistribute super."distributed-static"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = dontDistribute super."diversity"; "dixi" = dontDistribute super."dixi"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dns" = doDistribute super."dns_2_0_0"; @@ -2669,6 +2691,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2715,6 +2738,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2804,6 +2828,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exhaustive" = doDistribute super."exhaustive_1_1_1"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; @@ -2846,6 +2871,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2876,6 +2902,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2912,6 +2939,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "file-modules" = dontDistribute super."file-modules"; "filecache" = dontDistribute super."filecache"; "filediff" = dontDistribute super."filediff"; @@ -2985,6 +3013,7 @@ self: super: { "fn-extra" = dontDistribute super."fn-extra"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -3146,6 +3175,7 @@ self: super: { "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3"; + "generics-eot" = dontDistribute super."generics-eot"; "generics-sop" = doDistribute super."generics-sop_0_1_1_2"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3199,6 +3229,7 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra"; "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3"; @@ -3269,6 +3300,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3456,8 +3488,10 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; "graphviz" = dontDistribute super."graphviz"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3677,6 +3711,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3692,6 +3727,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashable-time" = dontDistribute super."hashable-time"; "hashabler" = dontDistribute super."hashabler"; @@ -3872,6 +3908,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3904,6 +3941,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -4583,8 +4621,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4763,6 +4803,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -5067,6 +5108,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -5147,6 +5189,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5231,6 +5274,8 @@ self: super: { "memory" = doDistribute super."memory_0_7"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5297,6 +5342,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -5336,6 +5382,7 @@ self: super: { "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1"; @@ -5355,6 +5402,7 @@ self: super: { "monadbi" = dontDistribute super."monadbi"; "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -5786,6 +5834,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5842,6 +5891,7 @@ self: super: { "patches-vector" = dontDistribute super."patches-vector"; "path" = doDistribute super."path_0_5_2"; "path-extra" = dontDistribute super."path-extra"; + "path-io" = dontDistribute super."path-io"; "path-pieces" = doDistribute super."path-pieces_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -6031,6 +6081,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6102,6 +6153,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -6133,6 +6185,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -6243,6 +6296,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6706,6 +6760,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups" = doDistribute super."semigroups_0_16_2_2"; "semigroups-actions" = dontDistribute super."semigroups-actions"; @@ -7031,6 +7086,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "speedy-slice" = dontDistribute super."speedy-slice"; "spelling-suggest" = dontDistribute super."spelling-suggest"; @@ -7088,6 +7144,7 @@ self: super: { "stack-run" = dontDistribute super."stack-run"; "stack-run-auto" = dontDistribute super."stack-run-auto"; "stackage-curator" = dontDistribute super."stackage-curator"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7101,6 +7158,7 @@ self: super: { "stateWriter" = dontDistribute super."stateWriter"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -7445,6 +7503,7 @@ self: super: { "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-orphans" = doDistribute super."th-orphans_0_12_2"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -8044,6 +8103,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix index dcc4f2a695c..cb8f0729fe8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix @@ -211,6 +211,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -331,6 +332,7 @@ self: super: { "GLUT" = doDistribute super."GLUT_2_7_0_5"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; + "GPipe" = doDistribute super."GPipe_2_1_5"; "GPipe-Collada" = dontDistribute super."GPipe-Collada"; "GPipe-Examples" = dontDistribute super."GPipe-Examples"; "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad"; @@ -349,6 +351,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -627,6 +630,7 @@ self: super: { "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; "MonadCompose" = dontDistribute super."MonadCompose"; "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandom" = doDistribute super."MonadRandom_0_4_1"; "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; "MonadStack" = dontDistribute super."MonadStack"; "Monadius" = dontDistribute super."Monadius"; @@ -707,6 +711,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -852,6 +857,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_2"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1064,9 +1070,12 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "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_10_0_0"; "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-diff" = dontDistribute super."aeson-diff"; @@ -1273,6 +1282,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1284,6 +1294,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1334,8 +1346,10 @@ self: super: { "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; + "base-orphans" = doDistribute super."base-orphans_0_4_5"; "base32-bytestring" = dontDistribute super."base32-bytestring"; "base58-bytestring" = dontDistribute super."base58-bytestring"; "base58address" = dontDistribute super."base58address"; @@ -1377,6 +1391,7 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; + "bifunctors" = doDistribute super."bifunctors_5_1"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1384,6 +1399,7 @@ self: super: { "billeksah-main-static" = dontDistribute super."billeksah-main-static"; "billeksah-pane" = dontDistribute super."billeksah-pane"; "billeksah-services" = dontDistribute super."billeksah-services"; + "bimap" = doDistribute super."bimap_0_3_0"; "bimaps" = dontDistribute super."bimaps"; "binary-bits" = dontDistribute super."binary-bits"; "binary-communicator" = dontDistribute super."binary-communicator"; @@ -1395,6 +1411,7 @@ self: super: { "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1534,6 +1551,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1571,6 +1589,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_1"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; "bytestring-csv" = dontDistribute super."bytestring-csv"; @@ -1599,6 +1618,7 @@ self: super: { "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_31_9"; "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses"; "cabal-dev" = dontDistribute super."cabal-dev"; "cabal-dir" = dontDistribute super."cabal-dir"; @@ -1686,6 +1706,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1708,6 +1729,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -1720,6 +1742,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1738,6 +1761,7 @@ self: super: { "chatty" = dontDistribute super."chatty"; "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "chell-hunit" = dontDistribute super."chell-hunit"; @@ -1898,6 +1922,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "cond" = dontDistribute super."cond"; @@ -1931,6 +1956,7 @@ self: super: { "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_6"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consumers" = dontDistribute super."consumers"; @@ -1944,6 +1970,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; "control-monad-exception" = dontDistribute super."control-monad-exception"; @@ -2010,6 +2037,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2035,6 +2063,7 @@ self: super: { "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; + "cryptol" = doDistribute super."cryptol_2_2_6"; "cryptsy-api" = dontDistribute super."cryptsy-api"; "crystalfontz" = dontDistribute super."crystalfontz"; "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin"; @@ -2099,6 +2128,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2253,6 +2283,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2271,6 +2302,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_1"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; @@ -2347,8 +2379,10 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = doDistribute super."diversity_0_7_1_1"; "dixi" = doDistribute super."dixi_0_6_0_2"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2459,6 +2493,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2501,6 +2536,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2584,6 +2620,7 @@ self: super: { "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; "exception-mtl" = dontDistribute super."exception-mtl"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2624,6 +2661,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2650,6 +2688,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2684,6 +2723,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; "filepather" = dontDistribute super."filepather"; @@ -2752,8 +2792,11 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_1"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_0"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -2909,6 +2952,7 @@ self: super: { "generic-tree" = dontDistribute super."generic-tree"; "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; + "generics-eot" = dontDistribute super."generics-eot"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; "geni-gui" = dontDistribute super."geni-gui"; @@ -2947,6 +2991,7 @@ self: super: { "ghc-imported-from" = dontDistribute super."ghc-imported-from"; "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; + "ghc-mod" = doDistribute super."ghc-mod_5_4_0_0"; "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -2956,7 +3001,10 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; + "ghc-typelits-extra" = doDistribute super."ghc-typelits-extra_0_1"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3018,6 +3066,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3202,7 +3251,9 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3352,6 +3403,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_2"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3408,6 +3460,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3422,6 +3475,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashabler" = dontDistribute super."hashabler"; "hashed-storage" = dontDistribute super."hashed-storage"; @@ -3596,6 +3650,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis" = doDistribute super."hedis_0_6_9"; @@ -3628,6 +3683,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -3975,12 +4031,16 @@ self: super: { "hsparklines" = dontDistribute super."hsparklines"; "hsparql" = dontDistribute super."hsparql"; "hspear" = dontDistribute super."hspear"; + "hspec" = doDistribute super."hspec_2_2_1"; "hspec-checkers" = dontDistribute super."hspec-checkers"; + "hspec-core" = doDistribute super."hspec-core_2_2_1"; + "hspec-discover" = doDistribute super."hspec-discover_2_2_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-experimental" = dontDistribute super."hspec-experimental"; "hspec-laws" = dontDistribute super."hspec-laws"; + "hspec-meta" = doDistribute super."hspec-meta_2_2_0"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; @@ -4045,6 +4105,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_26_2"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4064,6 +4125,7 @@ self: super: { "http-shed" = dontDistribute super."http-shed"; "http-test" = dontDistribute super."http-test"; "http-wget" = dontDistribute super."http-wget"; + "http2" = doDistribute super."http2_1_3_1"; "httpd-shed" = dontDistribute super."httpd-shed"; "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; @@ -4243,8 +4305,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4264,6 +4328,7 @@ self: super: { "iptables-helpers" = dontDistribute super."iptables-helpers"; "iptadmin" = dontDistribute super."iptadmin"; "irc-bytestring" = dontDistribute super."irc-bytestring"; + "irc-client" = doDistribute super."irc-client_0_2_5_0"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; @@ -4409,6 +4474,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -4616,6 +4682,7 @@ self: super: { "lindenmayer" = dontDistribute super."lindenmayer"; "line-break" = dontDistribute super."line-break"; "line2pdf" = dontDistribute super."line2pdf"; + "linear" = doDistribute super."linear_1_20_3"; "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas"; "linear-circuit" = dontDistribute super."linear-circuit"; "linear-grammar" = dontDistribute super."linear-grammar"; @@ -4707,6 +4774,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -4748,6 +4816,7 @@ self: super: { "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; "luminance" = doDistribute super."luminance_0_9_1"; + "luminance-samples" = doDistribute super."luminance-samples_0_9"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4784,6 +4853,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -4861,6 +4931,8 @@ self: super: { "memory" = doDistribute super."memory_0_10"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -4925,6 +4997,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -4959,6 +5032,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-state" = dontDistribute super."monad-state"; @@ -4975,6 +5049,7 @@ self: super: { "monadacme" = dontDistribute super."monadacme"; "monadbi" = dontDistribute super."monadbi"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -4988,6 +5063,7 @@ self: super: { "mongrel2-handler" = dontDistribute super."mongrel2-handler"; "monitor" = dontDistribute super."monitor"; "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_10_0_1"; "monoid-absorbing" = dontDistribute super."monoid-absorbing"; "monoid-owns" = dontDistribute super."monoid-owns"; "monoid-record" = dontDistribute super."monoid-record"; @@ -5144,6 +5220,7 @@ self: super: { "netrc" = dontDistribute super."netrc"; "netspec" = dontDistribute super."netspec"; "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = doDistribute super."nettle_0_1_1"; "nettle-frp" = dontDistribute super."nettle-frp"; "nettle-netkit" = dontDistribute super."nettle-netkit"; "nettle-openflow" = dontDistribute super."nettle-openflow"; @@ -5331,6 +5408,7 @@ self: super: { "option" = dontDistribute super."option"; "optional" = dontDistribute super."optional"; "options-time" = dontDistribute super."options-time"; + "optparse-applicative" = doDistribute super."optparse-applicative_0_12_0_0"; "optparse-declarative" = dontDistribute super."optparse-declarative"; "orc" = dontDistribute super."orc"; "orchestrate" = dontDistribute super."orchestrate"; @@ -5366,6 +5444,7 @@ self: super: { "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; @@ -5374,6 +5453,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5424,6 +5504,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = doDistribute super."patches-vector_0_1_5_0"; + "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5475,6 +5556,7 @@ self: super: { "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_2"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; @@ -5513,6 +5595,7 @@ self: super: { "pinboard" = dontDistribute super."pinboard"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes" = doDistribute super."pipes_4_1_7"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -5585,6 +5668,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5619,6 +5703,7 @@ self: super: { "posix-waitpid" = dontDistribute super."posix-waitpid"; "possible" = dontDistribute super."possible"; "postcodes" = dontDistribute super."postcodes"; + "postgresql-binary" = doDistribute super."postgresql-binary_0_7_4_1"; "postgresql-config" = dontDistribute super."postgresql-config"; "postgresql-connector" = dontDistribute super."postgresql-connector"; "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; @@ -5651,6 +5736,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -5681,6 +5767,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -5696,6 +5783,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_2"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -5781,6 +5869,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -5992,6 +6081,7 @@ self: super: { "request-monad" = dontDistribute super."request-monad"; "reserve" = dontDistribute super."reserve"; "resistor-cube" = dontDistribute super."resistor-cube"; + "resolve-trivial-conflicts" = doDistribute super."resolve-trivial-conflicts_0_3_2_1"; "resource-effect" = dontDistribute super."resource-effect"; "resource-embed" = dontDistribute super."resource-embed"; "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; @@ -6100,6 +6190,7 @@ self: super: { "safe-length" = dontDistribute super."safe-length"; "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; + "safecopy" = doDistribute super."safecopy_0_8_6"; "safeint" = dontDistribute super."safeint"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; @@ -6205,6 +6296,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups-actions" = dontDistribute super."semigroups-actions"; "semiring" = dontDistribute super."semiring"; @@ -6498,6 +6590,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "spelling-suggest" = dontDistribute super."spelling-suggest"; "sphero" = dontDistribute super."sphero"; @@ -6548,9 +6641,12 @@ self: super: { "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_1_0_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_11_0"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6563,6 +6659,7 @@ self: super: { "state-record" = dontDistribute super."state-record"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -6680,6 +6777,7 @@ self: super: { "svm-light-utils" = dontDistribute super."svm-light-utils"; "svm-simple" = dontDistribute super."svm-simple"; "svndump" = dontDistribute super."svndump"; + "swagger2" = doDistribute super."swagger2_1_1_1"; "swapper" = dontDistribute super."swapper"; "swearjure" = dontDistribute super."swearjure"; "swf" = dontDistribute super."swf"; @@ -6767,6 +6865,7 @@ self: super: { "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; + "tasty-silver" = doDistribute super."tasty-silver_3_1_8"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; "tbox" = dontDistribute super."tbox"; @@ -6782,6 +6881,7 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_10"; "template-default" = dontDistribute super."template-default"; "template-haskell-util" = dontDistribute super."template-haskell-util"; "template-hsml" = dontDistribute super."template-hsml"; @@ -6871,8 +6971,10 @@ self: super: { "th-instances" = dontDistribute super."th-instances"; "th-kinds" = dontDistribute super."th-kinds"; "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift" = doDistribute super."th-lift_0_7_5"; "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -6880,6 +6982,7 @@ self: super: { "themplate" = dontDistribute super."themplate"; "theoremquest" = dontDistribute super."theoremquest"; "theoremquest-client" = dontDistribute super."theoremquest-client"; + "these" = doDistribute super."these_0_6_2_0"; "thespian" = dontDistribute super."thespian"; "theta-functions" = dontDistribute super."theta-functions"; "thih" = dontDistribute super."thih"; @@ -7102,6 +7205,7 @@ self: super: { "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; "typelevel-tensor" = dontDistribute super."typelevel-tensor"; + "typelits-witnesses" = doDistribute super."typelits-witnesses_0_1_1_0"; "typeof" = dontDistribute super."typeof"; "typeparams" = dontDistribute super."typeparams"; "typesafe-endian" = dontDistribute super."typesafe-endian"; @@ -7314,6 +7418,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_5_0"; "wai-accept-language" = dontDistribute super."wai-accept-language"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-devel" = dontDistribute super."wai-devel"; @@ -7336,6 +7441,7 @@ self: super: { "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" = doDistribute super."wai-middleware-content-type_0_2_0"; "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7361,8 +7467,10 @@ self: super: { "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; + "warp" = doDistribute super."warp_3_1_12"; "warp-dynamic" = dontDistribute super."warp-dynamic"; "warp-static" = dontDistribute super."warp-static"; + "warp-tls" = doDistribute super."warp-tls_3_1_5"; "warp-tls-uid" = dontDistribute super."warp-tls-uid"; "watchdog" = dontDistribute super."watchdog"; "watcher" = dontDistribute super."watcher"; @@ -7406,6 +7514,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; @@ -7549,6 +7658,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_2"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; "yaml-rpc" = dontDistribute super."yaml-rpc"; @@ -7572,6 +7682,7 @@ self: super: { "yeller" = dontDistribute super."yeller"; "yesod-angular" = dontDistribute super."yesod-angular"; "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth" = doDistribute super."yesod-auth_1_4_11"; "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; @@ -7587,6 +7698,7 @@ self: super: { "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_18_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-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix index 22c9cb7b2f6..bf9a7ad51ca 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix @@ -211,6 +211,7 @@ self: super: { "DOM" = dontDistribute super."DOM"; "DP" = dontDistribute super."DP"; "DPM" = dontDistribute super."DPM"; + "DRBG" = doDistribute super."DRBG_0_5_4"; "DSA" = dontDistribute super."DSA"; "DSH" = dontDistribute super."DSH"; "DSTM" = dontDistribute super."DSTM"; @@ -331,6 +332,7 @@ self: super: { "GLUT" = doDistribute super."GLUT_2_7_0_5"; "GLUtil" = dontDistribute super."GLUtil"; "GPX" = dontDistribute super."GPX"; + "GPipe" = doDistribute super."GPipe_2_1_5"; "GPipe-Collada" = dontDistribute super."GPipe-Collada"; "GPipe-Examples" = dontDistribute super."GPipe-Examples"; "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad"; @@ -349,6 +351,7 @@ self: super: { "GeomPredicates" = dontDistribute super."GeomPredicates"; "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; "GiST" = dontDistribute super."GiST"; + "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; @@ -460,6 +463,7 @@ self: super: { "HaLeX" = dontDistribute super."HaLeX"; "HaMinitel" = dontDistribute super."HaMinitel"; "HaPy" = dontDistribute super."HaPy"; + "HaRe" = doDistribute super."HaRe_0_8_2_2"; "HaTeX-meta" = dontDistribute super."HaTeX-meta"; "HaTeX-qq" = dontDistribute super."HaTeX-qq"; "HaVSA" = dontDistribute super."HaVSA"; @@ -626,6 +630,7 @@ self: super: { "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; "MonadCompose" = dontDistribute super."MonadCompose"; "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandom" = doDistribute super."MonadRandom_0_4_1"; "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; "MonadStack" = dontDistribute super."MonadStack"; "Monadius" = dontDistribute super."Monadius"; @@ -706,6 +711,7 @@ self: super: { "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; "PTQ" = dontDistribute super."PTQ"; + "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; "Paillier" = dontDistribute super."Paillier"; "PandocAgda" = dontDistribute super."PandocAgda"; @@ -851,6 +857,7 @@ self: super: { "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; + "StateVar" = doDistribute super."StateVar_1_1_0_2"; "StateVar-transformer" = dontDistribute super."StateVar-transformer"; "StatisticalMethods" = dontDistribute super."StatisticalMethods"; "Stomp" = dontDistribute super."Stomp"; @@ -1062,9 +1069,12 @@ self: super: { "addLicenseInfo" = dontDistribute super."addLicenseInfo"; "adhoc-network" = dontDistribute super."adhoc-network"; "adict" = dontDistribute super."adict"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; "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_10_0_0"; "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-diff" = dontDistribute super."aeson-diff"; @@ -1270,6 +1280,7 @@ self: super: { "augeas" = dontDistribute super."augeas"; "augur" = dontDistribute super."augur"; "aur" = dontDistribute super."aur"; + "authenticate" = doDistribute super."authenticate_1_3_2_11"; "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; "authenticate-ldap" = dontDistribute super."authenticate-ldap"; "authinfo-hs" = dontDistribute super."authinfo-hs"; @@ -1281,6 +1292,8 @@ self: super: { "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; "avl-static" = dontDistribute super."avl-static"; "avr-shake" = dontDistribute super."avr-shake"; "awesomium" = dontDistribute super."awesomium"; @@ -1331,8 +1344,10 @@ self: super: { "barley" = dontDistribute super."barley"; "barrie" = dontDistribute super."barrie"; "barrier-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; "base-generics" = dontDistribute super."base-generics"; "base-io-access" = dontDistribute super."base-io-access"; + "base-orphans" = doDistribute super."base-orphans_0_4_5"; "base32-bytestring" = dontDistribute super."base32-bytestring"; "base58-bytestring" = dontDistribute super."base58-bytestring"; "base58address" = dontDistribute super."base58address"; @@ -1374,6 +1389,7 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; + "bifunctors" = doDistribute super."bifunctors_5_1"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1381,6 +1397,7 @@ self: super: { "billeksah-main-static" = dontDistribute super."billeksah-main-static"; "billeksah-pane" = dontDistribute super."billeksah-pane"; "billeksah-services" = dontDistribute super."billeksah-services"; + "bimap" = doDistribute super."bimap_0_3_0"; "bimaps" = dontDistribute super."bimaps"; "binary-bits" = dontDistribute super."binary-bits"; "binary-communicator" = dontDistribute super."binary-communicator"; @@ -1392,6 +1409,7 @@ self: super: { "binary-literal-qq" = dontDistribute super."binary-literal-qq"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; "binary-shared" = dontDistribute super."binary-shared"; "binary-state" = dontDistribute super."binary-state"; "binary-store" = dontDistribute super."binary-store"; @@ -1531,6 +1549,7 @@ self: super: { "boundingboxes" = dontDistribute super."boundingboxes"; "bowntz" = dontDistribute super."bowntz"; "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; "brainfuck" = dontDistribute super."brainfuck"; "brainfuck-monad" = dontDistribute super."brainfuck-monad"; "brainfuck-tut" = dontDistribute super."brainfuck-tut"; @@ -1568,6 +1587,7 @@ self: super: { "bv" = dontDistribute super."bv"; "byline" = dontDistribute super."byline"; "bytable" = dontDistribute super."bytable"; + "bytes" = doDistribute super."bytes_0_15_1"; "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; "bytestring-class" = dontDistribute super."bytestring-class"; "bytestring-csv" = dontDistribute super."bytestring-csv"; @@ -1596,6 +1616,7 @@ self: super: { "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_31_9"; "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses"; "cabal-dev" = dontDistribute super."cabal-dev"; "cabal-dir" = dontDistribute super."cabal-dir"; @@ -1683,6 +1704,7 @@ self: super: { "casing" = dontDistribute super."casing"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; "cassava-conduit" = dontDistribute super."cassava-conduit"; "cassava-streams" = dontDistribute super."cassava-streams"; "cassette" = dontDistribute super."cassette"; @@ -1705,6 +1727,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -1717,6 +1740,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_2"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1735,6 +1759,7 @@ self: super: { "chatty" = dontDistribute super."chatty"; "chatty-text" = dontDistribute super."chatty-text"; "chatty-utils" = dontDistribute super."chatty-utils"; + "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; "chell-hunit" = dontDistribute super."chell-hunit"; @@ -1895,6 +1920,7 @@ self: super: { "concurrent-sa" = dontDistribute super."concurrent-sa"; "concurrent-split" = dontDistribute super."concurrent-split"; "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1"; "concurrent-utilities" = dontDistribute super."concurrent-utilities"; "concurrentoutput" = dontDistribute super."concurrentoutput"; "cond" = dontDistribute super."cond"; @@ -1928,6 +1954,7 @@ self: super: { "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_6"; "constructible" = dontDistribute super."constructible"; "constructive-algebra" = dontDistribute super."constructive-algebra"; "consumers" = dontDistribute super."consumers"; @@ -1941,6 +1968,7 @@ self: super: { "continued-fractions" = dontDistribute super."continued-fractions"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant" = doDistribute super."contravariant_1_3_3"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; "control-monad-exception" = dontDistribute super."control-monad-exception"; @@ -2007,6 +2035,7 @@ self: super: { "cqrs-types" = dontDistribute super."cqrs-types"; "cr" = dontDistribute super."cr"; "crack" = dontDistribute super."crack"; + "crackNum" = doDistribute super."crackNum_1_3"; "craftwerk" = dontDistribute super."craftwerk"; "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; @@ -2032,6 +2061,7 @@ self: super: { "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; + "cryptol" = doDistribute super."cryptol_2_2_6"; "cryptsy-api" = dontDistribute super."cryptsy-api"; "crystalfontz" = dontDistribute super."crystalfontz"; "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin"; @@ -2096,6 +2126,7 @@ self: super: { "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; "darkplaces-text" = dontDistribute super."darkplaces-text"; "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor" = doDistribute super."data-accessor_0_2_2_6"; "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"; @@ -2250,6 +2281,7 @@ self: super: { "derive-IG" = dontDistribute super."derive-IG"; "derive-enumerable" = dontDistribute super."derive-enumerable"; "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-monoid" = dontDistribute super."derive-monoid"; "derive-topdown" = dontDistribute super."derive-topdown"; "derive-trie" = dontDistribute super."derive-trie"; "deriving-compat" = dontDistribute super."deriving-compat"; @@ -2268,6 +2300,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_1"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; @@ -2344,7 +2377,10 @@ self: super: { "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; "distribution" = dontDistribute super."distribution"; "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; "diversity" = doDistribute super."diversity_0_7_1_1"; + "dixi" = doDistribute super."dixi_0_6_0_3"; + "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; "dnscache" = dontDistribute super."dnscache"; @@ -2454,6 +2490,7 @@ self: super: { "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; "editable" = dontDistribute super."editable"; "editline" = dontDistribute super."editline"; + "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6"; "effect-monad" = dontDistribute super."effect-monad"; "effective-aspects" = dontDistribute super."effective-aspects"; "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; @@ -2496,6 +2533,7 @@ self: super: { "email" = dontDistribute super."email"; "email-header" = dontDistribute super."email-header"; "email-postmark" = dontDistribute super."email-postmark"; + "email-validate" = doDistribute super."email-validate_2_1_3"; "email-validator" = dontDistribute super."email-validator"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2578,6 +2616,7 @@ self: super: { "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; "exception-mtl" = dontDistribute super."exception-mtl"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; "exceptions" = doDistribute super."exceptions_0_8_0_2"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; @@ -2617,6 +2656,7 @@ self: super: { "factory" = dontDistribute super."factory"; "factual-api" = dontDistribute super."factual-api"; "fad" = dontDistribute super."fad"; + "fail" = dontDistribute super."fail"; "failable-list" = dontDistribute super."failable-list"; "failure" = dontDistribute super."failure"; "fair-predicates" = dontDistribute super."fair-predicates"; @@ -2643,6 +2683,7 @@ self: super: { "fcache" = dontDistribute super."fcache"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; "fdo-trash" = dontDistribute super."fdo-trash"; "fec" = dontDistribute super."fec"; @@ -2676,6 +2717,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed" = doDistribute super."file-embed_0_0_9"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; "filepather" = dontDistribute super."filepather"; @@ -2744,8 +2786,11 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_1"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_0"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_2"; "foldl-incremental" = dontDistribute super."foldl-incremental"; "foldl-transduce" = dontDistribute super."foldl-transduce"; "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; @@ -2901,6 +2946,7 @@ self: super: { "generic-tree" = dontDistribute super."generic-tree"; "generic-trie" = dontDistribute super."generic-trie"; "generic-xml" = dontDistribute super."generic-xml"; + "generics-eot" = dontDistribute super."generics-eot"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; "geni-gui" = dontDistribute super."geni-gui"; @@ -2939,6 +2985,7 @@ self: super: { "ghc-imported-from" = dontDistribute super."ghc-imported-from"; "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; + "ghc-mod" = doDistribute super."ghc-mod_5_4_0_0"; "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -2948,7 +2995,10 @@ self: super: { "ghc-simple" = dontDistribute super."ghc-simple"; "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; + "ghc-typelits-extra" = doDistribute super."ghc-typelits-extra_0_1"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3010,6 +3060,7 @@ self: super: { "gitlib-utils" = dontDistribute super."gitlib-utils"; "gitrev" = doDistribute super."gitrev_1_1_0"; "gitter" = dontDistribute super."gitter"; + "gl" = doDistribute super."gl_0_7_7"; "gl-capture" = dontDistribute super."gl-capture"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; @@ -3194,7 +3245,9 @@ self: super: { "graphicstools" = dontDistribute super."graphicstools"; "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; + "graphs" = doDistribute super."graphs_0_6_0_1"; "graphtype" = dontDistribute super."graphtype"; + "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; "greencard" = dontDistribute super."greencard"; @@ -3344,6 +3397,7 @@ self: super: { "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-sass" = dontDistribute super."hakyll-sass"; "halberd" = dontDistribute super."halberd"; + "half" = doDistribute super."half_0_2_2_2"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; "halive" = dontDistribute super."halive"; @@ -3400,6 +3454,7 @@ self: super: { "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; "har" = dontDistribute super."har"; "harchive" = dontDistribute super."harchive"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; "hark" = dontDistribute super."hark"; "harmony" = dontDistribute super."harmony"; "haroonga" = dontDistribute super."haroonga"; @@ -3414,6 +3469,7 @@ self: super: { "hascat-system" = dontDistribute super."hascat-system"; "hash" = dontDistribute super."hash"; "hashable" = doDistribute super."hashable_1_2_3_3"; + "hashable-extras" = doDistribute super."hashable-extras_0_2_2"; "hashable-generics" = dontDistribute super."hashable-generics"; "hashabler" = dontDistribute super."hashabler"; "hashed-storage" = dontDistribute super."hashed-storage"; @@ -3588,6 +3644,7 @@ self: super: { "hdph-closure" = dontDistribute super."hdph-closure"; "hdr-histogram" = dontDistribute super."hdr-histogram"; "headergen" = dontDistribute super."headergen"; + "heaps" = doDistribute super."heaps_0_3_2_1"; "heapsort" = dontDistribute super."heapsort"; "hecc" = dontDistribute super."hecc"; "hedis-config" = dontDistribute super."hedis-config"; @@ -3619,6 +3676,7 @@ self: super: { "her-lexer" = dontDistribute super."her-lexer"; "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; "herbalizer" = dontDistribute super."herbalizer"; + "herf-time" = dontDistribute super."herf-time"; "hermit" = dontDistribute super."hermit"; "hermit-syb" = dontDistribute super."hermit-syb"; "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; @@ -3966,12 +4024,16 @@ self: super: { "hsparklines" = dontDistribute super."hsparklines"; "hsparql" = dontDistribute super."hsparql"; "hspear" = dontDistribute super."hspear"; + "hspec" = doDistribute super."hspec_2_2_1"; "hspec-checkers" = dontDistribute super."hspec-checkers"; + "hspec-core" = doDistribute super."hspec-core_2_2_1"; + "hspec-discover" = doDistribute super."hspec-discover_2_2_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-experimental" = dontDistribute super."hspec-experimental"; "hspec-laws" = dontDistribute super."hspec-laws"; + "hspec-meta" = doDistribute super."hspec-meta_2_2_0"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; @@ -4036,6 +4098,7 @@ self: super: { "htsn-common" = dontDistribute super."htsn-common"; "htsn-import" = dontDistribute super."htsn-import"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_26_2"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4055,6 +4118,7 @@ self: super: { "http-shed" = dontDistribute super."http-shed"; "http-test" = dontDistribute super."http-test"; "http-wget" = dontDistribute super."http-wget"; + "http2" = doDistribute super."http2_1_3_1"; "httpd-shed" = dontDistribute super."httpd-shed"; "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; @@ -4230,8 +4294,10 @@ self: super: { "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; "interpolation" = dontDistribute super."interpolation"; + "intervals" = doDistribute super."intervals_0_7_1"; "intricacy" = dontDistribute super."intricacy"; "intset" = dontDistribute super."intset"; + "invariant" = doDistribute super."invariant_0_2_2"; "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; @@ -4250,6 +4316,7 @@ self: super: { "iptables-helpers" = dontDistribute super."iptables-helpers"; "iptadmin" = dontDistribute super."iptadmin"; "irc-bytestring" = dontDistribute super."irc-bytestring"; + "irc-client" = doDistribute super."irc-client_0_2_5_0"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; @@ -4395,6 +4462,7 @@ self: super: { "kevin" = dontDistribute super."kevin"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; + "keys" = doDistribute super."keys_3_10_2"; "keystore" = dontDistribute super."keystore"; "keyvaluehash" = dontDistribute super."keyvaluehash"; "keyword-args" = dontDistribute super."keyword-args"; @@ -4599,6 +4667,7 @@ self: super: { "lindenmayer" = dontDistribute super."lindenmayer"; "line-break" = dontDistribute super."line-break"; "line2pdf" = dontDistribute super."line2pdf"; + "linear" = doDistribute super."linear_1_20_3"; "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas"; "linear-circuit" = dontDistribute super."linear-circuit"; "linear-grammar" = dontDistribute super."linear-grammar"; @@ -4690,6 +4759,7 @@ self: super: { "logfloat" = dontDistribute super."logfloat"; "logger" = dontDistribute super."logger"; "logging" = dontDistribute super."logging"; + "logging-effect" = dontDistribute super."logging-effect"; "logging-facade-journald" = dontDistribute super."logging-facade-journald"; "logic-TPTP" = dontDistribute super."logic-TPTP"; "logic-classes" = dontDistribute super."logic-classes"; @@ -4731,6 +4801,7 @@ self: super: { "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; "luminance" = doDistribute super."luminance_0_9_1"; + "luminance-samples" = doDistribute super."luminance-samples_0_9"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4767,6 +4838,7 @@ self: super: { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_1"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -4844,6 +4916,8 @@ self: super: { "memory" = doDistribute super."memory_0_10"; "memscript" = dontDistribute super."memscript"; "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -4908,6 +4982,7 @@ self: super: { "mkcabal" = dontDistribute super."mkcabal"; "ml-w" = dontDistribute super."ml-w"; "mlist" = dontDistribute super."mlist"; + "mmorph" = doDistribute super."mmorph_1_0_4"; "mmtl" = dontDistribute super."mmtl"; "mmtl-base" = dontDistribute super."mmtl-base"; "moan" = dontDistribute super."moan"; @@ -4942,6 +5017,7 @@ self: super: { "monad-ox" = dontDistribute super."monad-ox"; "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; "monad-param" = dontDistribute super."monad-param"; + "monad-products" = doDistribute super."monad-products_4_0_0_1"; "monad-ran" = dontDistribute super."monad-ran"; "monad-resumption" = dontDistribute super."monad-resumption"; "monad-state" = dontDistribute super."monad-state"; @@ -4958,6 +5034,7 @@ self: super: { "monadacme" = dontDistribute super."monadacme"; "monadbi" = dontDistribute super."monadbi"; "monadfibre" = dontDistribute super."monadfibre"; + "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4"; "monadiccp" = dontDistribute super."monadiccp"; "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; @@ -4971,6 +5048,7 @@ self: super: { "mongrel2-handler" = dontDistribute super."mongrel2-handler"; "monitor" = dontDistribute super."monitor"; "mono-foldable" = dontDistribute super."mono-foldable"; + "mono-traversable" = doDistribute super."mono-traversable_0_10_0_1"; "monoid-absorbing" = dontDistribute super."monoid-absorbing"; "monoid-owns" = dontDistribute super."monoid-owns"; "monoid-record" = dontDistribute super."monoid-record"; @@ -5127,6 +5205,7 @@ self: super: { "netrc" = dontDistribute super."netrc"; "netspec" = dontDistribute super."netspec"; "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = doDistribute super."nettle_0_1_1"; "nettle-frp" = dontDistribute super."nettle-frp"; "nettle-netkit" = dontDistribute super."nettle-netkit"; "nettle-openflow" = dontDistribute super."nettle-openflow"; @@ -5314,6 +5393,7 @@ self: super: { "option" = dontDistribute super."option"; "optional" = dontDistribute super."optional"; "options-time" = dontDistribute super."options-time"; + "optparse-applicative" = doDistribute super."optparse-applicative_0_12_0_0"; "optparse-declarative" = dontDistribute super."optparse-declarative"; "orc" = dontDistribute super."orc"; "orchestrate" = dontDistribute super."orchestrate"; @@ -5349,6 +5429,7 @@ self: super: { "pacman-memcache" = dontDistribute super."pacman-memcache"; "padKONTROL" = dontDistribute super."padKONTROL"; "pagarme" = dontDistribute super."pagarme"; + "pagerduty" = dontDistribute super."pagerduty"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; @@ -5357,6 +5438,7 @@ self: super: { "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-include" = dontDistribute super."pandoc-include"; + "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; @@ -5406,6 +5488,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; "pathtype" = dontDistribute super."pathtype"; @@ -5457,6 +5540,7 @@ self: super: { "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_2"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; @@ -5495,6 +5579,7 @@ self: super: { "pinboard" = dontDistribute super."pinboard"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes" = doDistribute super."pipes_4_1_7"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-cellular" = dontDistribute super."pipes-cellular"; @@ -5566,6 +5651,7 @@ self: super: { "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; "polymap" = dontDistribute super."polymap"; + "polynom" = dontDistribute super."polynom"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5600,6 +5686,7 @@ self: super: { "posix-waitpid" = dontDistribute super."posix-waitpid"; "possible" = dontDistribute super."possible"; "postcodes" = dontDistribute super."postcodes"; + "postgresql-binary" = doDistribute super."postgresql-binary_0_7_4_1"; "postgresql-config" = dontDistribute super."postgresql-config"; "postgresql-connector" = dontDistribute super."postgresql-connector"; "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; @@ -5632,6 +5719,7 @@ self: super: { "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; "prelude-edsl" = dontDistribute super."prelude-edsl"; + "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2"; "prelude-generalize" = dontDistribute super."prelude-generalize"; "prelude-plus" = dontDistribute super."prelude-plus"; "prelude-prime" = dontDistribute super."prelude-prime"; @@ -5662,6 +5750,7 @@ self: super: { "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; "process-conduit" = dontDistribute super."process-conduit"; + "process-extras" = doDistribute super."process-extras_0_3_3_5"; "process-iterio" = dontDistribute super."process-iterio"; "process-leksah" = dontDistribute super."process-leksah"; "process-listlike" = dontDistribute super."process-listlike"; @@ -5677,6 +5766,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_2"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -5762,6 +5852,7 @@ self: super: { "queuelike" = dontDistribute super."queuelike"; "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -5972,6 +6063,7 @@ self: super: { "request-monad" = dontDistribute super."request-monad"; "reserve" = dontDistribute super."reserve"; "resistor-cube" = dontDistribute super."resistor-cube"; + "resolve-trivial-conflicts" = doDistribute super."resolve-trivial-conflicts_0_3_2_1"; "resource-effect" = dontDistribute super."resource-effect"; "resource-embed" = dontDistribute super."resource-embed"; "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; @@ -6080,6 +6172,7 @@ self: super: { "safe-length" = dontDistribute super."safe-length"; "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; + "safecopy" = doDistribute super."safecopy_0_8_6"; "safeint" = dontDistribute super."safeint"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; @@ -6185,6 +6278,7 @@ self: super: { "selinux" = dontDistribute super."selinux"; "semaphore-plus" = dontDistribute super."semaphore-plus"; "semi-iso" = dontDistribute super."semi-iso"; + "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4"; "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; "semigroups-actions" = dontDistribute super."semigroups-actions"; "semiring" = dontDistribute super."semiring"; @@ -6478,6 +6572,7 @@ self: super: { "special-keys" = dontDistribute super."special-keys"; "specialize-th" = dontDistribute super."specialize-th"; "species" = dontDistribute super."species"; + "speculation" = doDistribute super."speculation_1_5_0_2"; "speculation-transformers" = dontDistribute super."speculation-transformers"; "spelling-suggest" = dontDistribute super."spelling-suggest"; "sphero" = dontDistribute super."sphero"; @@ -6528,9 +6623,12 @@ self: super: { "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_1_0_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_11_0"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -6543,6 +6641,7 @@ self: super: { "state-record" = dontDistribute super."state-record"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; "statethread" = dontDistribute super."statethread"; "statgrab" = dontDistribute super."statgrab"; "static-hash" = dontDistribute super."static-hash"; @@ -6660,6 +6759,7 @@ self: super: { "svm-light-utils" = dontDistribute super."svm-light-utils"; "svm-simple" = dontDistribute super."svm-simple"; "svndump" = dontDistribute super."svndump"; + "swagger2" = doDistribute super."swagger2_1_1_1"; "swapper" = dontDistribute super."swapper"; "swearjure" = dontDistribute super."swearjure"; "swf" = dontDistribute super."swf"; @@ -6747,6 +6847,7 @@ self: super: { "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; + "tasty-silver" = doDistribute super."tasty-silver_3_1_8"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; "tbox" = dontDistribute super."tbox"; @@ -6762,6 +6863,7 @@ self: super: { "telegram" = dontDistribute super."telegram"; "telegram-api" = dontDistribute super."telegram-api"; "teleport" = dontDistribute super."teleport"; + "tellbot" = doDistribute super."tellbot_0_6_0_10"; "template-default" = dontDistribute super."template-default"; "template-haskell-util" = dontDistribute super."template-haskell-util"; "template-hsml" = dontDistribute super."template-hsml"; @@ -6851,8 +6953,10 @@ self: super: { "th-instances" = dontDistribute super."th-instances"; "th-kinds" = dontDistribute super."th-kinds"; "th-kinds-fork" = dontDistribute super."th-kinds-fork"; + "th-lift" = doDistribute super."th-lift_0_7_5"; "th-lift-instances" = dontDistribute super."th-lift-instances"; "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; "th-sccs" = dontDistribute super."th-sccs"; "th-traced" = dontDistribute super."th-traced"; "th-typegraph" = dontDistribute super."th-typegraph"; @@ -6860,6 +6964,7 @@ self: super: { "themplate" = dontDistribute super."themplate"; "theoremquest" = dontDistribute super."theoremquest"; "theoremquest-client" = dontDistribute super."theoremquest-client"; + "these" = doDistribute super."these_0_6_2_0"; "thespian" = dontDistribute super."thespian"; "theta-functions" = dontDistribute super."theta-functions"; "thih" = dontDistribute super."thih"; @@ -7081,6 +7186,7 @@ self: super: { "typehash" = dontDistribute super."typehash"; "typelevel" = dontDistribute super."typelevel"; "typelevel-tensor" = dontDistribute super."typelevel-tensor"; + "typelits-witnesses" = doDistribute super."typelits-witnesses_0_1_1_0"; "typeof" = dontDistribute super."typeof"; "typeparams" = dontDistribute super."typeparams"; "typesafe-endian" = dontDistribute super."typesafe-endian"; @@ -7293,6 +7399,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_5_0"; "wai-accept-language" = dontDistribute super."wai-accept-language"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; "wai-devel" = dontDistribute super."wai-devel"; @@ -7315,6 +7422,7 @@ self: super: { "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" = doDistribute super."wai-middleware-content-type_0_2_0"; "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7339,8 +7447,10 @@ self: super: { "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; + "warp" = doDistribute super."warp_3_1_12"; "warp-dynamic" = dontDistribute super."warp-dynamic"; "warp-static" = dontDistribute super."warp-static"; + "warp-tls" = doDistribute super."warp-tls_3_1_5"; "warp-tls-uid" = dontDistribute super."warp-tls-uid"; "watchdog" = dontDistribute super."watchdog"; "watcher" = dontDistribute super."watcher"; @@ -7384,6 +7494,7 @@ self: super: { "weighted-regexp" = dontDistribute super."weighted-regexp"; "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; + "werewolf" = dontDistribute super."werewolf"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; @@ -7527,6 +7638,7 @@ self: super: { "yajl-enumerator" = dontDistribute super."yajl-enumerator"; "yall" = dontDistribute super."yall"; "yamemo" = dontDistribute super."yamemo"; + "yaml" = doDistribute super."yaml_0_8_15_2"; "yaml-config" = dontDistribute super."yaml-config"; "yaml-light-lens" = dontDistribute super."yaml-light-lens"; "yaml-rpc" = dontDistribute super."yaml-rpc"; @@ -7550,6 +7662,7 @@ self: super: { "yeller" = dontDistribute super."yeller"; "yesod-angular" = dontDistribute super."yesod-angular"; "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth" = doDistribute super."yesod-auth_1_4_11"; "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; @@ -7565,6 +7678,7 @@ self: super: { "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_18_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-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix new file mode 100644 index 00000000000..33edb1148d8 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix @@ -0,0 +1,7706 @@ +{ 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-4.2 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-diagrams" = dontDistribute super."Chart-diagrams"; + "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"; + "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"; + "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"; + "DRBG" = doDistribute super."DRBG_0_5_4"; + "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"; + "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"; + "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"; + "FractalArt" = dontDistribute super."FractalArt"; + "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-demo" = dontDistribute super."GLFW-b-demo"; + "GLFW-task" = dontDistribute super."GLFW-task"; + "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; + "GLMatrix" = dontDistribute super."GLMatrix"; + "GLUtil" = dontDistribute super."GLUtil"; + "GPX" = dontDistribute super."GPX"; + "GPipe" = doDistribute super."GPipe_2_1_5"; + "GPipe-Collada" = dontDistribute super."GPipe-Collada"; + "GPipe-Examples" = dontDistribute super."GPipe-Examples"; + "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"; + "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"; + "Gifcurry" = dontDistribute super."Gifcurry"; + "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-mysql" = dontDistribute super."HDBC-mysql"; + "HDBC-odbc" = dontDistribute super."HDBC-odbc"; + "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; + "HDBC-session" = dontDistribute super."HDBC-session"; + "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"; + "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" = doDistribute super."HUnit_1_3_1_0"; + "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" = doDistribute super."HaRe_0_8_2_2"; + "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"; + "HaskellTorrent" = dontDistribute super."HaskellTorrent"; + "HaskellTutorials" = dontDistribute super."HaskellTutorials"; + "Haskelloids" = dontDistribute super."Haskelloids"; + "Hate" = dontDistribute super."Hate"; + "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"; + "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"; + "IOSpec" = dontDistribute super."IOSpec"; + "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" = doDistribute super."IntervalMap_0_4_1_1"; + "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"; + "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"; + "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"; + "MonadRandom" = doDistribute super."MonadRandom_0_4_2_1"; + "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-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"; + "Obsidian" = dontDistribute super."Obsidian"; + "OddWord" = dontDistribute super."OddWord"; + "Omega" = dontDistribute super."Omega"; + "OneTuple" = dontDistribute super."OneTuple"; + "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"; + "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = doDistribute super."OpenGLRaw_3_0_0_0"; + "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"; + "PUH-Project" = dontDistribute super."PUH-Project"; + "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"; + "Quelea" = dontDistribute super."Quelea"; + "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; + "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"; + "RNAwolf" = dontDistribute super."RNAwolf"; + "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"; + "SVGFonts" = dontDistribute super."SVGFonts"; + "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"; + "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"; + "Spintax" = dontDistribute super."Spintax"; + "Spock-auth" = dontDistribute super."Spock-auth"; + "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"; + "StrappedTemplates" = dontDistribute super."StrappedTemplates"; + "StrategyLib" = dontDistribute super."StrategyLib"; + "Stream" = dontDistribute super."Stream"; + "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"; + "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"; + "Verba" = dontDistribute super."Verba"; + "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings"; + "Vulkan" = dontDistribute super."Vulkan"; + "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-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"; + "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-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"; + "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"; + "adjunctions" = doDistribute super."adjunctions_4_2_2"; + "adler32" = dontDistribute super."adler32"; + "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_10_0_0"; + "aeson-applicative" = dontDistribute super."aeson-applicative"; + "aeson-bson" = dontDistribute super."aeson-bson"; + "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" = dontDistribute super."aeson-schema"; + "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"; + "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"; + "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"; + "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"; + "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"; + "applicative-quoters" = dontDistribute super."applicative-quoters"; + "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"; + "argon2" = dontDistribute super."argon2"; + "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"; + "arrows" = dontDistribute super."arrows"; + "artery" = dontDistribute super."artery"; + "arx" = dontDistribute super."arx"; + "arxiv" = dontDistribute super."arxiv"; + "ascetic" = dontDistribute super."ascetic"; + "ascii" = dontDistribute super."ascii"; + "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-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"; + "atrans" = dontDistribute super."atrans"; + "attempt" = dontDistribute super."attempt"; + "atto-lisp" = dontDistribute super."atto-lisp"; + "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" = doDistribute super."authenticate_1_3_2_11"; + "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"; + "avers-api" = dontDistribute super."avers-api"; + "avers-server" = dontDistribute super."avers-server"; + "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-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-monad" = dontDistribute super."barrier-monad"; + "base-compat" = doDistribute super."base-compat_0_8_2"; + "base-generics" = dontDistribute super."base-generics"; + "base-io-access" = dontDistribute super."base-io-access"; + "base-orphans" = doDistribute super."base-orphans_0_4_5"; + "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"; + "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"; + "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"; + "bifunctors" = doDistribute super."bifunctors_5_1"; + "bighugethesaurus" = dontDistribute super."bighugethesaurus"; + "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" = doDistribute super."bimap_0_3_0"; + "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-protocol" = dontDistribute super."binary-protocol"; + "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-search" = doDistribute super."binary-search_0_1"; + "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"; + "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-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-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"; + "bini" = dontDistribute super."bini"; + "bio" = dontDistribute super."bio"; + "biohazard" = dontDistribute super."biohazard"; + "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; + "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"; + "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"; + "blatex" = dontDistribute super."blatex"; + "blaze" = dontDistribute super."blaze"; + "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"; + "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"; + "bond" = dontDistribute super."bond"; + "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"; + "boomslang" = dontDistribute super."boomslang"; + "borel" = dontDistribute super."borel"; + "bot" = dontDistribute super."bot"; + "botpp" = dontDistribute super."botpp"; + "bound-gen" = dontDistribute super."bound-gen"; + "bounded-tchan" = dontDistribute super."bounded-tchan"; + "boundingboxes" = dontDistribute super."boundingboxes"; + "bowntz" = dontDistribute super."bowntz"; + "bpann" = dontDistribute super."bpann"; + "braid" = dontDistribute super."braid"; + "brainfuck" = dontDistribute super."brainfuck"; + "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" = doDistribute super."brick_0_3_1"; + "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-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"; + "buffer-pipe" = dontDistribute super."buffer-pipe"; + "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"; + "butterflies" = dontDistribute super."butterflies"; + "bv" = dontDistribute super."bv"; + "byline" = dontDistribute super."byline"; + "bytable" = dontDistribute super."bytable"; + "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-handle" = dontDistribute super."bytestring-handle"; + "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"; + "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_31_9"; + "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" = doDistribute super."cabal-helper_0_6_3_0"; + "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-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"; + "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"; + "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-listen-http" = dontDistribute super."canteven-listen-http"; + "canteven-log" = dontDistribute super."canteven-log"; + "canteven-template" = dontDistribute super."canteven-template"; + "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"; + "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"; + "cash" = dontDistribute super."cash"; + "casing" = dontDistribute super."casing"; + "cassandra-cql" = dontDistribute super."cassandra-cql"; + "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava" = doDistribute super."cassava_0_4_4_0"; + "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"; + "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_4_1_1"; + "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" = doDistribute super."cgi_3001_2_2_2"; + "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"; + "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-terminal" = dontDistribute super."cheapskate-terminal"; + "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"; + "clarifai" = dontDistribute super."clarifai"; + "clash" = dontDistribute super."clash"; + "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "classify" = dontDistribute super."classify"; + "classy-parallel" = dontDistribute super."classy-parallel"; + "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-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"; + "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"; + "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"; + "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"; + "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-extra" = dontDistribute super."concurrent-extra"; + "concurrent-machines" = dontDistribute super."concurrent-machines"; + "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"; + "cond" = dontDistribute super."cond"; + "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-network-stream" = dontDistribute super."conduit-network-stream"; + "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"; + "configurator-export" = dontDistribute super."configurator-export"; + "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_6"; + "constructible" = dontDistribute super."constructible"; + "constructive-algebra" = dontDistribute super."constructive-algebra"; + "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" = doDistribute super."contravariant_1_3_3"; + "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"; + "crackNum" = doDistribute super."crackNum_1_3"; + "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-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"; + "cryptol" = doDistribute super."cryptol_2_2_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"; + "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"; + "cube" = dontDistribute super."cube"; + "cubical" = dontDistribute super."cubical"; + "cubicbezier" = dontDistribute super."cubicbezier"; + "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" = doDistribute super."data-accessor_0_2_2_6"; + "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-embed" = dontDistribute super."data-embed"; + "data-endian" = dontDistribute super."data-endian"; + "data-extend-generic" = dontDistribute super."data-extend-generic"; + "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"; + "datadog" = dontDistribute super."datadog"; + "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"; + "dawg-ord" = dontDistribute super."dawg-ord"; + "dbcleaner" = dontDistribute super."dbcleaner"; + "dbf" = dontDistribute super."dbf"; + "dbjava" = dontDistribute super."dbjava"; + "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-binary" = dontDistribute super."debian-binary"; + "debian-build" = dontDistribute super."debian-build"; + "debug-diff" = dontDistribute super."debug-diff"; + "debug-time" = dontDistribute super."debug-time"; + "decepticons" = dontDistribute super."decepticons"; + "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"; + "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-monoid" = dontDistribute super."derive-monoid"; + "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-hsqml" = dontDistribute super."diagrams-hsqml"; + "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"; + "dialog" = dontDistribute super."dialog"; + "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-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "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-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-closure" = dontDistribute super."distributed-closure"; + "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-lifted" = dontDistribute super."distributed-process-lifted"; + "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"; + "distribution" = dontDistribute super."distribution"; + "distribution-plot" = dontDistribute super."distribution-plot"; + "distributive" = doDistribute super."distributive_0_4_4"; + "diversity" = doDistribute super."diversity_0_7_1_1"; + "dixi" = doDistribute super."dixi_0_6_0_3"; + "djembe" = dontDistribute super."djembe"; + "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"; + "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-parser" = dontDistribute super."dom-parser"; + "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"; + "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"; + "dynobud" = dontDistribute super."dynobud"; + "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"; + "edis" = dontDistribute super."edis"; + "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"; + "eithers" = dontDistribute super."eithers"; + "ekg-bosun" = dontDistribute super."ekg-bosun"; + "ekg-carbon" = dontDistribute super."ekg-carbon"; + "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-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-validate" = doDistribute super."email-validate_2_1_3"; + "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-growler" = dontDistribute super."engine-io-growler"; + "engine-io-snap" = dontDistribute super."engine-io-snap"; + "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"; + "errors" = doDistribute super."errors_2_0_1"; + "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"; + "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"; + "every-bit-counts" = dontDistribute super."every-bit-counts"; + "ewe" = dontDistribute super."ewe"; + "ex-pool" = dontDistribute super."ex-pool"; + "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "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"; + "exception-mtl" = dontDistribute super."exception-mtl"; + "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2"; + "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-extended" = dontDistribute super."exp-extended"; + "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-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"; + "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"; + "fail" = dontDistribute super."fail"; + "failable-list" = dontDistribute super."failable-list"; + "failure" = dontDistribute super."failure"; + "fair-predicates" = dontDistribute super."fair-predicates"; + "fake-type" = dontDistribute super."fake-type"; + "faker" = dontDistribute super."faker"; + "falling-turnip" = dontDistribute super."falling-turnip"; + "fallingblocks" = dontDistribute super."fallingblocks"; + "family-tree" = dontDistribute super."family-tree"; + "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"; + "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"; + "fcache" = dontDistribute super."fcache"; + "fcd" = dontDistribute super."fcd"; + "fckeditor" = dontDistribute super."fckeditor"; + "fclabels" = doDistribute super."fclabels_2_0_2_3"; + "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"; + "fftwRaw" = dontDistribute super."fftwRaw"; + "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-embed" = doDistribute super."file-embed_0_0_9"; + "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" = dontDistribute super."flowdock"; + "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"; + "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; + "fluent-logger" = dontDistribute super."fluent-logger"; + "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; + "fluidsynth" = dontDistribute super."fluidsynth"; + "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_1"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_0"; + "fold-debounce" = dontDistribute super."fold-debounce"; + "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl" = doDistribute super."foldl_1_1_3"; + "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"; + "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"; + "free-vl" = dontDistribute super."free-vl"; + "freekick2" = dontDistribute super."freekick2"; + "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"; + "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"; + "gdo" = dontDistribute super."gdo"; + "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-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-eot" = dontDistribute super."generics-eot"; + "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-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-dump-tree" = dontDistribute super."ghc-dump-tree"; + "ghc-dup" = dontDistribute super."ghc-dup"; + "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; + "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; + "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; + "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; + "ghc-imported-from" = dontDistribute super."ghc-imported-from"; + "ghc-make" = dontDistribute super."ghc-make"; + "ghc-man-completion" = dontDistribute super."ghc-man-completion"; + "ghc-mod" = doDistribute super."ghc-mod_5_4_0_0"; + "ghc-options" = dontDistribute super."ghc-options"; + "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-simple" = dontDistribute super."ghc-simple"; + "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; + "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1"; + "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; + "ghc-typelits-extra" = doDistribute super."ghc-typelits-extra_0_1"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1"; + "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"; + "gi-webkit2" = dontDistribute super."gi-webkit2"; + "gimlh" = dontDistribute super."gimlh"; + "ginger" = dontDistribute super."ginger"; + "ginsu" = dontDistribute super."ginsu"; + "gist" = dontDistribute super."gist"; + "git-all" = dontDistribute super."git-all"; + "git-annex" = doDistribute super."git-annex_5_20151218"; + "git-checklist" = dontDistribute super."git-checklist"; + "git-date" = dontDistribute super."git-date"; + "git-embed" = dontDistribute super."git-embed"; + "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"; + "gitHUD" = dontDistribute super."gitHUD"; + "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-utils" = dontDistribute super."github-utils"; + "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"; + "gitrev" = doDistribute super."gitrev_1_1_0"; + "gitter" = dontDistribute super."gitter"; + "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"; + "gnss-converters" = dontDistribute super."gnss-converters"; + "gnuplot" = dontDistribute super."gnuplot"; + "goa" = dontDistribute super."goa"; + "goal-core" = dontDistribute super."goal-core"; + "goal-geometry" = dontDistribute super."goal-geometry"; + "goal-probability" = dontDistribute super."goal-probability"; + "goal-simulation" = dontDistribute super."goal-simulation"; + "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-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"; + "graphs" = doDistribute super."graphs_0_6_0_1"; + "graphtype" = dontDistribute super."graphtype"; + "grasp" = dontDistribute super."grasp"; + "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"; + "gremlin-haskell" = dontDistribute super."gremlin-haskell"; + "grid" = dontDistribute super."grid"; + "gridland" = dontDistribute super."gridland"; + "grm" = dontDistribute super."grm"; + "groundhog-inspector" = dontDistribute super."groundhog-inspector"; + "group-with" = dontDistribute super."group-with"; + "groupoid" = dontDistribute super."groupoid"; + "growler" = dontDistribute super."growler"; + "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" = doDistribute super."hOpenPGP_2_2_1"; + "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"; + "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"; + "haiji" = dontDistribute super."haiji"; + "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"; + "haphviz" = dontDistribute super."haphviz"; + "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-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-hstringtemplate" = dontDistribute super."happstack-hstringtemplate"; + "happstack-ixset" = dontDistribute super."happstack-ixset"; + "happstack-lite" = dontDistribute super."happstack-lite"; + "happstack-monad-peel" = dontDistribute super."happstack-monad-peel"; + "happstack-plugins" = dontDistribute super."happstack-plugins"; + "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"; + "hardware-edsl" = dontDistribute super."hardware-edsl"; + "hark" = dontDistribute super."hark"; + "harmony" = dontDistribute super."harmony"; + "haroonga" = dontDistribute super."haroonga"; + "haroonga-httpd" = dontDistribute super."haroonga-httpd"; + "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"; + "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_2"; + "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-names" = dontDistribute super."haskell-names"; + "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"; + "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" = doDistribute super."hasql_0_15_1_1"; + "hasql-pool" = dontDistribute super."hasql-pool"; + "hasql-postgres" = dontDistribute super."hasql-postgres"; + "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"; + "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-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"; + "hdr-histogram" = dontDistribute super."hdr-histogram"; + "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"; + "helix" = dontDistribute super."helix"; + "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"; + "herf-time" = dontDistribute super."herf-time"; + "hermit" = dontDistribute super."hermit"; + "hermit-syb" = dontDistribute super."hermit-syb"; + "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; + "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"; + "hformat" = dontDistribute super."hformat"; + "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"; + "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"; + "hi3status" = dontDistribute super."hi3status"; + "hiccup" = dontDistribute super."hiccup"; + "hichi" = dontDistribute super."hichi"; + "hieraclus" = dontDistribute super."hieraclus"; + "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"; + "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"; + "hkdf" = dontDistribute super."hkdf"; + "hlatex" = dontDistribute super."hlatex"; + "hlbfgsb" = dontDistribute super."hlbfgsb"; + "hlcm" = dontDistribute super."hlcm"; + "hledger-chart" = dontDistribute super."hledger-chart"; + "hledger-diff" = dontDistribute super."hledger-diff"; + "hledger-irr" = dontDistribute super."hledger-irr"; + "hledger-vty" = dontDistribute super."hledger-vty"; + "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-banded" = dontDistribute super."hmatrix-banded"; + "hmatrix-csv" = dontDistribute super."hmatrix-csv"; + "hmatrix-glpk" = dontDistribute super."hmatrix-glpk"; + "hmatrix-mmap" = dontDistribute super."hmatrix-mmap"; + "hmatrix-nipals" = dontDistribute super."hmatrix-nipals"; + "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp"; + "hmatrix-repa" = dontDistribute super."hmatrix-repa"; + "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"; + "hoauth2" = doDistribute super."hoauth2_0_5_0_1"; + "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"; + "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-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"; + "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"; + "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-storablevector" = dontDistribute super."hsndfile-storablevector"; + "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-cgi" = dontDistribute super."hsp-cgi"; + "hsparklines" = dontDistribute super."hsparklines"; + "hsparql" = dontDistribute super."hsparql"; + "hspear" = dontDistribute super."hspear"; + "hspec-checkers" = dontDistribute super."hspec-checkers"; + "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-experimental" = dontDistribute super."hspec-experimental"; + "hspec-laws" = dontDistribute super."hspec-laws"; + "hspec-monad-control" = dontDistribute super."hspec-monad-control"; + "hspec-server" = dontDistribute super."hspec-server"; + "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "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"; + "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"; + "hsseccomp" = dontDistribute super."hsseccomp"; + "hsshellscript" = dontDistribute super."hsshellscript"; + "hssourceinfo" = dontDistribute super."hssourceinfo"; + "hssqlppp" = dontDistribute super."hssqlppp"; + "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-xhtml" = dontDistribute super."hsx-xhtml"; + "hsyscall" = dontDistribute super."hsyscall"; + "hszephyr" = dontDistribute super."hszephyr"; + "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-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_26_2"; + "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-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-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_3_1"; + "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" = doDistribute super."human-readable-duration_0_1_1_0"; + "hums" = dontDistribute super."hums"; + "hunch" = dontDistribute super."hunch"; + "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"; + "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; + "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"; + "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"; + "hyperpublic" = dontDistribute super."hyperpublic"; + "hyphenate" = dontDistribute super."hyphenate"; + "hypher" = dontDistribute super."hypher"; + "hzk" = dontDistribute super."hzk"; + "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"; + "ibus-hs" = dontDistribute super."ibus-hs"; + "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"; + "ige-mac-integration" = dontDistribute super."ige-mac-integration"; + "igraph" = dontDistribute super."igraph"; + "igrf" = dontDistribute super."igrf"; + "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" = dontDistribute super."imperative-edsl"; + "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-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"; + "invariant" = doDistribute super."invariant_0_2_2"; + "invertible-syntax" = dontDistribute super."invertible-syntax"; + "io-capture" = dontDistribute super."io-capture"; + "io-reactive" = dontDistribute super."io-reactive"; + "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"; + "iptables-helpers" = dontDistribute super."iptables-helpers"; + "iptadmin" = dontDistribute super."iptadmin"; + "irc-bytestring" = dontDistribute super."irc-bytestring"; + "irc-colors" = dontDistribute super."irc-colors"; + "irc-core" = dontDistribute super."irc-core"; + "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"; + "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"; + "ixdopp" = dontDistribute super."ixdopp"; + "ixmonad" = dontDistribute super."ixmonad"; + "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-poker" = dontDistribute super."java-poker"; + "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"; + "jpeg" = dontDistribute super."jpeg"; + "js-good-parts" = dontDistribute super."js-good-parts"; + "js-jquery" = doDistribute super."js-jquery_1_11_3"; + "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-encoder" = dontDistribute super."json-encoder"; + "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"; + "keys" = doDistribute super."keys_3_10_2"; + "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"; + "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" = dontDistribute super."lambdabot"; + "lambdabot-core" = dontDistribute super."lambdabot-core"; + "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins"; + "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins"; + "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins"; + "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins"; + "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins"; + "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins"; + "lambdabot-trusted" = dontDistribute super."lambdabot-trusted"; + "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"; + "lambdatex" = dontDistribute super."lambdatex"; + "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-c-quote" = dontDistribute super."language-c-quote"; + "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-mixal" = dontDistribute super."language-mixal"; + "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" = doDistribute super."language-thrift_0_6_2_0"; + "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"; + "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"; + "lazysmallcheck" = dontDistribute super."lazysmallcheck"; + "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-datetime" = dontDistribute super."lens-datetime"; + "lens-prelude" = dontDistribute super."lens-prelude"; + "lens-properties" = dontDistribute super."lens-properties"; + "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"; + "lenz" = dontDistribute super."lenz"; + "lenz-template" = dontDistribute super."lenz-template"; + "level-monad" = dontDistribute super."level-monad"; + "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"; + "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"; + "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-async" = doDistribute super."lifted-async_0_7_0_2"; + "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_20_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"; + "link-relations" = dontDistribute super."link-relations"; + "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"; + "lmonad" = dontDistribute super."lmonad"; + "lmonad-yesod" = dontDistribute super."lmonad-yesod"; + "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"; + "locked-poll" = dontDistribute super."locked-poll"; + "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-effect" = dontDistribute super."logging-effect"; + "logging-facade-journald" = dontDistribute super."logging-facade-journald"; + "logic-TPTP" = dontDistribute super."logic-TPTP"; + "logic-classes" = dontDistribute super."logic-classes"; + "logicst" = dontDistribute super."logicst"; + "logplex-parse" = dontDistribute super."logplex-parse"; + "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-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"; + "lp-diagrams" = dontDistribute super."lp-diagrams"; + "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; + "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"; + "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-binary" = dontDistribute super."machines-binary"; + "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"; + "mainland-pretty" = dontDistribute super."mainland-pretty"; + "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"; + "managed" = doDistribute super."managed_1_0_1"; + "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"; + "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"; + "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-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"; + "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" = doDistribute super."megaparsec_4_2_0"; + "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"; + "memory" = doDistribute super."memory_0_10"; + "memscript" = dontDistribute super."memscript"; + "mersenne-random" = dontDistribute super."mersenne-random"; + "messagepack" = doDistribute super."messagepack_0_4_0"; + "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0"; + "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-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_3_5_1"; + "microlens-aeson" = dontDistribute super."microlens-aeson"; + "microlens-contra" = dontDistribute super."microlens-contra"; + "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_3_1_0"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_6_0"; + "microlens-platform" = doDistribute super."microlens-platform_0_1_7_0"; + "microlens-th" = doDistribute super."microlens-th_0_2_2_0"; + "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"; + "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"; + "mohws" = dontDistribute super."mohws"; + "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-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"; + "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-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_10_0_1"; + "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"; + "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"; + "mpris" = dontDistribute super."mpris"; + "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"; + "mueval" = dontDistribute super."mueval"; + "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-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-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-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"; + "nanq" = dontDistribute super."nanq"; + "narc" = dontDistribute super."narc"; + "nat" = dontDistribute super."nat"; + "nats-queue" = dontDistribute super."nats-queue"; + "natural-number" = dontDistribute super."natural-number"; + "natural-numbers" = dontDistribute super."natural-numbers"; + "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" = doDistribute super."nettle_0_1_1"; + "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-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-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-inmemory" = dontDistribute super."network-transport-inmemory"; + "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"; + "niagra" = dontDistribute super."niagra"; + "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"; + "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-limits" = dontDistribute super."numeric-limits"; + "numeric-prelude" = dontDistribute super."numeric-prelude"; + "numeric-qq" = dontDistribute super."numeric-qq"; + "numeric-quest" = dontDistribute super."numeric-quest"; + "numeric-ranges" = dontDistribute super."numeric-ranges"; + "numeric-tools" = dontDistribute super."numeric-tools"; + "numericpeano" = dontDistribute super."numericpeano"; + "nums" = dontDistribute super."nums"; + "numtype" = dontDistribute super."numtype"; + "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"; + "oeis" = dontDistribute super."oeis"; + "off-simple" = dontDistribute super."off-simple"; + "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"; + "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"; + "opaleye-classy" = dontDistribute super."opaleye-classy"; + "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "opaleye-trans" = dontDistribute super."opaleye-trans"; + "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"; + "opn" = dontDistribute super."opn"; + "optimal-blocks" = dontDistribute super."optimal-blocks"; + "optimization" = dontDistribute super."optimization"; + "optimusprime" = dontDistribute super."optimusprime"; + "option" = dontDistribute super."option"; + "optional" = dontDistribute super."optional"; + "options-time" = dontDistribute super."options-time"; + "optparse-applicative" = doDistribute super."optparse-applicative_0_12_0_0"; + "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-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" = dontDistribute super."pagerduty"; + "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; + "palindromes" = dontDistribute super."palindromes"; + "pam" = dontDistribute super."pam"; + "panda" = dontDistribute super."panda"; + "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-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; + "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"; + "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-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"; + "path-io" = dontDistribute super."path-io"; + "pathfinding" = dontDistribute super."pathfinding"; + "pathfindingcore" = dontDistribute super."pathfindingcore"; + "pathtype" = dontDistribute super."pathtype"; + "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-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-less" = dontDistribute super."pcre-less"; + "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "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-odbc" = dontDistribute super."persistent-odbc"; + "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_2"; + "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"; + "pgsql-simple" = dontDistribute super."pgsql-simple"; + "pgstream" = dontDistribute super."pgstream"; + "phasechange" = dontDistribute super."phasechange"; + "phizzle" = dontDistribute super."phizzle"; + "phoityne" = dontDistribute super."phoityne"; + "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"; + "pipe-enumerator" = dontDistribute super."pipe-enumerator"; + "pipeclip" = dontDistribute super."pipeclip"; + "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-async" = dontDistribute super."pipes-async"; + "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; + "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-errors" = dontDistribute super."pipes-errors"; + "pipes-extra" = dontDistribute super."pipes-extra"; + "pipes-files" = dontDistribute super."pipes-files"; + "pipes-http" = dontDistribute super."pipes-http"; + "pipes-interleave" = dontDistribute super."pipes-interleave"; + "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-transduce" = dontDistribute super."pipes-transduce"; + "pipes-vector" = dontDistribute super."pipes-vector"; + "pipes-wai" = doDistribute super."pipes-wai_3_0_2"; + "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"; + "plist-buddy" = dontDistribute super."plist-buddy"; + "plivo" = dontDistribute super."plivo"; + "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"; + "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"; + "polynom" = dontDistribute super."polynom"; + "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"; + "postcodes" = dontDistribute super."postcodes"; + "postgresql-binary" = doDistribute super."postgresql-binary_0_7_4_1"; + "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-query" = dontDistribute super."postgresql-query"; + "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" = dontDistribute super."pred-trie"; + "predicates" = dontDistribute super."predicates"; + "prednote-test" = dontDistribute super."prednote-test"; + "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-extras" = doDistribute super."process-extras_0_3_3_6"; + "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"; + "profunctors" = doDistribute super."profunctors_5_1_2"; + "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-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"; + "pseudo-boolean" = dontDistribute super."pseudo-boolean"; + "pseudo-trie" = dontDistribute super."pseudo-trie"; + "pseudomacros" = dontDistribute super."pseudomacros"; + "pub" = dontDistribute super."pub"; + "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"; + "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"; + "queue" = dontDistribute super."queue"; + "queuelike" = dontDistribute super."queuelike"; + "quick-generator" = dontDistribute super."quick-generator"; + "quick-schema" = dontDistribute super."quick-schema"; + "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11"; + "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-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"; + "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"; + "readable" = dontDistribute super."readable"; + "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"; + "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-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"; + "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-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"; + "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-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-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"; + "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-example" = dontDistribute super."rest-example"; + "restful-snap" = dontDistribute super."restful-snap"; + "restricted-workers" = dontDistribute super."restricted-workers"; + "restyle" = dontDistribute super."restyle"; + "resumable-exceptions" = dontDistribute super."resumable-exceptions"; + "rethinkdb-model" = dontDistribute super."rethinkdb-model"; + "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; + "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"; + "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-trie" = dontDistribute super."rose-trie"; + "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"; + "safecopy" = doDistribute super."safecopy_0_8_6"; + "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"; + "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"; + "sbv" = doDistribute super."sbv_5_9"; + "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-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"; + "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-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"; + "serv" = dontDistribute super."serv"; + "servant-cassava" = dontDistribute super."servant-cassava"; + "servant-ede" = dontDistribute super."servant-ede"; + "servant-examples" = dontDistribute super."servant-examples"; + "servant-github" = dontDistribute super."servant-github"; + "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"; + "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"; + "setters" = dontDistribute super."setters"; + "settings" = dontDistribute super."settings"; + "sexp" = dontDistribute super."sexp"; + "sexp-grammar" = dontDistribute super."sexp-grammar"; + "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"; + "shake-persist" = dontDistribute super."shake-persist"; + "shaker" = dontDistribute super."shaker"; + "shakespeare-babel" = dontDistribute super."shakespeare-babel"; + "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"; + "shelltestrunner" = dontDistribute super."shelltestrunner"; + "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"; + "show" = dontDistribute super."show"; + "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"; + "signals" = dontDistribute super."signals"; + "signed-multiset" = dontDistribute super."signed-multiset"; + "simd" = dontDistribute super."simd"; + "simgi" = dontDistribute super."simgi"; + "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-rope" = dontDistribute super."simple-rope"; + "simple-server" = dontDistribute super."simple-server"; + "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-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"; + "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"; + "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"; + "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"; + "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"; + "sock2stream" = dontDistribute super."sock2stream"; + "sockaddr" = dontDistribute super."sockaddr"; + "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"; + "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"; + "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" = doDistribute super."stack_1_0_0"; + "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; + "stack-prism" = dontDistribute super."stack-prism"; + "stack-run" = dontDistribute super."stack-run"; + "stackage-curator" = doDistribute super."stackage-curator_0_11_0"; + "stackage-types" = doDistribute super."stackage-types_1_1_0"; + "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"; + "statechart" = dontDistribute super."statechart"; + "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statestack" = doDistribute super."statestack_0_2_0_4"; + "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-client" = dontDistribute super."statsd-client"; + "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-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; + "streaming-wai" = dontDistribute super."streaming-wai"; + "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-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"; + "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" = doDistribute super."swagger2_1_1_1"; + "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-instances-text" = dontDistribute super."syb-with-class-instances-text"; + "sylvia" = dontDistribute super."sylvia"; + "sym" = dontDistribute super."sym"; + "sym-plot" = dontDistribute super."sym-plot"; + "symbol" = dontDistribute super."symbol"; + "sync" = dontDistribute super."sync"; + "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"; + "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"; + "tar" = doDistribute super."tar_0_4_2_2"; + "target" = dontDistribute super."target"; + "task" = dontDistribute super."task"; + "taskpool" = dontDistribute super."taskpool"; + "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; + "tasty-integrate" = dontDistribute super."tasty-integrate"; + "tasty-laws" = dontDistribute super."tasty-laws"; + "tasty-lens" = dontDistribute super."tasty-lens"; + "tasty-program" = dontDistribute super."tasty-program"; + "tasty-silver" = doDistribute super."tasty-silver_3_1_8"; + "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"; + "telegram-api" = dontDistribute super."telegram-api"; + "teleport" = dontDistribute super."teleport"; + "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_2"; + "terminfo-hs" = dontDistribute super."terminfo-hs"; + "termplot" = dontDistribute super."termplot"; + "terntup" = dontDistribute super."terntup"; + "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-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-region" = dontDistribute super."text-region"; + "text-register-machine" = dontDistribute super."text-register-machine"; + "text-render" = dontDistribute super."text-render"; + "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"; + "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" = doDistribute super."th-lift_0_7_5"; + "th-lift-instances" = dontDistribute super."th-lift-instances"; + "th-printf" = dontDistribute super."th-printf"; + "th-reify-many" = doDistribute super."th-reify-many_0_1_3"; + "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" = doDistribute super."these_0_6_2_0"; + "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-w3c" = dontDistribute super."time-w3c"; + "timecalc" = dontDistribute super."timecalc"; + "timeconsole" = dontDistribute super."timeconsole"; + "timeless" = dontDistribute super."timeless"; + "timelike" = dontDistribute super."timelike"; + "timelike-time" = dontDistribute super."timelike-time"; + "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"; + "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; + "tip-lib" = dontDistribute super."tip-lib"; + "tiphys" = dontDistribute super."tiphys"; + "titlecase" = dontDistribute super."titlecase"; + "tkhs" = dontDistribute super."tkhs"; + "tkyprof" = dontDistribute super."tkyprof"; + "tld" = dontDistribute super."tld"; + "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"; + "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"; + "trimpolya" = dontDistribute super."trimpolya"; + "tripLL" = dontDistribute super."tripLL"; + "trivia" = dontDistribute super."trivia"; + "trivial-constraint" = dontDistribute super."trivial-constraint"; + "tropical" = dontDistribute super."tropical"; + "true-name" = doDistribute super."true-name_0_0_0_2"; + "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"; + "tubes" = dontDistribute super."tubes"; + "tuntap" = dontDistribute super."tuntap"; + "tup-functor" = dontDistribute super."tup-functor"; + "tuple" = dontDistribute super."tuple"; + "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"; + "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-combinators-quote" = dontDistribute super."type-combinators-quote"; + "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-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"; + "typed-wire-utils" = dontDistribute super."typed-wire-utils"; + "typedquery" = dontDistribute super."typedquery"; + "typehash" = dontDistribute super."typehash"; + "typelevel" = dontDistribute super."typelevel"; + "typelevel-tensor" = dontDistribute super."typelevel-tensor"; + "typelits-witnesses" = doDistribute super."typelits-witnesses_0_1_1_0"; + "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"; + "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"; + "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"; + "unbreak" = dontDistribute super."unbreak"; + "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"; + "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-th" = dontDistribute super."universe-th"; + "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"; + "unlambda" = dontDistribute super."unlambda"; + "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-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"; + "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"; + "utc" = dontDistribute super."utc"; + "utf8-env" = dontDistribute super."utf8-env"; + "utf8-prelude" = dontDistribute super."utf8-prelude"; + "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-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"; + "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-binary" = dontDistribute super."vector-binary"; + "vector-bytestring" = dontDistribute super."vector-bytestring"; + "vector-clock" = dontDistribute super."vector-clock"; + "vector-conduit" = dontDistribute super."vector-conduit"; + "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-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"; + "visibility" = dontDistribute super."visibility"; + "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"; + "vrpn" = dontDistribute super."vrpn"; + "vte" = dontDistribute super."vte"; + "vtegtk3" = dontDistribute super."vtegtk3"; + "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_5_0"; + "wai-accept-language" = dontDistribute super."wai-accept-language"; + "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" = doDistribute super."wai-middleware-content-type_0_2_0"; + "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-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; + "wai-middleware-route" = dontDistribute super."wai-middleware-route"; + "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "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_9_5"; + "wai-session-alt" = dontDistribute super."wai-session-alt"; + "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; + "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"; + "wait-handle" = dontDistribute super."wait-handle"; + "waitfree" = dontDistribute super."waitfree"; + "warc" = dontDistribute super."warc"; + "warp" = doDistribute super."warp_3_1_12"; + "warp-dynamic" = dontDistribute super."warp-dynamic"; + "warp-static" = dontDistribute super."warp-static"; + "warp-tls" = doDistribute super."warp-tls_3_1_5"; + "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-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-transformers" = dontDistribute super."web-routes-transformers"; + "webapi" = dontDistribute super."webapi"; + "webapp" = dontDistribute super."webapp"; + "webcrank" = dontDistribute super."webcrank"; + "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; + "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webfinger-client" = dontDistribute super."webfinger-client"; + "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"; + "werewolf" = dontDistribute super."werewolf"; + "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"; + "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"; + "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"; + "wsdl" = dontDistribute super."wsdl"; + "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-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-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-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" = doDistribute super."yaml_0_8_15_2"; + "yaml-config" = dontDistribute super."yaml-config"; + "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"; + "yaml-union" = dontDistribute super."yaml-union"; + "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"; + "yesod-angular" = dontDistribute super."yesod-angular"; + "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth" = doDistribute super."yesod-auth_1_4_11"; + "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-oauth" = dontDistribute super."yesod-auth-oauth"; + "yesod-auth-oauth2" = dontDistribute super."yesod-auth-oauth2"; + "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-core" = doDistribute super."yesod-core_1_4_18_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-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-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-tableview" = dontDistribute super."yesod-tableview"; + "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-contrib" = dontDistribute super."yi-contrib"; + "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; + "yi-gtk" = dontDistribute super."yi-gtk"; + "yi-monokai" = dontDistribute super."yi-monokai"; + "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"; + "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/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index ad820012bd1..e3847528ad0 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -3,6 +3,7 @@ }: { pname +, dontStrip ? (ghc.isGhcjs or false) , version, revision ? null , sha256 ? null , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; } @@ -299,7 +300,6 @@ stdenv.mkDerivation ({ // optionalAttrs (configureFlags != []) { inherit configureFlags; } // optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } -// optionalAttrs (postPatch != "") { inherit postPatch; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } // optionalAttrs (postConfigure != "") { inherit postConfigure; } // optionalAttrs (preBuild != "") { inherit preBuild; } @@ -313,5 +313,6 @@ stdenv.mkDerivation ({ // optionalAttrs (postInstall != "") { inherit postInstall; } // optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (postFixup != "") { inherit postFixup; } +// optionalAttrs (dontStrip) { inherit dontStrip; } // optionalAttrs (stdenv.isLinux) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e24b039d786..6c2feb4946e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1610,6 +1610,7 @@ self: { vector-th-unbox ]; executableHaskellDepends = [ base cmdargs ]; + jailbreak = true; homepage = "https://github.com/choener/BiobaseXNA"; description = "Efficient RNA/DNA representations"; license = stdenv.lib.licenses.gpl3; @@ -3995,7 +3996,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "DRBG" = callPackage + "DRBG_0_5_4" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, cipher-aes128 , crypto-api, crypto-api-tests, cryptohash-cryptoapi, entropy , HUnit, mtl, parallel, prettyclass, QuickCheck, tagged @@ -4016,12 +4017,14 @@ self: { crypto-api-tests cryptohash-cryptoapi entropy HUnit mtl parallel prettyclass QuickCheck tagged test-framework test-framework-hunit ]; + jailbreak = true; doCheck = false; description = "Deterministic random bit generator (aka RNG, PRNG) based HMACs, Hashes, and Ciphers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "DRBG_0_5_5" = callPackage + "DRBG" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, cipher-aes128 , crypto-api, crypto-api-tests, cryptohash-cryptoapi, entropy , HUnit, mtl, parallel, prettyclass, QuickCheck, tagged @@ -4040,10 +4043,9 @@ self: { crypto-api-tests cryptohash-cryptoapi entropy HUnit mtl parallel prettyclass QuickCheck tagged test-framework test-framework-hunit ]; - jailbreak = true; + doCheck = false; description = "Deterministic random bit generator (aka RNG, PRNG) based HMACs, Hashes, and Ciphers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DSA" = callPackage @@ -6561,7 +6563,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "GPipe" = callPackage + "GPipe_2_1_5" = callPackage ({ mkDerivation, base, Boolean, containers, exception-transformers , gl, hashtables, linear, transformers }: @@ -6576,6 +6578,24 @@ self: { homepage = "http://tobbebex.blogspot.se/"; description = "Typesafe functional GPU graphics programming"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "GPipe" = callPackage + ({ mkDerivation, base, Boolean, containers, exception-transformers + , gl, hashtables, linear, transformers + }: + mkDerivation { + pname = "GPipe"; + version = "2.1.6"; + sha256 = "2ab8d54731b9e0a5a799cb592f83c9d131534b9d9b1dc8098c36e698d23808f6"; + libraryHaskellDepends = [ + base Boolean containers exception-transformers gl hashtables linear + transformers + ]; + homepage = "http://tobbebex.blogspot.se/"; + description = "Typesafe functional GPU graphics programming"; + license = stdenv.lib.licenses.mit; }) {}; "GPipe-Collada" = callPackage @@ -6924,6 +6944,20 @@ self: { license = "GPL"; }) {}; + "Gifcurry" = callPackage + ({ mkDerivation, base, gtk3, process, temporary }: + mkDerivation { + pname = "Gifcurry"; + version = "0.1.0.0"; + sha256 = "b2b6eadd35889f996931887b21c85a9dbd397f988567981479266752e21537bf"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base gtk3 process temporary ]; + homepage = "https://github.com/lettier/gifcurry"; + description = "Create animated GIFs, overlaid with optional text, from movies"; + license = stdenv.lib.licenses.asl20; + }) {}; + "GiveYouAHead" = callPackage ({ mkDerivation, base, directory, extra, old-time, process }: mkDerivation { @@ -7715,8 +7749,8 @@ self: { ({ mkDerivation, array, base, X11 }: mkDerivation { pname = "HGL"; - version = "3.2.2"; - sha256 = "16a355c102ba057b8c9df363bfc65f6cf24a2d3fd9296cae911ab68eef0d762a"; + version = "3.2.3.1"; + sha256 = "d05dee7a9ebc45aba82922707c29033ca491a58adb88a63ab180d7459b163e55"; libraryHaskellDepends = [ array base X11 ]; description = "A simple graphics library based on X11 or Win32"; license = stdenv.lib.licenses.bsd3; @@ -9208,7 +9242,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "HUnit" = callPackage + "HUnit_1_3_1_0" = callPackage ({ mkDerivation, base, deepseq, filepath }: mkDerivation { pname = "HUnit"; @@ -9219,6 +9253,20 @@ self: { homepage = "http://hunit.sourceforge.net/"; description = "A unit testing framework for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "HUnit" = callPackage + ({ mkDerivation, base, deepseq, filepath }: + mkDerivation { + pname = "HUnit"; + version = "1.3.1.1"; + sha256 = "93e5fc4290ab685b469209f04d9858338ffff486e15c23a11260c47e32da8ef8"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq filepath ]; + homepage = "https://github.com/hspec/HUnit#readme"; + description = "A unit testing framework for Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "HUnit-Diff" = callPackage @@ -9401,7 +9449,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "HaRe" = callPackage + "HaRe_0_8_2_2" = callPackage ({ mkDerivation, array, base, Cabal, cabal-helper, containers , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod , ghc-paths, ghc-prim, ghc-syb-utils, hslogger, hspec, HUnit @@ -9438,6 +9486,51 @@ self: { Strafunski-StrategyLib stringbuilder syb syz time transformers transformers-base ]; + jailbreak = true; + doCheck = false; + homepage = "https://github.com/RefactoringTools/HaRe/wiki"; + description = "the Haskell Refactorer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "HaRe" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-helper, containers + , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod + , ghc-paths, ghc-prim, ghc-syb-utils, hslogger, hspec, HUnit + , monad-control, monoid-extras, mtl, old-time, parsec, pretty + , process, QuickCheck, rosezipper, semigroups, silently + , Strafunski-StrategyLib, stringbuilder, syb, syz, time + , transformers, transformers-base + }: + mkDerivation { + pname = "HaRe"; + version = "0.8.2.3"; + sha256 = "8ccd728cd666929cc59ac1ad9fc16a5a462454a6c04c7c5019767f0b490a0e04"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal cabal-helper containers directory filepath ghc + ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger + monad-control monoid-extras mtl old-time pretty rosezipper + semigroups Strafunski-StrategyLib syb syz time transformers + transformers-base + ]; + executableHaskellDepends = [ + array base Cabal cabal-helper containers directory filepath ghc + ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger + monad-control monoid-extras mtl old-time parsec pretty rosezipper + semigroups Strafunski-StrategyLib syb syz time transformers + transformers-base + ]; + testHaskellDepends = [ + base Cabal cabal-helper containers deepseq Diff directory filepath + ghc ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils + hslogger hspec HUnit monad-control monoid-extras mtl old-time + process QuickCheck rosezipper semigroups silently + Strafunski-StrategyLib stringbuilder syb syz time transformers + transformers-base + ]; doCheck = false; homepage = "https://github.com/RefactoringTools/HaRe/wiki"; description = "the Haskell Refactorer"; @@ -9558,13 +9651,12 @@ self: { }: mkDerivation { pname = "HaTeX-qq"; - version = "0.0.1.1"; - sha256 = "34b73b1a3bc09d881ef4966a2e3324400877f99bb8cef6fa3fc09ebad36b50ce"; + version = "0.0.1.2"; + sha256 = "60db927820811c1bbc17890e21188caeb9441f40c6a5fb5c5436101eca4a0c61"; libraryHaskellDepends = [ antiquoter base haskell-src-meta HaTeX template-haskell text uniplate ]; - jailbreak = true; description = "Quasiquoters for HaTeX"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -12244,6 +12336,22 @@ self: { }) {inherit (pkgs) ncurses;}; "LibZip" = callPackage + ({ mkDerivation, base, bindings-libzip, bytestring, filepath, mtl + , time + }: + mkDerivation { + pname = "LibZip"; + version = "0.10.2"; + sha256 = "54d81de73bd7f4acd7cebe28e26931c0afd9fece905e289aaecbe103e2ab973a"; + libraryHaskellDepends = [ + base bindings-libzip bytestring filepath mtl time + ]; + homepage = "http://bitbucket.org/astanin/hs-libzip/"; + description = "Bindings to libzip, a library for manipulating zip archives"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "LibZip_0_11_1" = callPackage ({ mkDerivation, base, bindings-libzip, bytestring, directory , filepath, HUnit, mtl, time, utf8-string }: @@ -12258,9 +12366,11 @@ self: { base bindings-libzip bytestring directory filepath HUnit mtl time utf8-string ]; + jailbreak = true; homepage = "http://bitbucket.org/astanin/hs-libzip/"; description = "Bindings to libzip, a library for manipulating zip archives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Limit" = callPackage @@ -12309,6 +12419,7 @@ self: { aeson base binary cereal QuickCheck stringable test-framework test-framework-quickcheck2 test-framework-th ]; + jailbreak = true; homepage = "https://github.com/choener/LinguisticsTypes"; description = "Collection of types for natural language"; license = stdenv.lib.licenses.bsd3; @@ -13302,7 +13413,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "MonadRandom" = callPackage + "MonadRandom_0_4_1" = callPackage ({ mkDerivation, base, mtl, random, transformers , transformers-compat }: @@ -13315,6 +13426,7 @@ self: { ]; description = "Random-number generation monad"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MonadRandom_0_4_2_1" = callPackage @@ -13333,6 +13445,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "MonadRandom" = callPackage + ({ mkDerivation, base, mtl, random, transformers + , transformers-compat + }: + mkDerivation { + pname = "MonadRandom"; + version = "0.4.2.2"; + sha256 = "07cdf3801ae55a3e89298e902aecfc78d6d34096f7adefd4a826175dcd892a10"; + libraryHaskellDepends = [ + base mtl random transformers transformers-compat + ]; + description = "Random-number generation monad"; + license = "unknown"; + }) {}; + "MonadRandomLazy" = callPackage ({ mkDerivation, base, MonadRandom, mtl, random }: mkDerivation { @@ -13655,15 +13782,15 @@ self: { }: mkDerivation { pname = "NTRU"; - version = "1.0.0.0"; - sha256 = "0a6e9e4dacb3da068566a775440d51ac1c7021807a163c3bd03facb27f872659"; + version = "1.0.0.1"; + sha256 = "4639599d4459e01a6876a2d51847d2d72161616d4dcda18d7e9e5d5e02b02cc1"; libraryHaskellDepends = [ arithmoi base bytestring containers crypto-api polynomial random SHA split ]; jailbreak = true; description = "NTRU Cryptography"; - license = stdenv.lib.licenses.bsd3; + license = "GPL"; hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; @@ -13750,6 +13877,7 @@ self: { test-framework test-framework-quickcheck2 test-framework-th text unordered-containers ]; + jailbreak = true; homepage = "https://github.com/choener/NaturalLanguageAlphabets"; description = "Simple scoring schemes for word alignments"; license = stdenv.lib.licenses.bsd3; @@ -14940,6 +15068,25 @@ self: { license = "LGPL"; }) {}; + "PUH-Project" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, mime-mail + , network, old-locale, persistent, persistent-sqlite + , persistent-template, pwstore-fast, random, smtp-mail, text, time + , transformers + }: + mkDerivation { + pname = "PUH-Project"; + version = "0.1.0.1"; + sha256 = "3ae48511d92c0d0794b1de80363ab718400e9a44f80cb0e4f03b225ed4c0c522"; + libraryHaskellDepends = [ + base bytestring containers directory mime-mail network old-locale + persistent persistent-sqlite persistent-template pwstore-fast + random smtp-mail text time transformers + ]; + description = "This is a package which includes Assignments, Email, User and Reviews modules for Programming in Haskell course"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "PageIO" = callPackage ({ mkDerivation, array, attoparsec, base, base64-string, bytestring , containers, directory, iconv, network, old-time, regex-base @@ -15391,6 +15538,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; + jailbreak = true; homepage = "https://github.com/choener/PrimitiveArray"; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; @@ -18114,7 +18262,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "StateVar" = callPackage + "StateVar_1_1_0_2" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; @@ -18124,9 +18272,10 @@ self: { homepage = "https://github.com/haskell-opengl/StateVar"; description = "State variables"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "StateVar_1_1_0_3" = callPackage + "StateVar" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; @@ -18136,7 +18285,6 @@ self: { homepage = "https://github.com/haskell-opengl/StateVar"; description = "State variables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "StateVar-transformer" = callPackage @@ -19006,7 +19154,6 @@ self: { version = "0.9.11"; sha256 = "124c2f9971aa8e45c8cc4f706407f9c28805e63b387400a0b2b9e115aa22044a"; libraryHaskellDepends = [ base base-orphans ]; - jailbreak = true; homepage = "https://github.com/conal/TypeCompose"; description = "Type composition classes & instances"; license = stdenv.lib.licenses.bsd3; @@ -20872,8 +21019,8 @@ self: { }: mkDerivation { pname = "accelerate-cuda"; - version = "0.15.1.0"; - sha256 = "c05cb24ac4a98a0b962ffd5eaed2befe2b02815e1f8ed219e1d3d6a8b7f60650"; + version = "0.15.1.1"; + sha256 = "6140c60df329f78d77d258ae3029522cb7a3fb038c531e23792dd8b307ff379d"; libraryHaskellDepends = [ accelerate array base binary bytestring cryptohash cuda directory fclabels filepath hashable hashtables language-c-quote @@ -21124,6 +21271,7 @@ self: { extensible-exceptions filepath mtl network safecopy stm template-haskell unix ]; + jailbreak = true; homepage = "http://acid-state.seize.it/"; description = "Add ACID guarantees to any serializable Haskell data structure"; license = stdenv.lib.licenses.publicDomain; @@ -22129,7 +22277,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "adjunctions" = callPackage + "adjunctions_4_2_2" = callPackage ({ mkDerivation, array, base, comonad, containers, contravariant , distributive, free, mtl, profunctors, semigroupoids, semigroups , tagged, transformers, void @@ -22145,9 +22293,10 @@ self: { homepage = "http://github.com/ekmett/adjunctions/"; description = "Adjunctions and representable functors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "adjunctions_4_3" = callPackage + "adjunctions" = callPackage ({ mkDerivation, array, base, comonad, containers, contravariant , distributive, free, mtl, profunctors, semigroupoids, semigroups , tagged, transformers, transformers-compat, void @@ -22156,6 +22305,8 @@ self: { pname = "adjunctions"; version = "4.3"; sha256 = "b948a14fafe8857f451ae3e474f5264c907b5a2d841d52bf78249ae4749c3ecc"; + revision = "1"; + editedCabalFile = "f88c4f5440736d64ad6a478e9feccc116727b5dc616fc6535cfe64ff75a2e980"; libraryHaskellDepends = [ array base comonad containers contravariant distributive free mtl profunctors semigroupoids semigroups tagged transformers @@ -22164,9 +22315,22 @@ self: { homepage = "http://github.com/ekmett/adjunctions/"; description = "Adjunctions and representable functors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "adler32" = callPackage + ({ mkDerivation, base, bytestring, hspec, zlib }: + mkDerivation { + pname = "adler32"; + version = "0.1.0.0"; + sha256 = "c2bdbdd971e28ed4abb321280c3d77965ed425a848b3ef08ac66a6233c5d5328"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ zlib ]; + testHaskellDepends = [ base bytestring hspec ]; + homepage = "https://github.com/redneb/hs-adler32"; + description = "An implementation of Adler-32, supporting rolling checksum operation"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) zlib;}; + "adobe-swatch-exchange" = callPackage ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 , language-css, mtl, pretty @@ -22295,6 +22459,35 @@ self: { }) {}; "aeson" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq + , dlist, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific + , syb, template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "aeson"; + version = "0.9.0.1"; + sha256 = "92b97dbc4968a2af6bc13b499629118f85b22efe113a4d60e578fbfb0f6ef8bc"; + revision = "1"; + editedCabalFile = "651b27c1cd2730cd0234cc1fb5860dd74728e5ecc6682b2a5e857fd42d41fe22"; + libraryHaskellDepends = [ + attoparsec base bytestring containers deepseq dlist ghc-prim + hashable mtl scientific syb template-haskell text time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring containers ghc-prim HUnit QuickCheck + template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 text time unordered-containers vector + ]; + doCheck = false; + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "aeson_0_10_0_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq , dlist, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific , syb, template-haskell, test-framework, test-framework-hunit @@ -22321,6 +22514,7 @@ self: { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -22625,6 +22819,7 @@ self: { libraryHaskellDepends = [ aeson base parsec scientific text unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/FPBrno/aeson-parsec-picky"; description = "Alternative JSON parser based on Parsec and Aeson"; license = stdenv.lib.licenses.bsd3; @@ -23224,6 +23419,7 @@ self: { base bytestring tasty tasty-hunit tasty-quickcheck text transformers wai ]; + jailbreak = true; homepage = "https://github.com/helium/airship/"; description = "A Webmachine-inspired HTTP library"; license = stdenv.lib.licenses.mit; @@ -23255,6 +23451,7 @@ self: { base bytestring tasty tasty-hunit tasty-quickcheck text transformers wai ]; + jailbreak = true; homepage = "https://github.com/helium/airship/"; description = "A Webmachine-inspired HTTP library"; license = stdenv.lib.licenses.mit; @@ -28185,6 +28382,8 @@ self: { pname = "apache-md5"; version = "0.6.1.4"; sha256 = "c84f882f6aca7b72d89ee662d358f40fe89ab3267ec418f3bee24a0d80b096b7"; + revision = "2"; + editedCabalFile = "e41d43eba938331a51fb0ead7cd004c6f539820c06aed48a77eb67e04eee39f2"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ @@ -28453,6 +28652,7 @@ self: { apiary base bytestring data-default-class helics helics-wai monad-control text transformers types-compat vault wai ]; + jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "helics support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -28962,6 +29162,7 @@ self: { testHaskellDepends = [ base directory doctest filepath semigroups simple-reflect ]; + jailbreak = true; homepage = "http://github.com/analytics/approximate/"; description = "Approximate discrete values and numbers"; license = stdenv.lib.licenses.bsd3; @@ -29210,7 +29411,6 @@ self: { pcre-light process-extras tasty tasty-golden tasty-hunit time transformers unix utf8-string ]; - jailbreak = true; homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; @@ -29411,12 +29611,17 @@ self: { }) {}; "argon2" = callPackage - ({ mkDerivation, base, bytestring, text, transformers }: + ({ mkDerivation, base, bytestring, QuickCheck, tasty + , tasty-quickcheck, text, transformers + }: mkDerivation { pname = "argon2"; - version = "1.0.0"; - sha256 = "29691e8019104b724466766b5031335e9dea185a84b886e2f9d895f4fe01eae3"; + version = "1.1.0"; + sha256 = "42fc5495434739408115cd932e7b3a6853e4f999e86bd408422ed0abfa19837a"; libraryHaskellDepends = [ base bytestring text transformers ]; + testHaskellDepends = [ + base bytestring QuickCheck tasty tasty-quickcheck text + ]; homepage = "https://github.com/ocharles/argon2.git"; description = "Haskell bindings to libargon2 - the reference implementation of the Argon2 password-hashing function"; license = stdenv.lib.licenses.bsd3; @@ -30799,8 +31004,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "atrans"; - version = "0.1.0.1"; - sha256 = "84440b6c0a27c656a580df640db912a19eb0fb5aaa09a1437f451b5809ee6035"; + version = "0.1.1.0"; + sha256 = "9119df84f2dacc53935238c4c225f26937e25898d91b8c2d973e4cf467249b66"; libraryHaskellDepends = [ base mtl ]; homepage = "https://github.com/aphorisme/atrans"; description = "A small collection of monad (transformer) instances"; @@ -31299,7 +31504,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "authenticate" = callPackage + "authenticate_1_3_2_11" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , case-insensitive, conduit, containers, http-conduit, http-types , monad-control, network-uri, resourcet, tagstream-conduit, text @@ -31318,6 +31523,28 @@ self: { homepage = "http://github.com/yesodweb/authenticate"; description = "Authentication methods for Haskell web applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "authenticate" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , case-insensitive, conduit, containers, http-conduit, http-types + , monad-control, network-uri, resourcet, tagstream-conduit, text + , transformers, unordered-containers, xml-conduit + }: + mkDerivation { + pname = "authenticate"; + version = "1.3.3"; + sha256 = "6807cd32c5ff9b23cd6f184ffd7fb7f99c4a7f0dc645eae82f2d6dfbd1899bbe"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring case-insensitive + conduit containers http-conduit http-types monad-control + network-uri resourcet tagstream-conduit text transformers + unordered-containers xml-conduit + ]; + homepage = "http://github.com/yesodweb/authenticate"; + description = "Authentication methods for Haskell web applications"; + license = stdenv.lib.licenses.bsd3; }) {}; "authenticate-kerberos" = callPackage @@ -31571,8 +31798,8 @@ self: { }: mkDerivation { pname = "avers"; - version = "0.0.12"; - sha256 = "fa8c71676e1400b94d38b5af8a8f0aa0335db1b867f1d22cc857b835aa61b90a"; + version = "0.0.13"; + sha256 = "419abfc046fdb3561d20ed65e4dfc07e140e1cc03406832060d5b218a3cf3f18"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash filepath inflections MonadRandom mtl network network-uri @@ -31585,12 +31812,48 @@ self: { rethinkdb-client-driver scrypt stm text time unordered-containers vector ]; - jailbreak = true; description = "empty"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "avers-api" = callPackage + ({ mkDerivation, aeson, avers, base, bytestring, cookie, servant + , text, time + }: + mkDerivation { + pname = "avers-api"; + version = "0.0.1"; + sha256 = "a4b129911501494d231ecb13397b8bcac05ec6225a4122ec9b4f00e31b4cbd1b"; + libraryHaskellDepends = [ + aeson avers base bytestring cookie servant text time + ]; + doHaddock = false; + homepage = "http://github.com/wereHamster/avers-api"; + description = "Types describing the core and extended Avers APIs"; + license = stdenv.lib.licenses.mit; + }) {}; + + "avers-server" = callPackage + ({ mkDerivation, aeson, avers, avers-api, base, bytestring + , bytestring-conversion, cookie, either, http-types, mtl + , resource-pool, rethinkdb-client-driver, servant, servant-server + , text, time, transformers, wai, wai-websockets, websockets + }: + mkDerivation { + pname = "avers-server"; + version = "0.0.1"; + sha256 = "e61d4ec267e3ad71096360dde4081da4e044bb1a39b2b29b507c28ae5cae06c0"; + libraryHaskellDepends = [ + aeson avers avers-api base bytestring bytestring-conversion cookie + either http-types mtl resource-pool rethinkdb-client-driver servant + servant-server text time transformers wai wai-websockets websockets + ]; + homepage = "http://github.com/wereHamster/avers-server"; + description = "Server implementation of the Avers API"; + license = stdenv.lib.licenses.mit; + }) {}; + "avl-static" = callPackage ({ mkDerivation, base, QuickCheck, test-framework , test-framework-quickcheck2 @@ -31879,6 +32142,8 @@ self: { pname = "aws"; version = "0.13.0"; sha256 = "3504c96a00d12fa0fe4ae5ab4dafa3eec7ca576a02ed7906cff70a75625a75a6"; + revision = "1"; + editedCabalFile = "57beb101b4203e6784df90817aadfbda98972052e31f85fa620f2d7dcdf6a446"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32924,8 +33189,8 @@ self: { ({ mkDerivation, base, hspec, HUnit, QuickCheck, time }: mkDerivation { pname = "bank-holiday-usa"; - version = "0.1.0"; - sha256 = "c5de8ab4ffc24c11d60762057c9261adc2b05762e8465b27afe6f4f7a499dbc8"; + version = "0.1.1"; + sha256 = "5fbd4b6a9cc86717530430dae50e6fe2fc049d336e97c8bb7ebcec25d738448b"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec HUnit QuickCheck time ]; homepage = "https://github.com/tippenein/BankHoliday"; @@ -33153,7 +33418,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base-compat" = callPackage + "base-compat_0_8_2" = callPackage ({ mkDerivation, base, hspec, QuickCheck, unix }: mkDerivation { pname = "base-compat"; @@ -33165,9 +33430,10 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "A compatibility layer for base"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base-compat_0_9_0" = callPackage + "base-compat" = callPackage ({ mkDerivation, base, hspec, QuickCheck, unix }: mkDerivation { pname = "base-compat"; @@ -33177,7 +33443,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "A compatibility layer for base"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-generics" = callPackage @@ -33252,7 +33517,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base-orphans" = callPackage + "base-orphans_0_4_5" = callPackage ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: mkDerivation { pname = "base-orphans"; @@ -33263,9 +33528,10 @@ self: { homepage = "https://github.com/haskell-compat/base-orphans#readme"; description = "Backwards-compatible orphan instances for base"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base-orphans_0_5_0" = callPackage + "base-orphans" = callPackage ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }: mkDerivation { pname = "base-orphans"; @@ -33276,7 +33542,6 @@ self: { homepage = "https://github.com/haskell-compat/base-orphans#readme"; description = "Backwards-compatible orphan instances for base"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-prelude_0_1_6" = callPackage @@ -34433,7 +34698,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bifunctors" = callPackage + "bifunctors_5_1" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, semigroups , tagged, template-haskell, transformers, transformers-compat }: @@ -34452,9 +34717,10 @@ self: { homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bifunctors_5_2" = callPackage + "bifunctors" = callPackage ({ mkDerivation, base, comonad, containers, hspec, QuickCheck , semigroups, tagged, template-haskell, transformers , transformers-compat @@ -34473,7 +34739,6 @@ self: { homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bighugethesaurus" = callPackage @@ -34615,7 +34880,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bimap" = callPackage + "bimap_0_3_0" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "bimap"; @@ -34625,18 +34890,17 @@ self: { homepage = "https://github.com/joelwilliamson/bimap"; description = "Bidirectional mapping between two key types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bimap_0_3_1" = callPackage + "bimap" = callPackage ({ mkDerivation, base, containers, exceptions, QuickCheck , template-haskell }: mkDerivation { pname = "bimap"; - version = "0.3.1"; - sha256 = "b4e07666e79b81a00f43982191848b76a96784f0b29792290fbdec0b08ba4c0f"; - revision = "1"; - editedCabalFile = "b83cd7c739e00af80b8f73caa1661f1118541a50f679367d44ff33d48b29892a"; + version = "0.3.2"; + sha256 = "148fc2d9784aa79faf49a979881a2304102a70d13e32fa8ce9f18ab466dc3db8"; libraryHaskellDepends = [ base containers exceptions ]; testHaskellDepends = [ base containers exceptions QuickCheck template-haskell @@ -34644,7 +34908,6 @@ self: { homepage = "https://github.com/joelwilliamson/bimap"; description = "Bidirectional mapping between two key types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bimap-server" = callPackage @@ -35032,7 +35295,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "binary-search" = callPackage + "binary-search_0_1" = callPackage ({ mkDerivation, base, containers, directory, doctest, filepath , hspec, QuickCheck }: @@ -35046,6 +35309,23 @@ self: { ]; description = "Binary and exponential searches"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "binary-search" = callPackage + ({ mkDerivation, base, containers, directory, doctest, filepath + , hspec, QuickCheck, transformers + }: + mkDerivation { + pname = "binary-search"; + version = "1.0.0.3"; + sha256 = "b0e32df46aeddceac57bd6afa940f84f275f82fb251479e10fadd7c14414f6fa"; + libraryHaskellDepends = [ base containers transformers ]; + testHaskellDepends = [ + base directory doctest filepath hspec QuickCheck + ]; + description = "Binary and exponential searches"; + license = stdenv.lib.licenses.bsd3; }) {}; "binary-shared" = callPackage @@ -35803,6 +36083,19 @@ self: { }) {v4l2 = null;}; "bindings-libzip" = callPackage + ({ mkDerivation, base, bindings-DSL, libzip }: + mkDerivation { + pname = "bindings-libzip"; + version = "0.10.2"; + sha256 = "e722c5da93f366bf81d390291098b43fd9bc0aa228f280bc7a0c9143a14c4897"; + libraryHaskellDepends = [ base bindings-DSL ]; + libraryPkgconfigDepends = [ libzip ]; + homepage = "http://bitbucket.org/astanin/hs-libzip/"; + description = "Low level bindings to libzip"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) libzip;}; + + "bindings-libzip_0_11" = callPackage ({ mkDerivation, base, bindings-DSL, libzip }: mkDerivation { pname = "bindings-libzip"; @@ -35813,6 +36106,7 @@ self: { homepage = "http://bitbucket.org/astanin/hs-libzip/"; description = "Low level bindings to libzip"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libzip;}; "bindings-linux-videodev2" = callPackage @@ -35832,11 +36126,10 @@ self: { ({ mkDerivation, base, bindings-DSL, lxc }: mkDerivation { pname = "bindings-lxc"; - version = "0.2.0.1"; - sha256 = "82a47461390fa5e510887954ede3971664a1f29dea689f94bb21e789faefc170"; + version = "0.2.1"; + sha256 = "4fee45e55c7cb2ae75a83005213eb7aa2dae7ee97704db3e0cd4ae918ae13087"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ lxc ]; - jailbreak = true; homepage = "https://github.com/fizruk/bindings-lxc"; description = "Direct Haskell bindings to LXC (Linux containers) C API"; license = stdenv.lib.licenses.bsd3; @@ -36122,14 +36415,14 @@ self: { }) {}; "bini" = callPackage - ({ mkDerivation, base, binary, bytestring }: + ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 }: mkDerivation { pname = "bini"; - version = "0.1.3"; - sha256 = "0230985959d9bd82d014ce62e14768cb46cb0b78b77f7ab34d07208976c00981"; - revision = "1"; - editedCabalFile = "9ea37e003df728ff0addc67d1ff8d15533a4baa4c525339c4638bad137d6c953"; - libraryHaskellDepends = [ base binary bytestring ]; + version = "0.1.5"; + sha256 = "b83bc415d2d08bfbaadccd8723ad4945d0cb4c519a414cc28a56572b9cd08cb4"; + libraryHaskellDepends = [ + base binary bytestring data-binary-ieee754 + ]; description = "A collection of various methods for reading and writing bini files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -36230,8 +36523,8 @@ self: { }: mkDerivation { pname = "biohazard"; - version = "0.6.2"; - sha256 = "0038256ab3a4072bd542b7fcdcf4a68ee2bd4afce14664bf4c2b3cb04fdef8c2"; + version = "0.6.3"; + sha256 = "063e812cb4c5c9c518363525cec4f309f9ebdf4c8af12e8bf88ca9f39edb47e5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37956,6 +38249,7 @@ self: { executableHaskellDepends = [ base blubber-server bytestring cereal containers gloss network unix ]; + jailbreak = true; homepage = "https://secure.plaimi.net/games/blubber.html"; description = "The blubber client; connects to the blubber server"; license = stdenv.lib.licenses.gpl3; @@ -38126,7 +38420,6 @@ self: { monad-loops pretty QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck text ]; - jailbreak = true; homepage = "https://github.com/Microsoft/bond"; description = "Bond schema compiler and code generator"; license = stdenv.lib.licenses.mit; @@ -38166,11 +38459,12 @@ self: { pname = "boolean-normal-forms"; version = "0.0.0.1"; sha256 = "2c8a8a9b2e868e29fab7467272c6c54792417bcd8c0e349963b3aff82137c287"; + revision = "1"; + editedCabalFile = "c4ca8c0d91be170e201800c3c26de19dea859afa56d69bdab323315e31a74075"; libraryHaskellDepends = [ base cond containers ]; testHaskellDepends = [ base cond containers QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; description = "Boolean normal form: NNF, DNF & CNF"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -38521,6 +38815,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "braid" = callPackage + ({ mkDerivation, base, containers, diagrams-contrib, diagrams-core + , diagrams-lib, diagrams-svg, split + }: + mkDerivation { + pname = "braid"; + version = "0.1.0.0"; + sha256 = "19a5f45ca45b30fcd09fe2909d3c07169a5c5216efbe4d2df7fcbc4f0b28ed99"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers diagrams-contrib diagrams-core diagrams-lib + diagrams-svg split + ]; + executableHaskellDepends = [ + base containers diagrams-contrib diagrams-core diagrams-lib + diagrams-svg split + ]; + homepage = "http://github.com/githubuser/braid#readme"; + description = "Types and functions to work with braids and Khovanov homology"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "brainfuck" = callPackage ({ mkDerivation, array, base, mtl, unix }: mkDerivation { @@ -39495,6 +39812,7 @@ self: { transformers-compat void ]; testHaskellDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/analytics/bytes"; description = "Sharing code for serialization between binary and cereal"; license = stdenv.lib.licenses.bsd3; @@ -39517,6 +39835,7 @@ self: { transformers-compat void ]; testHaskellDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/analytics/bytes"; description = "Sharing code for serialization between binary and cereal"; license = stdenv.lib.licenses.bsd3; @@ -39539,13 +39858,14 @@ self: { transformers-compat void ]; testHaskellDepends = [ base directory doctest filepath ]; + jailbreak = true; 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 + "bytes_0_15_1" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, containers , directory, doctest, filepath, hashable, mtl, scientific, text , time, transformers, transformers-compat, unordered-containers @@ -39564,9 +39884,10 @@ 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_0_15_2" = callPackage + "bytes" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, containers , directory, doctest, filepath, hashable, mtl, scientific, text , time, transformers, transformers-compat, unordered-containers @@ -39585,7 +39906,6 @@ 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; }) {}; "byteset" = callPackage @@ -39750,6 +40070,8 @@ self: { pname = "bytestring-conversion"; version = "0.3.1"; sha256 = "13b7ea48737dc7a7fd4c894ff1fb9344cf8d9ef8f4201e813d578b613e874ef8"; + revision = "2"; + editedCabalFile = "c3a83596c9955edb5558503dfd698d9a99e0da65bdf53edf6eceacef98200cf5"; libraryHaskellDepends = [ attoparsec base bytestring case-insensitive double-conversion text ]; @@ -39816,6 +40138,7 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; jailbreak = true; + doCheck = false; homepage = "http://hub.darcs.net/ganesh/bytestring-handle"; description = "ByteString-backed Handles"; license = stdenv.lib.licenses.bsd3; @@ -40470,7 +40793,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cabal-debian" = callPackage + "cabal-debian_4_31_9" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal , containers, data-default, debian, deepseq, Diff, directory , exceptions, filepath, hsemail, HUnit, lens, memoize, mtl @@ -40505,6 +40828,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cabal-debian" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal + , containers, data-default, debian, deepseq, Diff, directory + , exceptions, filepath, hsemail, HUnit, lens, memoize, mtl + , network-uri, newtype-generics, optparse-applicative, parsec + , pretty, process, pureMD5, regex-tdfa, set-extra, syb, text, unix + , Unixutils, utf8-string + }: + mkDerivation { + pname = "cabal-debian"; + version = "4.32.2"; + sha256 = "63f80fc612511bc36857d05483fa67234b729e1847a8cf93985778bc0fb143ad"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bifunctors Cabal containers data-default debian + deepseq Diff directory exceptions filepath hsemail HUnit lens + memoize mtl network-uri newtype-generics optparse-applicative + parsec pretty process pureMD5 regex-tdfa set-extra syb text unix + Unixutils utf8-string + ]; + executableHaskellDepends = [ + base Cabal debian lens mtl pretty Unixutils + ]; + testHaskellDepends = [ + base Cabal containers debian Diff directory filepath hsemail HUnit + lens pretty process text + ]; + doCheck = false; + homepage = "https://github.com/ddssff/cabal-debian"; + description = "Create a Debianization for a Cabal package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-dependency-licenses" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { @@ -40650,7 +41008,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cabal-helper" = callPackage + "cabal-helper_0_6_3_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, extra , filepath, ghc-prim, mtl, process, template-haskell, temporary , transformers, unix, utf8-string @@ -40675,6 +41033,35 @@ self: { doCheck = false; description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cabal-helper" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory + , extra, filepath, ghc-prim, mtl, process, template-haskell + , temporary, transformers, unix, utf8-string + }: + mkDerivation { + pname = "cabal-helper"; + version = "0.6.3.1"; + sha256 = "c19a9a87c54f6649e0f8cbb3a070244bff9fcc5b9ae783c00c049867fb1a7afe"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal directory filepath ghc-prim mtl process transformers + ]; + executableHaskellDepends = [ + base bytestring Cabal directory filepath ghc-prim process + template-haskell temporary transformers utf8-string + ]; + testHaskellDepends = [ + base bytestring Cabal directory extra filepath ghc-prim mtl process + template-haskell temporary transformers unix utf8-string + ]; + testToolDepends = [ cabal-install ]; + doCheck = false; + description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; + license = stdenv.lib.licenses.agpl3; }) {}; "cabal-install_1_18_0_5" = callPackage @@ -42973,6 +43360,8 @@ self: { pname = "cassava"; version = "0.4.2.3"; sha256 = "4eb0cfc9ddd351e643d4787d3b778614b331431d5ab7e2f9c91376ea478dd08d"; + revision = "1"; + editedCabalFile = "2b71712f064f50be8f752c9f6f433f5df985091de4a01a7d0be3a520e1652807"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring containers deepseq text unordered-containers vector @@ -42999,6 +43388,8 @@ self: { pname = "cassava"; version = "0.4.2.4"; sha256 = "0a81bd1cb4c78158ffce0feec4d3f55f020a7e9abfc656e64f239662c916c4ed"; + revision = "1"; + editedCabalFile = "b04f4bc6b14e22b08f335f02e5c0dfe8adf04006bd5e55fefba07d33767265c0"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring containers deepseq text unordered-containers vector @@ -43025,8 +43416,8 @@ self: { pname = "cassava"; version = "0.4.3.0"; sha256 = "a38bdbb85e00b5650797c2c8ff2cbcddd67238e1d1152e383417d856c3ee8c5f"; - revision = "1"; - editedCabalFile = "6410ddebd594ccd8c068cbfb6b064ac43bcebb48fb74cbc25078c89f55e051a7"; + revision = "2"; + editedCabalFile = "201c58372b964b372dffcafb6774bee04329640d4bedf0c98d9a1b5cf34cc565"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring containers deepseq hashable text unordered-containers vector @@ -43053,8 +43444,35 @@ self: { pname = "cassava"; version = "0.4.3.1"; sha256 = "e389ea01f6f346246e7002d5eb925518d134185f260cbdf1e81628eb4cffc2ac"; + revision = "2"; + editedCabalFile = "698c3f8bf72c561280944d2ace8be7c0b271c83557426a9474699930644b3828"; + libraryHaskellDepends = [ + array attoparsec base blaze-builder bytestring containers deepseq + hashable text unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring hashable HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text + unordered-containers vector + ]; + homepage = "https://github.com/tibbe/cassava"; + description = "A CSV parsing and encoding library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cassava_0_4_4_0" = callPackage + ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring + , containers, deepseq, hashable, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , unordered-containers, vector + }: + mkDerivation { + pname = "cassava"; + version = "0.4.4.0"; + sha256 = "0733ede68d2670fd3e676f5a19b6d31233b266a8dc42387316e6ec7ed5e5df3f"; revision = "1"; - editedCabalFile = "924891b69a808202b1f77b2993137103d3301088634782e673138db2d5c5e50b"; + editedCabalFile = "0293422ddf8cc18edba220088560c5d5a6bdba54cd784a5d7cb2eb8cd430166b"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring containers deepseq hashable text unordered-containers vector @@ -43078,8 +43496,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.4.4.0"; - sha256 = "0733ede68d2670fd3e676f5a19b6d31233b266a8dc42387316e6ec7ed5e5df3f"; + version = "0.4.5.0"; + sha256 = "7320a1c764efd3baae6944b31f7fdb438ae307876dce283a242e8f1deeb371c9"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring containers deepseq hashable text unordered-containers vector @@ -43089,7 +43507,7 @@ self: { test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; - homepage = "https://github.com/tibbe/cassava"; + homepage = "https://github.com/hvr/cassava"; description = "A CSV parsing and encoding library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -43388,8 +43806,8 @@ self: { }: mkDerivation { pname = "cblrepo"; - version = "0.19.0"; - sha256 = "4608d1b3437c3dd00310b7accf53c1d904eb0390feec25075ad2bdef3ab01a19"; + version = "0.19.1"; + sha256 = "e06276a14157bf82b86f3a534bc51620134253b1e9472e676616cec58ab8b436"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -43569,7 +43987,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cereal" = callPackage + "cereal_0_4_1_1" = callPackage ({ mkDerivation, array, base, bytestring, containers, ghc-prim }: mkDerivation { pname = "cereal"; @@ -43580,9 +43998,10 @@ self: { ]; description = "A binary serialization library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cereal_0_5_1_0" = callPackage + "cereal" = callPackage ({ mkDerivation, array, base, bytestring, containers, ghc-prim , QuickCheck, test-framework, test-framework-quickcheck2 }: @@ -43600,7 +44019,6 @@ self: { homepage = "https://github.com/GaloisInc/cereal"; description = "A binary serialization library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-conduit_0_7_2_3" = callPackage @@ -43617,6 +44035,7 @@ self: { testHaskellDepends = [ base bytestring cereal conduit HUnit mtl resourcet transformers ]; + jailbreak = true; homepage = "https://github.com/snoyberg/conduit"; description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits"; license = stdenv.lib.licenses.bsd3; @@ -43847,6 +44266,7 @@ self: { hashable mtl parallel parsec process split text unordered-containers utf8-string void ]; + jailbreak = true; description = "Parser for categorial grammars"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; @@ -43873,7 +44293,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cgi" = callPackage + "cgi_3001_2_2_2" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, mtl , multipart, network, network-uri, old-locale, old-time, parsec , xhtml @@ -43889,6 +44309,25 @@ self: { homepage = "https://github.com/cheecheeo/haskell-cgi"; description = "A library for writing CGI programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cgi" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, mtl + , multipart, network, network-uri, old-locale, old-time, parsec + , xhtml + }: + mkDerivation { + pname = "cgi"; + version = "3001.2.2.3"; + sha256 = "db57fe55805e3d639f18c594a07106926dd7d86345cf4889f8c512a09d3cfca4"; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl multipart network + network-uri old-locale old-time parsec xhtml + ]; + homepage = "https://github.com/cheecheeo/haskell-cgi"; + description = "A library for writing CGI programs"; + license = stdenv.lib.licenses.bsd3; }) {}; "cgi-undecidable" = callPackage @@ -44190,6 +44629,7 @@ self: { quickcheck-instances tasty tasty-ant-xml tasty-hunit tasty-quickcheck text tokenize unordered-containers ]; + jailbreak = true; homepage = "http://github.com/creswick/chatter"; description = "A library of simple NLP algorithms"; license = stdenv.lib.licenses.bsd3; @@ -44262,6 +44702,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cheapskate-terminal" = callPackage + ({ mkDerivation, ansi-terminal, base, cheapskate, data-default + , directory, hpygments, hscolour, terminal-size, text + }: + mkDerivation { + pname = "cheapskate-terminal"; + version = "0.1.0.0"; + sha256 = "8601c50c9979b463bf695d41d4111bdb0d7824f9600306b08b874bacea1fe9b9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base cheapskate data-default directory hpygments + hscolour terminal-size text + ]; + executableHaskellDepends = [ + ansi-terminal base cheapskate data-default directory hpygments + hscolour terminal-size text + ]; + testHaskellDepends = [ + ansi-terminal base cheapskate data-default directory hpygments + hscolour terminal-size text + ]; + homepage = "http://github.com/yamadapc/cheapskate-terminal#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "check-email" = callPackage ({ mkDerivation, base, bytestring, email-validate, resolv }: mkDerivation { @@ -45128,7 +45595,6 @@ self: { lens lens-aeson mtl mtl-compat QuickCheck tasty tasty-hunit tasty-th transformers-compat ]; - jailbreak = true; homepage = "http://clafer.org"; description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot"; license = stdenv.lib.licenses.mit; @@ -48093,6 +48559,7 @@ self: { random scientific tasty tasty-hunit tasty-quickcheck tasty-th time transformers unordered-containers uuid websockets ]; + jailbreak = true; description = "Connector library for the coinbase exchange"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -49538,8 +50005,8 @@ self: { }: mkDerivation { pname = "concurrent-machines"; - version = "0.1.0.2"; - sha256 = "50b9de838e91fd6161f1a19940236132e28348871e6c01ad1c1586aad9113e89"; + version = "0.2.0"; + sha256 = "85c6050bc86f0a421e39ca6c7a9ac71fa2601d6b8be7792ac57d43fdddd95e4c"; libraryHaskellDepends = [ async base containers lifted-async machines monad-control semigroups time transformers transformers-base @@ -49621,7 +50088,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "concurrent-supply" = callPackage + "concurrent-supply_0_1_7_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, hashable }: mkDerivation { pname = "concurrent-supply"; @@ -49632,9 +50099,10 @@ self: { homepage = "http://github.com/ekmett/concurrent-supply/"; description = "A fast concurrent unique identifier supply with a pure API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "concurrent-supply_0_1_8" = callPackage + "concurrent-supply" = callPackage ({ mkDerivation, base, containers, ghc-prim, hashable }: mkDerivation { pname = "concurrent-supply"; @@ -49645,7 +50113,6 @@ self: { homepage = "http://github.com/ekmett/concurrent-supply/"; description = "A fast concurrent unique identifier supply with a pure API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-utilities" = callPackage @@ -51048,7 +51515,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "constraints" = callPackage + "constraints_0_6" = callPackage ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl , transformers, transformers-compat }: @@ -51063,9 +51530,10 @@ self: { homepage = "http://github.com/ekmett/constraints/"; description = "Constraint manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "constraints_0_8" = callPackage + "constraints" = callPackage ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl , transformers, transformers-compat }: @@ -51080,7 +51548,6 @@ self: { homepage = "http://github.com/ekmett/constraints/"; description = "Constraint manipulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constructible" = callPackage @@ -51542,7 +52009,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "contravariant" = callPackage + "contravariant_1_3_3" = callPackage ({ mkDerivation, base, semigroups, StateVar, transformers , transformers-compat, void }: @@ -51556,9 +52023,10 @@ self: { homepage = "http://github.com/ekmett/contravariant/"; description = "Contravariant functors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "contravariant_1_4" = callPackage + "contravariant" = callPackage ({ mkDerivation, base, semigroups, StateVar, transformers , transformers-compat, void }: @@ -51572,7 +52040,6 @@ self: { homepage = "http://github.com/ekmett/contravariant/"; description = "Contravariant functors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "contravariant-extras" = callPackage @@ -52515,7 +52982,6 @@ self: { libraryHaskellDepends = [ aeson base shakespeare text ]; executableHaskellDepends = [ base tagsoup text ]; testHaskellDepends = [ aeson base HTF HUnit ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/country-codes"; description = "ISO 3166 country codes and i18n names"; license = stdenv.lib.licenses.bsd3; @@ -52936,6 +53402,7 @@ self: { base bytestring cereal Decimal iproute network QuickCheck tasty tasty-quickcheck text time uuid ]; + jailbreak = true; homepage = "https://github.com/twittner/cql/"; description = "Cassandra CQL binary protocol"; license = stdenv.lib.licenses.mpl20; @@ -53224,7 +53691,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {crack = null;}; - "crackNum" = callPackage + "crackNum_1_3" = callPackage ({ mkDerivation, base, data-binary-ieee754, ieee754 }: mkDerivation { pname = "crackNum"; @@ -53236,6 +53703,21 @@ self: { executableHaskellDepends = [ base data-binary-ieee754 ieee754 ]; description = "Crack various integer, floating-point data formats"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "crackNum" = callPackage + ({ mkDerivation, base, data-binary-ieee754, ieee754 }: + mkDerivation { + pname = "crackNum"; + version = "1.4"; + sha256 = "5d66f4f51b8600cdc48a3d4b999322ec8efa0f26fd8a41b4bb125412e3dea009"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base data-binary-ieee754 ieee754 ]; + executableHaskellDepends = [ base data-binary-ieee754 ieee754 ]; + description = "Crack various integer, floating-point data formats"; + license = stdenv.lib.licenses.bsd3; }) {}; "craftwerk" = callPackage @@ -53806,6 +54288,7 @@ self: { base bytestring cereal conduit conduit-extra crypto-api cryptocipher cryptohash-cryptoapi hspec skein transformers ]; + jailbreak = true; homepage = "https://github.com/prowdsponsor/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; license = stdenv.lib.licenses.bsd3; @@ -54285,7 +54768,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cryptol" = callPackage + "cryptol_2_2_6" = callPackage ({ mkDerivation, alex, ansi-terminal, array, async, base , base-compat, containers, deepseq, directory, filepath, gitrev , GraphSCC, happy, haskeline, heredoc, monadLib, old-time @@ -54312,6 +54795,40 @@ self: { homepage = "http://www.cryptol.net/"; description = "Cryptol: The Language of Cryptography"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cryptol" = callPackage + ({ mkDerivation, alex, ansi-terminal, array, async, base + , base-compat, bytestring, containers, deepseq, deepseq-generics + , directory, filepath, generic-trie, gitrev, GraphSCC, happy + , haskeline, heredoc, monad-control, monadLib, old-time, presburger + , pretty, process, QuickCheck, random, sbv, simple-smt, smtLib, syb + , template-haskell, text, tf-random, transformers + , transformers-base, utf8-string + }: + mkDerivation { + pname = "cryptol"; + version = "2.3.0"; + sha256 = "403577bb14a3ebb5683b2221d9b424ff53b8e8faddb64b27f47a6b00414138ce"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base base-compat bytestring containers deepseq + deepseq-generics directory filepath generic-trie gitrev GraphSCC + heredoc monad-control monadLib old-time presburger pretty process + QuickCheck random sbv simple-smt smtLib syb template-haskell text + tf-random transformers transformers-base utf8-string + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + ansi-terminal base base-compat containers deepseq directory + filepath haskeline monad-control monadLib process random sbv + tf-random transformers + ]; + homepage = "http://www.cryptol.net/"; + description = "Cryptol: The Language of Cryptography"; + license = stdenv.lib.licenses.bsd3; }) {}; "cryptonite_0_6" = callPackage @@ -55733,7 +56250,7 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "data-accessor" = callPackage + "data-accessor_0_2_2_6" = callPackage ({ mkDerivation, array, base, containers, transformers }: mkDerivation { pname = "data-accessor"; @@ -55743,6 +56260,19 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Record_access"; description = "Utilities for accessing and manipulating fields of records"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "data-accessor" = callPackage + ({ mkDerivation, array, base, containers, transformers }: + mkDerivation { + pname = "data-accessor"; + version = "0.2.2.7"; + sha256 = "3465227ad5f81059a885d354e2f3c108d550287580e6939e18350fa65e78c2ed"; + libraryHaskellDepends = [ array base containers transformers ]; + homepage = "http://www.haskell.org/haskellwiki/Record_access"; + description = "Utilities for accessing and manipulating fields of records"; + license = stdenv.lib.licenses.bsd3; }) {}; "data-accessor-monadLib" = callPackage @@ -55818,8 +56348,8 @@ self: { ({ mkDerivation, base, data-accessor, transformers }: mkDerivation { pname = "data-accessor-transformers"; - version = "0.2.1.6"; - sha256 = "ca81138e44d1a7729fa20b6505b4ae08387b88cd5204d995c8d62303c3855cc5"; + version = "0.2.1.7"; + sha256 = "20c8823dc16c7ca6f55c64eb5564c9aae4b5565406987a046ded2ea73618e07a"; libraryHaskellDepends = [ base data-accessor transformers ]; homepage = "http://www.haskell.org/haskellwiki/Record_access"; description = "Use Accessor to access state in transformers State monad"; @@ -56135,6 +56665,7 @@ self: { base bytestring cereal containers directory executable-path hashable utf8-string ]; + jailbreak = true; homepage = "https://github.com/valderman/data-embed"; description = "Embed files and other binary blobs inside executables without Template Haskell"; license = stdenv.lib.licenses.mit; @@ -56995,7 +57526,6 @@ self: { aeson auto-update base buffer-builder bytestring lens lifted-base monad-control network old-locale text time transformers-base ]; - jailbreak = true; homepage = "https://github.com/iand675/datadog"; description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming."; license = stdenv.lib.licenses.mit; @@ -57344,6 +57874,7 @@ self: { filepath libxml-sax network parsec process QuickCheck random text transformers unix vector xml-types ]; + jailbreak = true; doCheck = false; homepage = "https://john-millikin.com/software/haskell-dbus/"; description = "A client library for the D-Bus IPC system"; @@ -57900,8 +58431,8 @@ self: { }: mkDerivation { pname = "debian-build"; - version = "0.9.0.0"; - sha256 = "7199e8a97005bce57cf9e3f157f3923d08891981006353eaf5af226b0a56f601"; + version = "0.9.1.0"; + sha256 = "0087c11290576edd02dddcafb9a85dd95743025758c9e078f5e24abafc2fc9cd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58902,6 +59433,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "derive-monoid" = callPackage + ({ mkDerivation, base, semigroups, template-haskell }: + mkDerivation { + pname = "derive-monoid"; + version = "0.0.0"; + sha256 = "d0da3cac1639996e2095ae3058ec32704ec85e2e95d61415d8896090f58255d3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base semigroups template-haskell ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base semigroups ]; + homepage = "https://github.com/sboosali/derive-monoid#readme"; + description = "derive Semigroup/Monoid/IsList"; + license = stdenv.lib.licenses.mit; + }) {}; + "derive-topdown" = callPackage ({ mkDerivation, base, derive, mtl, template-haskell , template-haskell-util @@ -59380,7 +59927,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-builder" = callPackage + "diagrams-builder_0_7_2_1" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript , diagrams-rasterific, diagrams-svg, directory, exceptions @@ -59403,12 +59950,14 @@ self: { diagrams-postscript diagrams-rasterific diagrams-svg directory filepath JuicyPixels lens lucid-svg ]; + jailbreak = true; 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_0_7_2_2" = callPackage + "diagrams-builder" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript , diagrams-rasterific, diagrams-svg, directory, exceptions @@ -59434,7 +59983,6 @@ 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-cairo_1_2_0_4" = callPackage @@ -62112,6 +62660,8 @@ self: { pname = "discrimination"; version = "0.2.1"; sha256 = "b431a43f635af98df8677a44c0e76726b95d12ea338e47db248aa3bbc3be2ccf"; + revision = "1"; + editedCabalFile = "6adf13db8d07059ac4f484c51fc13a7a3ab00e0a2a9c02899a44fedd24b550f3"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-prim hashable primitive profunctors promises semigroups transformers @@ -63052,7 +63602,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "distributive" = callPackage + "distributive_0_4_4" = callPackage ({ mkDerivation, base, directory, doctest, filepath, ghc-prim , tagged, transformers, transformers-compat }: @@ -63067,9 +63617,10 @@ self: { homepage = "http://github.com/ekmett/distributive/"; description = "Distributive functors -- Dual to Traversable"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "distributive_0_5_0_2" = callPackage + "distributive" = callPackage ({ mkDerivation, base, base-orphans, directory, doctest, filepath , tagged, transformers, transformers-compat }: @@ -63081,11 +63632,9 @@ self: { base base-orphans tagged transformers transformers-compat ]; testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; homepage = "http://github.com/ekmett/distributive/"; description = "Distributive functors -- Dual to Traversable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diversity_0_7_1_1" = callPackage @@ -63165,13 +63714,14 @@ self: { aeson aeson-pretty attoparsec base bytestring lens patches-vector servant servant-blaze servant-docs shakespeare text time vector ]; + jailbreak = true; homepage = "https://github.com/liamoc/dixi"; description = "A wiki implemented with a firm theoretical foundation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "dixi" = callPackage + "dixi_0_6_0_3" = callPackage ({ mkDerivation, acid-state, aeson, aeson-pretty, attoparsec, base , blaze-html, blaze-markup, bytestring, composition-tree , containers, data-default, directory, either, filepath, heredoc @@ -63204,6 +63754,61 @@ self: { homepage = "https://github.com/liamoc/dixi"; description = "A wiki implemented with a firm theoretical foundation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "dixi" = callPackage + ({ mkDerivation, acid-state, aeson, aeson-pretty, attoparsec, base + , base-orphans, blaze-html, blaze-markup, bytestring + , composition-tree, containers, data-default, directory, either + , filepath, heredoc, lens, network-uri, pandoc, pandoc-types + , patches-vector, safecopy, servant, servant-blaze, servant-docs + , servant-server, shakespeare, template-haskell, text, time + , time-locale-compat, timezone-olson, timezone-series, transformers + , vector, warp, yaml + }: + mkDerivation { + pname = "dixi"; + version = "0.6.0.4"; + sha256 = "d4e99071e0c2f5b7922dad5a85c02abbbeed27f71e72d091f8a3a00ae8f97418"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + acid-state aeson base base-orphans blaze-html blaze-markup + bytestring composition-tree containers data-default either heredoc + lens network-uri pandoc pandoc-types patches-vector safecopy + servant servant-blaze servant-server shakespeare template-haskell + text time time-locale-compat timezone-olson timezone-series + transformers vector + ]; + executableHaskellDepends = [ + acid-state base base-orphans directory filepath servant-server text + warp yaml + ]; + testHaskellDepends = [ + aeson aeson-pretty attoparsec base base-orphans bytestring lens + patches-vector servant servant-blaze servant-docs shakespeare text + time vector + ]; + homepage = "https://github.com/liamoc/dixi"; + description = "A wiki implemented with a firm theoretical foundation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "djembe" = callPackage + ({ mkDerivation, base, hmidi, hspec, lens, mtl, QuickCheck, random + }: + mkDerivation { + pname = "djembe"; + version = "0.1.1.2"; + sha256 = "522a89f1f9c29dfaf17b4dd0a0dcb7e88eba511948e8fd94ea618a4757eb7a28"; + libraryHaskellDepends = [ + base hmidi hspec lens mtl QuickCheck random + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/reedrosenbluth/Djembe"; + description = "Hit drums with haskell"; + license = stdenv.lib.licenses.mit; }) {}; "djinn" = callPackage @@ -65766,7 +66371,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "effect-handlers" = callPackage + "effect-handlers_0_1_0_6" = callPackage ({ mkDerivation, base, free, hspec, hspec-discover, HUnit , kan-extensions, mtl, QuickCheck }: @@ -65781,9 +66386,10 @@ self: { homepage = "https://github.com/edofic/effect-handlers"; description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "effect-handlers_0_1_0_7" = callPackage + "effect-handlers" = callPackage ({ mkDerivation, base, free, hspec, hspec-discover, HUnit , kan-extensions, mtl, QuickCheck }: @@ -65798,7 +66404,6 @@ self: { homepage = "https://github.com/edofic/effect-handlers"; description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "effect-monad" = callPackage @@ -66460,6 +67065,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elm-bridge_0_2_1_0" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, QuickCheck + , template-haskell, text + }: + mkDerivation { + pname = "elm-bridge"; + version = "0.2.1.0"; + sha256 = "13cffa6de3be713b7003f2c525164bf749c1e9e3127b177b27818164bbeb22c1"; + libraryHaskellDepends = [ aeson base template-haskell ]; + testHaskellDepends = [ + aeson base containers hspec QuickCheck text + ]; + homepage = "http://github.com/agrafix/elm-bridge"; + description = "Derive Elm types from Haskell types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elm-build-lib" = callPackage ({ mkDerivation, base, bytestring, containers, elm-compiler , elm-core-sources, file-embed, template-haskell @@ -66969,7 +67592,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "email-validate" = callPackage + "email-validate_2_1_3" = callPackage ({ mkDerivation, attoparsec, base, bytestring, ghc-prim, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -66986,9 +67609,10 @@ self: { homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; description = "Validating an email address string against RFC 5322"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "email-validate_2_2_0" = callPackage + "email-validate" = callPackage ({ mkDerivation, attoparsec, base, bytestring, ghc-prim, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -67005,7 +67629,6 @@ self: { homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; description = "Validating an email address string against RFC 5322"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "email-validator" = callPackage @@ -67198,7 +67821,6 @@ self: { free monad-loops mwc-random stm stm-delay text transformers unordered-containers vector websockets ]; - jailbreak = true; homepage = "http://github.com/ocharles/engine.io"; description = "A Haskell implementation of Engine.IO"; license = stdenv.lib.licenses.bsd3; @@ -67293,6 +67915,7 @@ self: { base bytestring conduit conduit-extra engine-io http-types text unordered-containers wai wai-websockets websockets yesod-core ]; + jailbreak = true; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -68130,21 +68753,6 @@ self: { }) {}; "errors" = callPackage - ({ mkDerivation, base, safe, transformers, transformers-compat - , unexceptionalio - }: - mkDerivation { - pname = "errors"; - version = "2.1.0"; - sha256 = "8689fa17307692eed702a87460506e407f746f2ac1fa2183953cc6204bda0658"; - libraryHaskellDepends = [ - base safe transformers transformers-compat unexceptionalio - ]; - description = "Simplified error-handling"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "errors_2_1_1" = callPackage ({ mkDerivation, base, safe, transformers, transformers-compat , unexceptionalio }: @@ -68157,7 +68765,6 @@ self: { ]; description = "Simplified error-handling"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ersatz_0_2_6_1" = callPackage @@ -69120,7 +69727,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "exception-transformers" = callPackage + "exception-transformers_0_4_0_2" = callPackage ({ mkDerivation, base, HUnit, stm, test-framework , test-framework-hunit, transformers, transformers-compat }: @@ -69137,6 +69744,26 @@ self: { ]; description = "Type classes and monads for unchecked extensible exceptions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "exception-transformers" = callPackage + ({ mkDerivation, base, HUnit, stm, test-framework + , test-framework-hunit, transformers, transformers-compat + }: + mkDerivation { + pname = "exception-transformers"; + version = "0.4.0.3"; + sha256 = "0e8bd44231d6b5478f93cffa9c1f3e59ff44130c610fc20fcfa3880eb58d2a88"; + libraryHaskellDepends = [ + base stm transformers transformers-compat + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit transformers + transformers-compat + ]; + description = "Type classes and monads for unchecked extensible exceptions"; + license = stdenv.lib.licenses.bsd3; }) {}; "exceptional" = callPackage @@ -69197,29 +69824,6 @@ self: { }) {}; "exceptions" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell - , test-framework, test-framework-quickcheck2, transformers - , transformers-compat - }: - mkDerivation { - pname = "exceptions"; - version = "0.8.1"; - sha256 = "8e2835cf2d6714d3f687e892872519e8ef8e3c51f4048386474ced94dd1bdbb0"; - libraryHaskellDepends = [ - base mtl stm template-haskell transformers transformers-compat - ]; - testHaskellDepends = [ - base mtl QuickCheck stm template-haskell test-framework - test-framework-quickcheck2 transformers transformers-compat - ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/ekmett/exceptions/"; - description = "Extensible optionally-pure exceptions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "exceptions_0_8_2_1" = callPackage ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell , test-framework, test-framework-quickcheck2, transformers , transformers-compat @@ -69235,10 +69839,10 @@ self: { base mtl QuickCheck stm template-haskell test-framework test-framework-quickcheck2 transformers transformers-compat ]; + doCheck = false; homepage = "http://github.com/ekmett/exceptions/"; description = "Extensible optionally-pure exceptions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "executable-hash_0_2_0_0" = callPackage @@ -69465,8 +70069,8 @@ self: { ({ mkDerivation, base, compensated, log-domain }: mkDerivation { pname = "exp-extended"; - version = "0.1.1"; - sha256 = "275f074e88748acd68c0b1aadd8ca56a3cc021c5da5fcdbb68300f18cc532f33"; + version = "0.1.1.1"; + sha256 = "fe4c8955f0fdff62525d7457b7be08147d063838cbb0f39bc2600256e24008a7"; libraryHaskellDepends = [ base compensated log-domain ]; homepage = "http://code.mathr.co.uk/exp-extended"; description = "floating point with extended exponent range"; @@ -70138,6 +70742,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fail" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "fail"; + version = "4.9.0.0"; + sha256 = "6d5cdb1a5c539425a9665f740e364722e1d9d6ae37fbc55f30fe3dbbbb91d4a2"; + libraryHaskellDepends = [ base ]; + homepage = "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail"; + description = "Forward-compatible MonadFail class"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "failable-list" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -70746,6 +71362,7 @@ self: { 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; @@ -71318,6 +71935,7 @@ self: { version = "0.3.5"; sha256 = "1086428a9e4463f26882438405f4df84a5d7a9d15ef7af901ec7aebc48e5bd45"; libraryHaskellDepends = [ base cereal fb persistent text time ]; + jailbreak = true; homepage = "https://github.com/prowdsponsor/fb-persistent"; description = "Provides Persistent instances to Facebook types"; license = stdenv.lib.licenses.bsd3; @@ -71437,7 +72055,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fclabels" = callPackage + "fclabels_2_0_2_3" = callPackage ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers }: mkDerivation { @@ -71451,6 +72069,23 @@ self: { homepage = "https://github.com/sebastiaanvisser/fclabels"; description = "First class accessor labels implemented as lenses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "fclabels" = callPackage + ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers + }: + mkDerivation { + pname = "fclabels"; + version = "2.0.2.4"; + sha256 = "f030940b23701aa2580a8c3f8af3c8a7c0a5ed83b30e07607ce9ef75eb4f60b7"; + libraryHaskellDepends = [ base mtl template-haskell transformers ]; + testHaskellDepends = [ + base HUnit mtl template-haskell transformers + ]; + homepage = "https://github.com/sebastiaanvisser/fclabels"; + description = "First class accessor labels implemented as lenses"; + license = stdenv.lib.licenses.bsd3; }) {}; "fclabels-monadlib" = callPackage @@ -72387,7 +73022,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "file-embed" = callPackage + "file-embed_0_0_9" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HUnit , template-haskell }: @@ -72402,6 +73037,24 @@ self: { homepage = "https://github.com/snoyberg/file-embed"; description = "Use Template Haskell to embed file contents directly"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "file-embed" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , template-haskell + }: + mkDerivation { + pname = "file-embed"; + version = "0.0.9.1"; + sha256 = "fdbde52cdf03067661944d072d95578ade8a27d709669f4ed40314fc729e460f"; + libraryHaskellDepends = [ + base bytestring directory filepath template-haskell + ]; + testHaskellDepends = [ base filepath ]; + homepage = "https://github.com/snoyberg/file-embed"; + description = "Use Template Haskell to embed file contents directly"; + license = stdenv.lib.licenses.bsd3; }) {}; "file-location_0_4_5_3" = callPackage @@ -73376,14 +74029,13 @@ self: { }: mkDerivation { pname = "flaccuraterip"; - version = "0.3.4"; - sha256 = "108d589f27754da0f2716787c99bdcec03e6cf85326e2030805844d48275a46f"; + version = "0.3.5"; + sha256 = "fa572869a54dfcea3aac395c9f1e116f9fb69cf04134411d5e8b4a88ea8ff229"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base binary deepseq HTTP optparse-applicative process ]; - jailbreak = true; homepage = "http://noaxiom.org/flAccurateRip"; description = "Verify FLAC files ripped form CD using AccurateRip™"; license = stdenv.lib.licenses.gpl3; @@ -73722,7 +74374,6 @@ self: { lens lens-action mtl network pipes pipes-aeson pipes-http pipes-parse template-haskell text unordered-containers uuid ]; - jailbreak = true; homepage = "https://github.com/brewtown/hs-flowdock"; description = "Flowdock client library for Haskell"; license = stdenv.lib.licenses.mit; @@ -73984,7 +74635,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fn" = callPackage + "fn_0_2_0_1" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory , filepath, hspec, http-types, text, unordered-containers, wai , wai-extra @@ -74004,6 +74655,47 @@ self: { homepage = "http://github.com/dbp/fn#readme"; description = "A functional web framework"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "fn" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, directory + , filepath, hspec, http-types, text, unordered-containers, wai + , wai-extra + }: + mkDerivation { + pname = "fn"; + version = "0.2.0.2"; + sha256 = "e305abe5735e0bb58a932766ca910371c8352821683c9b574db8de918c8bd612"; + libraryHaskellDepends = [ + base blaze-builder bytestring directory filepath http-types text + unordered-containers wai wai-extra + ]; + testHaskellDepends = [ + base directory filepath hspec http-types text unordered-containers + wai wai-extra + ]; + homepage = "http://github.com/dbp/fn#readme"; + description = "A functional web framework"; + license = stdenv.lib.licenses.isc; + }) {}; + + "fn-extra_0_2_0_0" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, either, fn, heist + , http-types, lens, mtl, text, wai, wai-util, xmlhtml + }: + mkDerivation { + pname = "fn-extra"; + version = "0.2.0.0"; + sha256 = "4463c870b596532599fdfcd0dca53420119bf92d422f4344b5859b0108456538"; + libraryHaskellDepends = [ + base blaze-builder bytestring either fn heist http-types lens mtl + text wai wai-util xmlhtml + ]; + homepage = "http://github.com/dbp/fn#readme"; + description = "Extras for Fn, a functional web framework"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fn-extra" = callPackage @@ -74012,8 +74704,8 @@ self: { }: mkDerivation { pname = "fn-extra"; - version = "0.2.0.0"; - sha256 = "4463c870b596532599fdfcd0dca53420119bf92d422f4344b5859b0108456538"; + version = "0.2.0.1"; + sha256 = "4820af377ee54757dbf027f17c91a83afe122cc65b8d8a63a0d3b5762268da44"; libraryHaskellDepends = [ base blaze-builder bytestring either fn heist http-types lens mtl text wai wai-util xmlhtml @@ -74097,6 +74789,8 @@ self: { pname = "foldl"; version = "1.0.7"; sha256 = "4991d3a39f10459e47b4c094327e93d437e299cd6225ff57b4d8d1ece28a1d57"; + revision = "1"; + editedCabalFile = "00f694d3c7be565194e9404f4ff8014a2b005866ed70311c869377b2668cceec"; libraryHaskellDepends = [ base bytestring containers primitive text transformers vector ]; @@ -74188,12 +74882,13 @@ self: { base bytestring containers mwc-random primitive profunctors text transformers vector ]; + jailbreak = true; description = "Composable, streaming, and efficient left folds"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "foldl" = callPackage + "foldl_1_1_2" = callPackage ({ mkDerivation, base, bytestring, comonad, containers, mwc-random , primitive, profunctors, text, transformers, vector }: @@ -74205,8 +74900,10 @@ self: { base bytestring comonad containers mwc-random primitive profunctors text transformers vector ]; + jailbreak = true; description = "Composable, streaming, and efficient left folds"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foldl_1_1_3" = callPackage @@ -74226,6 +74923,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "foldl" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers, mwc-random + , primitive, profunctors, text, transformers, vector + }: + mkDerivation { + pname = "foldl"; + version = "1.1.4"; + sha256 = "6d6473970896924a7de1c4dd5777b9b094c28ac1a33f6c8b774c0bb82d936943"; + libraryHaskellDepends = [ + base bytestring comonad containers mwc-random primitive profunctors + text transformers vector + ]; + description = "Composable, streaming, and efficient left folds"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "foldl_1_1_5" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers, mwc-random + , primitive, profunctors, text, transformers, vector + }: + mkDerivation { + pname = "foldl"; + version = "1.1.5"; + sha256 = "2053b44ba2a82c247df195f8fdfa159741ffae21c70131bee2e11143577b115a"; + libraryHaskellDepends = [ + base bytestring comonad containers mwc-random primitive profunctors + text transformers vector + ]; + description = "Composable, streaming, and efficient left folds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foldl-incremental" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, foldl , histogram-fill, mwc-random, pipes, QuickCheck, tasty @@ -75342,26 +76072,6 @@ self: { }) {}; "free" = callPackage - ({ mkDerivation, base, bifunctors, comonad, containers - , distributive, exceptions, mtl, prelude-extras, profunctors - , semigroupoids, semigroups, template-haskell, transformers - , transformers-compat - }: - mkDerivation { - pname = "free"; - version = "4.12.2"; - sha256 = "9b65172e90ff03d4daf1d533ed5e967d8a24286ac5facc1edd05e203fe88461b"; - libraryHaskellDepends = [ - base bifunctors comonad containers distributive exceptions mtl - prelude-extras profunctors semigroupoids semigroups - template-haskell transformers transformers-compat - ]; - homepage = "http://github.com/ekmett/free/"; - description = "Monads for free"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "free_4_12_4" = callPackage ({ mkDerivation, base, bifunctors, comonad, containers , distributive, exceptions, mtl, prelude-extras, profunctors , semigroupoids, semigroups, template-haskell, transformers @@ -75379,7 +76089,6 @@ self: { homepage = "http://github.com/ekmett/free/"; description = "Monads for free"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-concurrent" = callPackage @@ -75406,6 +76115,7 @@ self: { algebraic-classes base comonad constraints template-haskell transformers void ]; + jailbreak = true; homepage = "https://github.com/sjoerdvisscher/free-functors"; description = "Free functors, adjoint to functors that forget class constraints"; license = stdenv.lib.licenses.bsd3; @@ -76043,17 +76753,18 @@ self: { }) {}; "fswatcher" = callPackage - ({ mkDerivation, base, directory, fsnotify, process - , system-filepath, unix + ({ mkDerivation, base, directory, fsnotify, optparse-applicative + , process, regex-pcre-builtin, system-filepath, unix }: mkDerivation { pname = "fswatcher"; - version = "0.1.3"; - sha256 = "e0b7aea8d9b6adfe1045b7484b84faa1487638e7d3c16a598d9aa82083230351"; + version = "0.2.0"; + sha256 = "dcaa449b48c5c767adeb5bce6fd250982dcc65049dfca9dc79bfc059b14d73bc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory fsnotify process system-filepath unix + base directory fsnotify optparse-applicative process + regex-pcre-builtin system-filepath unix ]; homepage = "http://www.github.com/ehamberg/fswatcher/"; description = "Watch a file/directory and run a command when it's modified"; @@ -77370,6 +78081,8 @@ self: { pname = "generic-deriving"; version = "1.9.0"; sha256 = "f1805c59ae4586ae29736c05d0ee033bf99ec1a6062a375bf3e1ca9651a5bfd7"; + revision = "1"; + editedCabalFile = "ffc03b6a6adb54c6433a7af5956e420d65c151a820047189cf3150b387e769ef"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -77566,6 +78279,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generics-eot" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, hspec + , interpolate, mockery, QuickCheck, shake + }: + mkDerivation { + pname = "generics-eot"; + version = "0.1"; + sha256 = "f293d60d5c2a4aa3065f23e022fd74cf27d8f255e6e9cd44d75d7a44f3f2ab1a"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath hspec interpolate mockery + QuickCheck shake + ]; + homepage = "https://github.com/soenkehahn/generics-eot#readme"; + description = "A library for generic programming that aims to be easy to understand"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "generics-eot_0_2" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, hspec + , interpolate, mockery, QuickCheck, shake + }: + mkDerivation { + pname = "generics-eot"; + version = "0.2"; + sha256 = "732db9692db812b178a7d0bf4b89321c4630722bfe719966023cc9d7fc00820f"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath hspec interpolate mockery + QuickCheck shake + ]; + homepage = "https://github.com/soenkehahn/generics-eot#readme"; + description = "A library for generic programming that aims to be easy to understand"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generics-sop_0_1_0_3" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { @@ -78382,8 +79132,8 @@ self: { }: mkDerivation { pname = "ghc-imported-from"; - version = "0.2.0.7"; - sha256 = "3b035e4e4792e2920c2af48e2b3e1bb5e643ae29e7b15ca92539b84699f2484e"; + version = "0.2.1.0"; + sha256 = "2c0af9dbfd887e0f32abd2ffa99acf5ce1344da18402e337eb4a39b59488982c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78401,7 +79151,6 @@ self: { ghc-syb-utils hspec mtl optparse-applicative parsec process safe syb transformers ]; - jailbreak = true; homepage = "https://github.com/carlohamalainen/ghc-imported-from"; description = "Find the Haddock documentation for a symbol"; license = stdenv.lib.licenses.bsd3; @@ -78513,7 +79262,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-mod" = callPackage + "ghc-mod_5_4_0_0" = callPackage ({ mkDerivation, async, base, bytestring, cabal-helper, cereal , containers, deepseq, directory, djinn-ghc, doctest, extra , fclabels, filepath, ghc, ghc-paths, ghc-syb-utils @@ -78541,6 +79290,40 @@ self: { process split time ]; testHaskellDepends = [ base doctest hspec ]; + jailbreak = true; + doCheck = false; + homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; + description = "Happy Haskell Programming"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ghc-mod" = callPackage + ({ mkDerivation, base, binary, bytestring, cabal-helper, containers + , deepseq, directory, djinn-ghc, doctest, extra, fclabels, filepath + , ghc, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint, hspec + , monad-control, monad-journal, mtl, old-time, optparse-applicative + , pipes, pretty, process, safe, split, syb, temporary, text, time + , transformers, transformers-base + }: + mkDerivation { + pname = "ghc-mod"; + version = "5.5.0.0"; + sha256 = "d05be8f3541e875cd4ebefb28968cfc095fc323e49328f2e40581f6f5de70d31"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring cabal-helper containers deepseq directory + djinn-ghc extra fclabels filepath ghc ghc-paths ghc-syb-utils + haskell-src-exts hlint monad-control monad-journal mtl old-time + pipes pretty process safe split syb temporary text time + transformers transformers-base + ]; + executableHaskellDepends = [ + base binary deepseq directory fclabels filepath ghc monad-control + mtl old-time optparse-applicative pretty process split time + ]; + testHaskellDepends = [ base doctest hspec ]; doCheck = false; homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; description = "Happy Haskell Programming"; @@ -78809,7 +79592,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-tcplugins-extra" = callPackage + "ghc-tcplugins-extra_0_1" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; @@ -78819,6 +79602,19 @@ self: { homepage = "http://www.clash-lang.org/"; description = "Utilities for writing GHC type-checker plugins"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ghc-tcplugins-extra" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "ghc-tcplugins-extra"; + version = "0.2"; + sha256 = "f3542b6734b20e3e25f851589944d1d185533c0f0a5428eee86f422ad3687374"; + libraryHaskellDepends = [ base ghc ]; + homepage = "http://github.com/clash-lang/ghc-tcplugins-extra"; + description = "Utilities for writing GHC type-checker plugins"; + license = stdenv.lib.licenses.bsd2; }) {}; "ghc-time-alloc-prof" = callPackage @@ -78836,7 +79632,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-typelits-extra" = callPackage + "ghc-typelits-extra_0_1" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-natnormalise, tasty, tasty-hunit }: @@ -78851,6 +79647,24 @@ self: { homepage = "http://www.clash-lang.org/"; description = "Additional type-level operations on GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ghc-typelits-extra" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra + , ghc-typelits-natnormalise, tasty, tasty-hunit + }: + mkDerivation { + pname = "ghc-typelits-extra"; + version = "0.1.1"; + sha256 = "e9727920a2c00bb8881277af2a6c2df8a46644e292501520e3677f9853691c1e"; + libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise tasty tasty-hunit + ]; + homepage = "http://www.clash-lang.org/"; + description = "Additional type-level operations on GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; }) {}; "ghc-typelits-natnormalise_0_3" = callPackage @@ -78868,7 +79682,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-typelits-natnormalise" = callPackage + "ghc-typelits-natnormalise_0_3_1" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit }: mkDerivation { @@ -78880,6 +79694,21 @@ self: { homepage = "http://www.clash-lang.org/"; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ghc-typelits-natnormalise" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.4"; + sha256 = "8b6f0188b3bc04bef2c7083811eeb4c12a32436a95a797e38e4883067b4c3354"; + libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "http://www.clash-lang.org/"; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; }) {}; "ghc-vis" = callPackage @@ -79707,7 +80536,6 @@ self: { gitlib gitlib-libgit2 scientific shake split tagged text unordered-containers vector yaml ]; - jailbreak = true; homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; @@ -80104,6 +80932,7 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base base-compat process ]; + jailbreak = true; homepage = "https://github.com/Peaker/git-jump"; description = "Move a git branch"; license = stdenv.lib.licenses.bsd3; @@ -80216,6 +81045,7 @@ self: { testHaskellDepends = [ base containers directory filepath hspec process temporary ]; + jailbreak = true; homepage = "https://github.com/oswynb/git-vogue"; description = "A framework for pre-commit checks"; license = stdenv.lib.licenses.bsd3; @@ -80996,7 +81826,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mesa;}; - "gl" = callPackage + "gl_0_7_7" = callPackage ({ mkDerivation, base, containers, directory, filepath, fixed, half , hxt, mesa, split, transformers }: @@ -81011,16 +81841,17 @@ self: { librarySystemDepends = [ mesa ]; description = "Complete OpenGL raw bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mesa;}; - "gl_0_7_8" = callPackage + "gl" = callPackage ({ mkDerivation, base, containers, directory, filepath, fixed, half , hxt, mesa, split, transformers }: mkDerivation { pname = "gl"; - version = "0.7.8"; - sha256 = "4ee12e21d759399f56932a14d5aa7e4266c387fa834103680011a0914b9e8db6"; + version = "0.7.8.1"; + sha256 = "ed792ee75d32489857295ef9ae6a4a49900e2ed4a01cd2bac9fdd17959a6219a"; libraryHaskellDepends = [ base containers directory filepath fixed half hxt split transformers @@ -81028,7 +81859,6 @@ self: { librarySystemDepends = [ mesa ]; description = "Complete OpenGL raw bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mesa;}; "gl-capture" = callPackage @@ -83609,6 +84439,8 @@ self: { pname = "graph-core"; version = "0.2.1.0"; sha256 = "ee783ae89a04fbcebd96166de2813ec7a75c6e136b42006f4ee7d910c54da977"; + revision = "1"; + editedCabalFile = "cd8cb2bd5155841338cb527029e919c4320620e3be93ad4c86e1cd2dfecd0629"; libraryHaskellDepends = [ base containers deepseq hashable mtl QuickCheck safe unordered-containers vector @@ -83632,6 +84464,8 @@ self: { pname = "graph-core"; version = "0.2.2.0"; sha256 = "291b63c29296ae9aec1b2c2ed9ea4fc7163b4ba069a531e83b541d7e5e63f833"; + revision = "1"; + editedCabalFile = "d9314f075fecb0674ef9c6ee42d4b2224407e2da959add39eb8651cd8a97d5d3"; libraryHaskellDepends = [ base containers deepseq hashable mtl QuickCheck safe unordered-containers vector @@ -84075,7 +84909,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "graphs" = callPackage + "graphs_0_6_0_1" = callPackage ({ mkDerivation, array, base, containers, transformers, void }: mkDerivation { pname = "graphs"; @@ -84087,9 +84921,10 @@ self: { homepage = "http://github.com/ekmett/graphs"; description = "A simple monadic graph library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "graphs_0_7" = callPackage + "graphs" = callPackage ({ mkDerivation, array, base, containers, transformers , transformers-compat, void }: @@ -84103,7 +84938,6 @@ self: { homepage = "http://github.com/ekmett/graphs"; description = "A simple monadic graph library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphtype" = callPackage @@ -84210,6 +85044,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "grasp" = callPackage + ({ mkDerivation, base, clock, directory, extra, filepath, hashable + , lens, megaparsec, MonadRandom, mtl, pcre-heavy, primitive + , process, random-shuffle, safe, split, system-filepath, text + , transformers, turtle, unordered-containers, vector + }: + mkDerivation { + pname = "grasp"; + version = "0.1.0.0"; + sha256 = "54a2bae281c97f655b025bd50c0fd27f09eb7d6926ed9b57807b4e5d96ab5a2f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base clock directory extra filepath hashable lens megaparsec + MonadRandom mtl pcre-heavy primitive process random-shuffle safe + split system-filepath text transformers turtle unordered-containers + vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://bitbucket.org/janmasrovira/am3-project/overview"; + description = "GRASP implementation for the AMMM project"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gravatar_0_6" = callPackage ({ mkDerivation, base, bytestring, data-default, HTTP, pureMD5 , text @@ -84358,6 +85217,7 @@ self: { base containers QuickCheck test-framework test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/mhwombat/grid"; description = "Tools for working with regular grids (graphs, lattices)"; license = stdenv.lib.licenses.bsd3; @@ -88597,7 +89457,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "half" = callPackage + "half_0_2_2_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "half"; @@ -88607,9 +89467,10 @@ self: { homepage = "http://github.com/ekmett/half"; description = "Half-precision floating-point"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "half_0_2_2_3" = callPackage + "half" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "half"; @@ -88619,7 +89480,6 @@ self: { homepage = "http://github.com/ekmett/half"; description = "Half-precision floating-point"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "halfs" = callPackage @@ -88865,6 +89725,7 @@ self: { aeson array base binary data-default GLUT OpenGL opengl-dlp-stereo split vector-space ]; + jailbreak = true; homepage = "https://bitbucket.org/bwbush/handa-opengl"; description = "Utility functions for OpenGL and GLUT"; license = stdenv.lib.licenses.mit; @@ -89199,6 +90060,7 @@ self: { time unordered-containers userid web-routes web-routes-boomerang web-routes-happstack web-routes-hsp web-routes-th ]; + jailbreak = true; homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; @@ -89983,6 +90845,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;}; + "hardware-edsl" = callPackage + ({ mkDerivation, array, base, bytestring, constraints, containers + , language-vhdl, mtl, operational-alacarte, pretty, syntactic + }: + mkDerivation { + pname = "hardware-edsl"; + version = "0.1.0.0"; + sha256 = "13fe072ff4fbad2d16c4e80749db3cfe56a90df8499e86e615c4afda38589143"; + libraryHaskellDepends = [ + array base bytestring constraints containers language-vhdl mtl + operational-alacarte pretty syntactic + ]; + jailbreak = true; + homepage = "https://github.com/markus-git/hardware-edsl"; + description = "Deep embedding of hardware descriptions with code generation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hark" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, haskell98 , mtl, old-locale, old-time, regex-pcre @@ -90401,7 +91281,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hashable-extras" = callPackage + "hashable-extras_0_2_2" = callPackage ({ mkDerivation, base, bifunctors, bytestring, directory, doctest , filepath, hashable, transformers }: @@ -90416,9 +91296,10 @@ self: { homepage = "http://github.com/analytics/hashable-extras/"; description = "Higher-rank Hashable"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hashable-extras_0_2_3" = callPackage + "hashable-extras" = callPackage ({ mkDerivation, base, bifunctors, bytestring, directory, doctest , filepath, hashable, transformers, transformers-compat }: @@ -90434,7 +91315,6 @@ self: { homepage = "http://github.com/analytics/hashable-extras/"; description = "Higher-rank Hashable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashable-generics" = callPackage @@ -93428,6 +94308,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasql_0_15_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring + , contravariant, contravariant-extras, data-default-class, dlist + , either, hashable, hashtables, loch-th, placeholders + , postgresql-binary, postgresql-libpq, profunctors, QuickCheck + , quickcheck-instances, scientific, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, time, transformers + , uuid, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.15.1.1"; + sha256 = "79a3019362f0973daa719eb8b52d31524c7453833c19044e1c1d9a67b650ce57"; + libraryHaskellDepends = [ + aeson attoparsec base base-prelude bytestring contravariant + contravariant-extras data-default-class dlist either hashable + hashtables loch-th placeholders postgresql-binary postgresql-libpq + profunctors scientific text time transformers uuid vector + ]; + testHaskellDepends = [ + base base-prelude bytestring contravariant contravariant-extras + data-default-class dlist either hashable profunctors QuickCheck + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text time transformers uuid vector + ]; + doCheck = false; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "A very efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , contravariant, contravariant-extras, data-default-class, dlist @@ -93460,6 +94372,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_0_19_3_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring + , contravariant, contravariant-extras, data-default-class, dlist + , either, hashable, hashtables, loch-th, mtl, placeholders + , postgresql-binary, postgresql-libpq, profunctors, QuickCheck + , quickcheck-instances, scientific, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, time, transformers + , uuid, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.19.3.2"; + sha256 = "eabeb40cea7f430add6ed3b25bf3b079427b76e5f5f2a039c5709026ef253949"; + libraryHaskellDepends = [ + aeson attoparsec base base-prelude bytestring contravariant + contravariant-extras data-default-class dlist either hashable + hashtables loch-th mtl placeholders postgresql-binary + postgresql-libpq profunctors scientific text time transformers uuid + vector + ]; + testHaskellDepends = [ + base base-prelude bytestring contravariant contravariant-extras + data-default-class dlist either hashable profunctors QuickCheck + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text time transformers uuid vector + ]; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "A very efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend_0_2_1" = callPackage ({ mkDerivation, base, base-prelude, bytestring, list-t, text , vector @@ -94441,6 +95385,7 @@ self: { network network-uri old-locale old-time template-haskell time utf8-string ]; + jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; license = stdenv.lib.licenses.bsd3; @@ -94463,6 +95408,7 @@ self: { network network-uri old-locale old-time template-haskell time utf8-string ]; + jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; license = stdenv.lib.licenses.bsd3; @@ -95489,7 +96435,6 @@ self: { aeson aeson-pretty base bytestring directory filepath haskeline time ]; - jailbreak = true; homepage = "https://github.com/aka-bash0r/headergen"; description = "Creates a header for a haskell source file"; license = stdenv.lib.licenses.mit; @@ -95541,7 +96486,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "heaps" = callPackage + "heaps_0_3_2_1" = callPackage ({ mkDerivation, base, directory, doctest, filepath }: mkDerivation { pname = "heaps"; @@ -95554,9 +96499,10 @@ self: { homepage = "http://github.com/ekmett/heaps/"; description = "Asymptotically optimal Brodal/Okasaki heaps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "heaps_0_3_3" = callPackage + "heaps" = callPackage ({ mkDerivation, base, directory, doctest, filepath }: mkDerivation { pname = "heaps"; @@ -95565,10 +96511,10 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath ]; jailbreak = true; + doCheck = false; homepage = "http://github.com/ekmett/heaps/"; description = "Asymptotically optimal Brodal/Okasaki heaps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heapsort" = callPackage @@ -95937,6 +96883,7 @@ self: { libraryHaskellDepends = [ base bytestring data-default-class helics vault wai ]; + jailbreak = true; homepage = "https://github.com/philopon/helics"; description = "New Relic® agent SDK wrapper for wai"; license = stdenv.lib.licenses.mit; @@ -96332,6 +97279,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "herf-time" = callPackage + ({ mkDerivation, base, doctest, time }: + mkDerivation { + pname = "herf-time"; + version = "0.2.0"; + sha256 = "7c1c4762af5bbd493841f291855e7de5ab4b12a5260e8fd95d1f6c9e5a012d7a"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ base doctest ]; + description = "haskell time manipulation in a 'kerf like' style"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hermit" = callPackage ({ mkDerivation, alex, ansi-terminal, array, base, base-compat , containers, data-default-class, directory, ghc, happy, haskeline @@ -96953,6 +97912,7 @@ self: { version = "0.1.5"; sha256 = "b348be81f278bcbf384a59029a0135c4aef6b687f2a7168a66aeea54a494e942"; libraryHaskellDepends = [ base bytestring cereal mtl text unix ]; + jailbreak = true; homepage = "http://github.com/luite/hfsevents"; description = "File/folder watching for OS X"; license = stdenv.lib.licenses.bsd3; @@ -97522,6 +98482,7 @@ self: { base bytestring cereal hspec leveldb-haskell lifted-base monad-control mtl process resourcet transformers transformers-base ]; + jailbreak = true; homepage = "https://github.com/jeremyjh/higher-leveldb"; description = "A rich monadic API for working with leveldb databases"; license = stdenv.lib.licenses.bsd3; @@ -100797,13 +101758,14 @@ self: { aeson base bytestring containers http-conduit http-types text wai warp ]; + jailbreak = true; homepage = "https://github.com/freizl/hoauth2"; description = "hoauth2"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hoauth2" = callPackage + "hoauth2_0_5_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-conduit , http-types, text, wai, warp }: @@ -100820,19 +101782,21 @@ self: { aeson base bytestring containers http-conduit http-types text wai warp ]; + jailbreak = true; homepage = "https://github.com/freizl/hoauth2"; description = "Haskell OAuth2 authentication client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hoauth2_0_5_1" = callPackage + "hoauth2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-conduit , http-types, text, wai, warp }: mkDerivation { pname = "hoauth2"; - version = "0.5.1"; - sha256 = "266ddc04f2d0e0a2a60d89ba019da267a2a3c310a5bac6677b3105bbaf5a1cc4"; + version = "0.5.2"; + sha256 = "68a8d591d47e24f3a2bfe5b103512dee48805217af771c1de64612fc19f8084f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100842,11 +101806,9 @@ self: { aeson base bytestring containers http-conduit http-types text wai warp ]; - jailbreak = true; homepage = "https://github.com/freizl/hoauth2"; description = "Haskell OAuth2 authentication client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hob" = callPackage @@ -102814,8 +103776,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.4.3"; - sha256 = "7cacff688476d271f7ad9515d44a612f8c15e5e731e1eb9f9cb50e06cb5ae67f"; + version = "1.4.4"; + sha256 = "4e1bcfc35caaa8abcee28316f8b0bdd6fadbebe223bacfb3118dec4d980fee36"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104546,8 +105508,8 @@ self: { }: mkDerivation { pname = "hscope"; - version = "0.4.2"; - sha256 = "849d52e616abffda54d70d41f66d7e92539a1b20eef05b73877815e8c71a64b9"; + version = "0.4.3"; + sha256 = "6d632a174906977d51d06a368437cdc83fdce9888eb362135e9dc0249258532a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104557,7 +105519,6 @@ self: { testHaskellDepends = [ base directory mtl process test-simple Unixutils ]; - jailbreak = true; homepage = "https://github.com/bosu/hscope"; description = "cscope like browser for Haskell code"; license = stdenv.lib.licenses.bsd3; @@ -104700,6 +105661,7 @@ self: { testHaskellDepends = [ async base containers data-default deepseq hformat lens mtl text ]; + jailbreak = true; homepage = "https://github.com/mvoidex/hsdev"; description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc"; license = stdenv.lib.licenses.bsd3; @@ -105832,7 +106794,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hspec" = callPackage + "hspec_2_2_1" = callPackage ({ mkDerivation, base, directory, hspec-core, hspec-discover , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder , transformers @@ -105848,12 +106810,14 @@ self: { testHaskellDepends = [ base directory hspec-core hspec-meta stringbuilder ]; + jailbreak = true; homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hspec_2_2_2" = callPackage + "hspec" = callPackage ({ mkDerivation, base, directory, hspec-core, hspec-discover , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder , transformers @@ -105869,11 +106833,9 @@ self: { testHaskellDepends = [ base directory hspec-core hspec-meta stringbuilder ]; - jailbreak = true; homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-attoparsec" = callPackage @@ -106116,7 +107078,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hspec-core" = callPackage + "hspec-core_2_2_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, deepseq , hspec-expectations, hspec-meta, HUnit, process, QuickCheck , quickcheck-io, random, setenv, silently, tf-random, time @@ -106140,9 +107102,10 @@ self: { homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hspec-core_2_2_2" = callPackage + "hspec-core" = callPackage ({ mkDerivation, ansi-terminal, async, base, deepseq , hspec-expectations, hspec-meta, HUnit, process, QuickCheck , quickcheck-io, random, setenv, silently, tf-random, time @@ -106164,7 +107127,6 @@ self: { homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-discover_2_1_2" = callPackage @@ -106287,7 +107249,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hspec-discover" = callPackage + "hspec-discover_2_2_1" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; @@ -106301,9 +107263,10 @@ self: { homepage = "http://hspec.github.io/"; description = "Automatically discover and run Hspec tests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hspec-discover_2_2_2" = callPackage + "hspec-discover" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; @@ -106317,7 +107280,6 @@ self: { homepage = "http://hspec.github.io/"; description = "Automatically discover and run Hspec tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-expectations_0_6_1" = callPackage @@ -106547,7 +107509,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hspec-meta" = callPackage + "hspec-meta_2_2_0" = callPackage ({ mkDerivation, ansi-terminal, async, base, deepseq, directory , filepath, hspec-expectations, HUnit, QuickCheck, quickcheck-io , random, setenv, time, transformers @@ -106566,9 +107528,10 @@ self: { homepage = "http://hspec.github.io/"; description = "A version of Hspec which is used to test Hspec itself"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hspec-meta_2_2_1" = callPackage + "hspec-meta" = callPackage ({ mkDerivation, ansi-terminal, async, base, deepseq, directory , filepath, hspec-expectations, HUnit, QuickCheck, quickcheck-io , random, setenv, time, transformers @@ -106587,7 +107550,6 @@ self: { homepage = "http://hspec.github.io/"; description = "A version of Hspec which is used to test Hspec itself"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-monad-control" = callPackage @@ -108968,7 +109930,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-client" = callPackage + "http-client_0_4_26_2" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, exceptions, filepath @@ -108996,6 +109958,37 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "http-client" = callPackage + ({ mkDerivation, array, async, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, exceptions, filepath + , ghc-prim, hspec, http-types, mime-types, monad-control, network + , network-uri, random, streaming-commons, text, time, transformers + , zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.4.27"; + sha256 = "3700731ca44470847b9a6429c61b7501318443ded995c33c7f52c9a7fd23a88b"; + libraryHaskellDepends = [ + array base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie data-default-class deepseq + exceptions filepath ghc-prim http-types mime-types network + network-uri random streaming-commons text time transformers + ]; + testHaskellDepends = [ + async base base64-bytestring blaze-builder bytestring + case-insensitive containers deepseq directory hspec http-types + monad-control network network-uri streaming-commons text time + transformers zlib + ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; + license = stdenv.lib.licenses.mit; }) {}; "http-client-auth" = callPackage @@ -109230,6 +110223,7 @@ self: { http-client http-types HUnit lifted-base network streaming-commons text time transformers utf8-string wai wai-conduit warp warp-tls ]; + jailbreak = true; doCheck = false; homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; @@ -109259,6 +110253,7 @@ self: { http-client http-types HUnit lifted-base network streaming-commons text time transformers utf8-string wai wai-conduit warp warp-tls ]; + jailbreak = true; doCheck = false; homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; @@ -109926,7 +110921,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http2" = callPackage + "http2_1_3_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , bytestring-builder, containers, directory, doctest, filepath , Glob, hex, hspec, mwc-random, psqueues, stm, text @@ -109955,18 +110950,19 @@ self: { doCheck = false; description = "HTTP/2.0 library including frames and HPACK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http2_1_4_2" = callPackage + "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , bytestring-builder, containers, directory, doctest, filepath - , Glob, hex, hspec, mwc-random, psqueues, stm, text - , unordered-containers, vector, word8 + , Glob, hex, hspec, psqueues, stm, text, unordered-containers + , vector, word8 }: mkDerivation { pname = "http2"; - version = "1.4.2"; - sha256 = "721c4a0e70594e6750cedbaa795b44a0b1f1ea332c4ac5eb453e42464f86e2d9"; + version = "1.4.4"; + sha256 = "d6ff4d5578749082d3a319bf97a9e830e320be0b2f8701c2ef39ad896cf977c4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109980,12 +110976,11 @@ self: { ]; testHaskellDepends = [ aeson aeson-pretty array base bytestring bytestring-builder - containers directory doctest filepath Glob hex hspec mwc-random - psqueues stm text unordered-containers vector word8 + containers directory doctest filepath Glob hex hspec psqueues stm + text unordered-containers vector word8 ]; description = "HTTP/2.0 library including frames and HPACK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "httpd-shed" = callPackage @@ -110230,6 +111225,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "human-readable-duration_0_1_1_0" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "human-readable-duration"; + version = "0.1.1.0"; + sha256 = "dfd07e9a6077834c65a5f7989eb9e77e207e446acfa261cec1d4c9d0f7424fb8"; + libraryHaskellDepends = [ base time ]; + homepage = "http://github.com/yogsototh/human-readable-duration#readme"; + description = "Provide duration helper"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "human-readable-duration" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -111725,6 +112733,7 @@ self: { base directory doctest filepath generic-deriving semigroups simple-reflect ]; + jailbreak = true; homepage = "http://github.com/analytics/hyperloglog"; description = "An approximate streaming (constant space) unique object counter"; license = stdenv.lib.licenses.bsd3; @@ -112588,7 +113597,6 @@ self: { mtl pretty-show pureMD5 tagged template-haskell temporary text transformers unix ]; - jailbreak = true; description = "Shared library used be ide-backend and ide-backend-server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -112610,7 +113618,6 @@ self: { monad-logger mtl pretty-show pureMD5 tagged template-haskell temporary text transformers unix ]; - jailbreak = true; description = "Shared library used be ide-backend and ide-backend-server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -112873,27 +113880,27 @@ self: { "idris" = callPackage ({ mkDerivation, annotated-wl-pprint, ansi-terminal, ansi-wl-pprint - , base, base64-bytestring, binary, blaze-html, blaze-markup + , async, base, base64-bytestring, binary, blaze-html, blaze-markup , bytestring, cheapskate, containers, deepseq, directory, filepath - , fingertree, gmp, haskeline, hscurses, libffi, mtl, network - , optparse-applicative, parsers, pretty, process, safe, split, text - , time, transformers, transformers-compat, trifecta, uniplate, unix - , unordered-containers, utf8-string, vector + , fingertree, fsnotify, gmp, haskeline, hscurses, libffi, mtl + , network, optparse-applicative, parsers, pretty, process, safe + , split, text, time, transformers, transformers-compat, trifecta + , uniplate, unix, unordered-containers, utf8-string, vector , vector-binary-instances, zip-archive }: mkDerivation { pname = "idris"; - version = "0.9.20.2"; - sha256 = "499339fc6a443dd2902ae76114eba6a61ebbd5955dcf3d3687199df5829a0f47"; + version = "0.10"; + sha256 = "5593feca2cdd00ff819f37135da496111b3af06b664f4cd1f4aecba6ac6e6a10"; configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - annotated-wl-pprint ansi-terminal ansi-wl-pprint base + annotated-wl-pprint ansi-terminal ansi-wl-pprint async base base64-bytestring binary blaze-html blaze-markup bytestring cheapskate containers deepseq directory filepath fingertree - haskeline hscurses libffi mtl network optparse-applicative parsers - pretty process safe split text time transformers + fsnotify haskeline hscurses libffi mtl network optparse-applicative + parsers pretty process safe split text time transformers transformers-compat trifecta uniplate unix unordered-containers utf8-string vector vector-binary-instances zip-archive ]; @@ -112901,7 +113908,6 @@ self: { executableHaskellDepends = [ base directory filepath haskeline transformers ]; - jailbreak = true; homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; @@ -113872,11 +114878,10 @@ self: { ({ mkDerivation, base, directory, filepath, mtl }: mkDerivation { pname = "imports"; - version = "0.1.2.1"; - sha256 = "ffe56b95d29919f3a8c885f8f0e4db180fc5e711e8c78f278c0cf17ac06ba4c2"; + version = "0.2.0.0"; + sha256 = "8a423866bce4862f65926a67519f23c3262ea2f85f01104a5a2e03ee63f2dc61"; libraryHaskellDepends = [ base directory filepath mtl ]; testHaskellDepends = [ base directory filepath mtl ]; - jailbreak = true; homepage = "https://github.com/CindyLinz/Haskell-imports"; description = "Generate code for importing directories automatically"; license = stdenv.lib.licenses.mit; @@ -114737,7 +115742,6 @@ self: { testHaskellDepends = [ aeson base instant-generics tasty tasty-quickcheck ]; - jailbreak = true; homepage = "https://github.com/k0001/instant-aeson"; description = "Generic Aeson instances through instant-generics"; license = stdenv.lib.licenses.bsd3; @@ -115158,7 +116162,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "intervals" = callPackage + "intervals_0_7_1" = callPackage ({ mkDerivation, array, base, directory, distributive, doctest , filepath, ghc-prim }: @@ -115171,9 +116175,10 @@ self: { homepage = "http://github.com/ekmett/intervals"; description = "Interval Arithmetic"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "intervals_0_7_2" = callPackage + "intervals" = callPackage ({ mkDerivation, array, base, directory, distributive, doctest , filepath, ghc-prim, QuickCheck, template-haskell }: @@ -115188,7 +116193,6 @@ self: { homepage = "http://github.com/ekmett/intervals"; description = "Interval Arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intricacy" = callPackage @@ -115255,7 +116259,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "invariant" = callPackage + "invariant_0_2_2" = callPackage ({ mkDerivation, array, base, bifunctors, containers, contravariant , ghc-prim, hspec, profunctors, QuickCheck, semigroups, stm, tagged , template-haskell, transformers, transformers-compat @@ -115276,6 +116280,28 @@ self: { homepage = "https://github.com/nfrisby/invariant-functors"; description = "Haskell 98 invariant functors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "invariant" = callPackage + ({ mkDerivation, array, base, bifunctors, containers, contravariant + , ghc-prim, hspec, profunctors, QuickCheck, semigroups, StateVar + , stm, tagged, template-haskell, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "invariant"; + version = "0.3"; + sha256 = "c45b9a150b3b48b22ec41964481bbe85567b3eab0ae15b784dd75b9a666a7a00"; + libraryHaskellDepends = [ + array base bifunctors containers contravariant ghc-prim profunctors + semigroups StateVar stm tagged template-haskell transformers + transformers-compat unordered-containers + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/nfrisby/invariant-functors"; + description = "Haskell 98 invariant functors"; + license = stdenv.lib.licenses.bsd3; }) {}; "invertible-syntax" = callPackage @@ -115861,7 +116887,6 @@ self: { executableHaskellDepends = [ base filepath mtl parsec text transformers ]; - jailbreak = true; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; @@ -115921,7 +116946,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "irc-client" = callPackage + "irc-client_0_2_5_0" = callPackage ({ mkDerivation, base, bytestring, conduit, data-default-class , irc-conduit, irc-ctcp, old-locale, stm, stm-conduit, text, time , transformers @@ -115937,6 +116962,25 @@ self: { homepage = "https://github.com/barrucadu/irc-client"; description = "An IRC client library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "irc-client" = callPackage + ({ mkDerivation, base, bytestring, conduit, data-default-class + , irc-conduit, irc-ctcp, old-locale, stm, stm-conduit, text, time + , transformers + }: + mkDerivation { + pname = "irc-client"; + version = "0.2.6.0"; + sha256 = "8d14293adb106f1755358bd7c2e9f1193537ef87333e0492d54fa8b8611b795d"; + libraryHaskellDepends = [ + base bytestring conduit data-default-class irc-conduit irc-ctcp + old-locale stm stm-conduit text time transformers + ]; + homepage = "https://github.com/barrucadu/irc-client"; + description = "An IRC client library"; + license = stdenv.lib.licenses.mit; }) {}; "irc-colors" = callPackage @@ -117544,6 +118588,7 @@ self: { aeson aeson-qq base bytestring cryptonite doctest either hspec HUnit memory mtl QuickCheck text unordered-containers vector ]; + doCheck = false; homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; @@ -118760,8 +119805,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.1.4"; - sha256 = "3eb93af7edc985d4fa7be6a88638e4987c795828a83469436f04d312cba4ea1d"; + version = "0.1.6"; + sha256 = "1bde5dd2fadd0b598c11657199ee90bfe8f822807a394857ef902d2d8fec366a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120037,7 +121082,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "keys" = callPackage + "keys_3_10_2" = callPackage ({ mkDerivation, array, base, comonad, containers, free, hashable , semigroupoids, semigroups, transformers, unordered-containers }: @@ -120052,9 +121097,10 @@ self: { homepage = "http://github.com/ekmett/keys/"; description = "Keyed functors and containers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "keys_3_11" = callPackage + "keys" = callPackage ({ mkDerivation, array, base, comonad, containers, free, hashable , semigroupoids, semigroups, transformers, transformers-compat , unordered-containers @@ -120063,6 +121109,8 @@ self: { pname = "keys"; version = "3.11"; sha256 = "0cf397b7e6eb8cda930a02118c0bf262f9ef80c5a2f91822238b7778042cc4b2"; + revision = "1"; + editedCabalFile = "b1a0c0d734a3dba396f4df1418e521da6f2287a56ed344ddda78d6133d27cfd3"; libraryHaskellDepends = [ array base comonad containers free hashable semigroupoids semigroups transformers transformers-compat unordered-containers @@ -120070,7 +121118,6 @@ self: { homepage = "http://github.com/ekmett/keys/"; description = "Keyed functors and containers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keystore" = callPackage @@ -122074,6 +123121,7 @@ self: { version = "0.1.2"; sha256 = "e08e6e05f45d03659d813caf03905a6ac314b83b39cd4d12b1ac8205039bb63d"; libraryHaskellDepends = [ base bytestring cereal containers ]; + jailbreak = true; description = "Guess at which language a text is written in using trigrams"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -123798,7 +124846,6 @@ self: { base directory doctest filepath generic-deriving semigroups simple-reflect ]; - jailbreak = true; homepage = "http://github.com/lens/lens-aeson/"; description = "Law-abiding lenses for aeson"; license = stdenv.lib.licenses.bsd3; @@ -124459,17 +125506,17 @@ self: { }) {archive = null;}; "libconfig" = callPackage - ({ mkDerivation, base, binary, c2hs, cereal, cereal-text, deepseq - , doctest, doctest-prop, hashable, libconfig, text, text-binary - , transformers, transformers-compat + ({ mkDerivation, base, binary, c2hs, deepseq, doctest, doctest-prop + , hashable, libconfig, text, text-binary, transformers + , transformers-compat }: mkDerivation { pname = "libconfig"; version = "0.3.0.0"; sha256 = "22605b11f7e9e9b9a94cbbc12172660e177e968384bbc462573c79c3bcdb5994"; libraryHaskellDepends = [ - base binary cereal cereal-text deepseq hashable text text-binary - transformers transformers-compat + base binary deepseq hashable text text-binary transformers + transformers-compat ]; librarySystemDepends = [ libconfig ]; libraryToolDepends = [ c2hs ]; @@ -125161,6 +126208,7 @@ self: { async base HUnit lifted-base monad-control mtl tasty tasty-hunit tasty-th ]; + jailbreak = true; homepage = "https://github.com/maoe/lifted-async"; description = "Run lifted IO operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; @@ -125174,8 +126222,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.8.0"; - sha256 = "81b2ebf0ae0e2154dca047a3ddd5f3cda2305245549b52487249f53c8f70ee7d"; + version = "0.8.0.1"; + sha256 = "ef8ca870155abb93e4ce742c46606ac59ab031ed86da31c75a6179c62be5f9bf"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -125636,6 +126684,7 @@ self: { base binary bytestring directory doctest filepath HUnit lens simple-reflect test-framework test-framework-hunit ]; + jailbreak = true; doCheck = false; homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; @@ -125643,7 +126692,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "linear" = callPackage + "linear_1_20_3" = callPackage ({ mkDerivation, adjunctions, base, binary, bytes, bytestring , cereal, containers, deepseq, directory, distributive, doctest , filepath, ghc-prim, hashable, HUnit, lens, reflection @@ -125669,9 +126718,10 @@ self: { homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "linear_1_20_4" = callPackage + "linear" = callPackage ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes , bytestring, cereal, containers, deepseq, directory, distributive , doctest, filepath, ghc-prim, hashable, HUnit, lens, reflection @@ -125694,11 +126744,9 @@ self: { base binary bytestring directory doctest filepath HUnit lens simple-reflect test-framework test-framework-hunit ]; - jailbreak = true; homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linear-accelerate" = callPackage @@ -127418,6 +128466,8 @@ self: { pname = "lock-file"; version = "0.5.0.2"; sha256 = "274ecb94d0af66fed7b624fca402381d7f262f510ac7c4271037153efda49ad0"; + revision = "1"; + editedCabalFile = "ef22bf7dfd46708eebcc8a895a0a265e6bbf1d05a7ebfdf0f9ee6513d838df8e"; libraryHaskellDepends = [ base data-default-class directory exceptions tagged-exception-core transformers @@ -127644,6 +128694,7 @@ self: { base directory doctest filepath generic-deriving semigroups simple-reflect ]; + jailbreak = true; homepage = "http://github.com/analytics/log-domain/"; description = "Log-domain arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -127668,6 +128719,7 @@ self: { base directory doctest filepath generic-deriving semigroups simple-reflect ]; + jailbreak = true; homepage = "http://github.com/ekmett/log-domain/"; description = "Log-domain arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -127792,6 +128844,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "logging-effect" = callPackage + ({ mkDerivation, async, base, exceptions, free, monad-control, mtl + , stm, stm-delay, text, time, transformers, transformers-base + , wl-pprint-text + }: + mkDerivation { + pname = "logging-effect"; + version = "1.0.0"; + sha256 = "9c7deabf027c2e7bfc800b26f103b259e25ee9ef814ce53260df3950aa682e8f"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl stm stm-delay text + time transformers transformers-base wl-pprint-text + ]; + homepage = "https://github.com/ocharles/logging-effect"; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "logging-facade_0_0_0" = callPackage ({ mkDerivation, base, hspec, template-haskell, transformers }: mkDerivation { @@ -128755,6 +129825,7 @@ self: { base containers contravariant dlist gl linear mtl resourcet semigroups transformers vector void ]; + jailbreak = true; homepage = "https://github.com/phaazon/luminance"; description = "Type-safe, type-level and stateless graphics framework"; license = stdenv.lib.licenses.bsd3; @@ -128762,23 +129833,6 @@ self: { }) {}; "luminance" = callPackage - ({ mkDerivation, base, containers, contravariant, dlist, gl, linear - , mtl, resourcet, semigroups, transformers, vector, void - }: - mkDerivation { - pname = "luminance"; - version = "0.9.1.1"; - sha256 = "5173588f12ec9949a483db6607cf6583132fb6b958a09c8473e025fa191210c2"; - 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; - }) {}; - - "luminance_0_9_1_2" = callPackage ({ mkDerivation, base, containers, contravariant, dlist, gl, linear , mtl, resourcet, semigroups, transformers, vector, void }: @@ -128793,10 +129847,9 @@ self: { 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 + "luminance-samples_0_9" = callPackage ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear , luminance, mtl, resourcet, transformers }: @@ -128810,13 +129863,14 @@ self: { 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 = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "luminance-samples_0_9_1" = callPackage + "luminance-samples" = callPackage ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear , luminance, mtl, resourcet, transformers }: @@ -128833,7 +129887,7 @@ self: { homepage = "https://github.com/phaazon/luminance-samples"; description = "Luminance samples"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lushtags" = callPackage @@ -128934,10 +129988,9 @@ self: { ({ mkDerivation, base, bindings-lxc, mtl, transformers }: mkDerivation { pname = "lxc"; - version = "0.3.1.1"; - sha256 = "f98f1310e5bcc7ab6bbc39c3bb94efb88dfc76d505fa80560866512baaca7ad6"; + version = "0.3.2"; + sha256 = "9ba3d9bff03cc213318124c279c216011f9b56ee8dd51f7a23edf2e5d8aabc5b"; libraryHaskellDepends = [ base bindings-lxc mtl transformers ]; - jailbreak = true; homepage = "https://github.com/fizruk/lxc"; description = "High level Haskell bindings to LXC (Linux containers)"; license = stdenv.lib.licenses.bsd3; @@ -128984,6 +130037,8 @@ self: { pname = "lzma"; version = "0.0.0.1"; sha256 = "576583fa5ac2110ca62f24dea62a1bb6effeba51c31b9fe06862dcfa8f7a38ac"; + revision = "1"; + editedCabalFile = "8ceb5cde6e8f9769e12c1fdb1a5f5c25f1d1aaa045741c991c29659dc6c74fa1"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ lzma ]; testHaskellDepends = [ @@ -129136,12 +130191,13 @@ self: { pname = "lzma-streams"; version = "0.1.0.0"; sha256 = "b6c90e493f6c367f79c1cee6c3ed978c3515139bf2c7174ed083a1cf76071af1"; + revision = "1"; + editedCabalFile = "7f2c0b8a7b6134789e1e2117ba70d536a050f3cc5cc6a438ab69ffd28785046c"; libraryHaskellDepends = [ base bytestring io-streams lzma ]; testHaskellDepends = [ base bytestring HUnit io-streams QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/hvr/lzma-streams"; description = "IO-Streams interface for lzma/xz compression"; license = stdenv.lib.licenses.bsd3; @@ -129269,6 +130325,7 @@ self: { transformers-compat void ]; testHaskellDepends = [ base directory doctest filepath ]; + jailbreak = true; homepage = "http://github.com/ekmett/machines/"; description = "Networked stream transducers"; license = stdenv.lib.licenses.bsd3; @@ -129581,6 +130638,7 @@ self: { version = "0.4.0.0"; sha256 = "7fbef4ce5d50c30f6c386707e655c74626246f4bc8bb84a826a73182ae1a49a3"; libraryHaskellDepends = [ base deepseq profunctors semigroups ]; + jailbreak = true; homepage = "https://github.com/cutsea110/magma"; description = "magma is an algebraic structure consisting a set together with an binary operation"; license = stdenv.lib.licenses.bsd3; @@ -129826,6 +130884,22 @@ self: { pname = "managed"; version = "1.0.0"; sha256 = "c5beb44a281e80d67cb2cbf8f116bce4b8d8f29ce56b4494a1a522d36e38cb1a"; + revision = "1"; + editedCabalFile = "e785d7abda6ca46246fcb4531202a68c71a17c0f1bfffe07bbcf7408bf0b1986"; + libraryHaskellDepends = [ base transformers ]; + description = "A monad for managed values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "managed_1_0_1" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "managed"; + version = "1.0.1"; + sha256 = "d2efbf081803303fb42b7bc105004a49be6f41719ad3e817400cba3a504dcb5f"; + revision = "1"; + editedCabalFile = "0baecb7e8c20aadcb65399e72b2db383cca207b7a3fafd22c637cff387e022ba"; libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = stdenv.lib.licenses.bsd3; @@ -129836,8 +130910,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "managed"; - version = "1.0.1"; - sha256 = "d2efbf081803303fb42b7bc105004a49be6f41719ad3e817400cba3a504dcb5f"; + version = "1.0.2"; + sha256 = "f2f562c1c9a1c5b2a73593fe9989c651fda86f67eee65be20861d151911a663c"; libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = stdenv.lib.licenses.bsd3; @@ -130323,7 +131397,6 @@ self: { aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit tasty-quickcheck text ]; - jailbreak = true; description = "Library for interfacing with the Mandrill JSON API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -130348,7 +131421,6 @@ self: { aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit tasty-quickcheck text ]; - jailbreak = true; description = "Library for interfacing with the Mandrill JSON API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -130473,6 +131545,7 @@ self: { template-haskell text time tls transformers transformers-base unordered-containers utf8-string vector wai warp x509-system ]; + jailbreak = true; doCheck = false; homepage = "https://github.com/prowdsponsor/mangopay"; description = "Bindings to the MangoPay API"; @@ -132098,7 +133171,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "messagepack" = callPackage + "messagepack_0_4_0" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck , test-framework, test-framework-quickcheck2, test-framework-th }: @@ -132111,12 +133184,14 @@ self: { base bytestring cereal containers QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; + jailbreak = true; homepage = "https://github.com/rodrigosetti/messagepack"; description = "Serialize instance for Message Pack Object"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "messagepack_0_5_1" = callPackage + "messagepack" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck , test-framework, test-framework-quickcheck2, test-framework-th }: @@ -132129,11 +133204,9 @@ self: { base bytestring cereal containers QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; homepage = "https://github.com/rodrigosetti/messagepack"; description = "Serialize instance for Message Pack Object"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "messagepack-rpc_0_1_0_3" = callPackage @@ -132147,6 +133220,25 @@ self: { libraryHaskellDepends = [ base bytestring cereal containers messagepack network-simple text ]; + jailbreak = true; + homepage = "http://github.com/rodrigosetti/messagepack-rpc"; + description = "Message Pack RPC over TCP"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "messagepack-rpc_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, messagepack + , network-simple + }: + mkDerivation { + pname = "messagepack-rpc"; + version = "0.2.0.0"; + sha256 = "a82366e59578f2971214ad2d9d2881f11ec031e1fb0354c45fd4df40b6c7a053"; + libraryHaskellDepends = [ + base bytestring cereal containers messagepack network-simple + ]; + jailbreak = true; homepage = "http://github.com/rodrigosetti/messagepack-rpc"; description = "Message Pack RPC over TCP"; license = stdenv.lib.licenses.mit; @@ -132154,22 +133246,6 @@ self: { }) {}; "messagepack-rpc" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, messagepack - , network-simple - }: - mkDerivation { - pname = "messagepack-rpc"; - version = "0.2.0.0"; - sha256 = "a82366e59578f2971214ad2d9d2881f11ec031e1fb0354c45fd4df40b6c7a053"; - libraryHaskellDepends = [ - base bytestring cereal containers messagepack network-simple - ]; - homepage = "http://github.com/rodrigosetti/messagepack-rpc"; - description = "Message Pack RPC over TCP"; - license = stdenv.lib.licenses.mit; - }) {}; - - "messagepack-rpc_0_5_1" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, messagepack , network-simple }: @@ -132180,11 +133256,9 @@ self: { libraryHaskellDepends = [ base bytestring cereal containers messagepack network-simple ]; - jailbreak = true; homepage = "http://github.com/rodrigosetti/messagepack-rpc"; description = "Message Pack RPC over TCP"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "messente" = callPackage @@ -132985,7 +134059,6 @@ self: { transformers unix wai wai-app-file-cgi wai-logger warp ]; testHaskellDepends = [ base hspec http-client ]; - jailbreak = true; homepage = "http://www.mew.org/~kazu/proj/mighttpd/"; description = "High performance web server on WAI/warp"; license = stdenv.lib.licenses.bsd3; @@ -133802,7 +134875,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mmorph" = callPackage + "mmorph_1_0_4" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "mmorph"; @@ -133811,9 +134884,10 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Monad morphisms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mmorph_1_0_5" = callPackage + "mmorph" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "mmorph"; @@ -133822,7 +134896,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Monad morphisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmtl" = callPackage @@ -134464,8 +135537,8 @@ self: { pname = "monad-http"; version = "0.1.0.0"; sha256 = "a333b087835aa4902d0814e76fe4f32a523092fd7b13526aad415160a8317192"; - revision = "1"; - editedCabalFile = "6dc1e9978860f42d76fc6f82d5166c9396ebdb2a555575c589970334200f5ad5"; + revision = "2"; + editedCabalFile = "7f2d5927cf21949017fce8d2c46c3f768e1be144e57ae4c845b409707d11313a"; libraryHaskellDepends = [ base base-compat bytestring exceptions http-client http-client-tls http-types monad-logger monadcryptorandom MonadRandom mtl text @@ -135079,7 +136152,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monad-products" = callPackage + "monad-products_4_0_0_1" = callPackage ({ mkDerivation, base, semigroupoids }: mkDerivation { pname = "monad-products"; @@ -135091,9 +136164,10 @@ self: { homepage = "http://github.com/ekmett/monad-products"; description = "Monad products"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monad-products_4_0_1" = callPackage + "monad-products" = callPackage ({ mkDerivation, base, semigroupoids }: mkDerivation { pname = "monad-products"; @@ -135103,7 +136177,6 @@ self: { homepage = "http://github.com/ekmett/monad-products"; description = "Monad products"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-ran" = callPackage @@ -135448,7 +136521,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monadic-arrays" = callPackage + "monadic-arrays_0_2_1_4" = callPackage ({ mkDerivation, array, base, stm, transformers }: mkDerivation { pname = "monadic-arrays"; @@ -135458,9 +136531,10 @@ self: { homepage = "http://github.com/ekmett/monadic-arrays/"; description = "Boxed and unboxed arrays for monad transformers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "monadic-arrays_0_2_2" = callPackage + "monadic-arrays" = callPackage ({ mkDerivation, array, base, stm, transformers , transformers-compat }: @@ -135474,7 +136548,6 @@ self: { homepage = "http://github.com/ekmett/monadic-arrays/"; description = "Boxed and unboxed arrays for monad transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monadiccp" = callPackage @@ -135973,6 +137046,8 @@ self: { pname = "mono-traversable"; version = "0.9.2.1"; sha256 = "34c3827b49e47e83bdbed647ae6ca27e049be8887904007b57b03dc006b542ef"; + revision = "1"; + editedCabalFile = "ab0be6e2bbdc22be03cf722277972a7bd3c11732567fe33f7f12af56a09f533e"; libraryHaskellDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups text transformers unordered-containers @@ -135998,6 +137073,35 @@ self: { pname = "mono-traversable"; version = "0.9.3"; sha256 = "d73b495b65cdc3951e2407d07e46b3cb5b3ab074b474c0742687b616f4e7e4db"; + revision = "1"; + editedCabalFile = "021ce075d81cc8dbadfa395895ba0511fc35230f12e1ba409a553eded8c96d1f"; + libraryHaskellDepends = [ + base bytestring comonad containers dlist dlist-instances hashable + semigroupoids semigroups split text transformers + unordered-containers vector vector-algorithms vector-instances + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector + ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "mono-traversable_0_10_0_1" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers, dlist + , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck + , semigroupoids, semigroups, split, text, transformers + , unordered-containers, vector, vector-algorithms, vector-instances + }: + mkDerivation { + pname = "mono-traversable"; + version = "0.10.0.1"; + sha256 = "2e25c24ed3cf644cd4818cfb6d4e122cffcac2a375f0edb544b6814f871af45d"; + revision = "1"; + editedCabalFile = "49283811dc1e565bdc4a3e7cfd2e3744866906e1267ffb018f3e271c05e2d169"; libraryHaskellDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups split text transformers @@ -136021,8 +137125,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "0.10.0.1"; - sha256 = "2e25c24ed3cf644cd4818cfb6d4e122cffcac2a375f0edb544b6814f871af45d"; + version = "0.10.1"; + sha256 = "a82e63352ed854319bca7d33e3aa13a42a18648e47d01109f8c306ee54b9418b"; libraryHaskellDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups split text transformers @@ -136946,8 +138050,8 @@ self: { pname = "mtl-compat"; version = "0.2.1.1"; sha256 = "ac06e0ad010045e8bb1fc894303d6060fffc9d14bf6e8d90c83d1c7eb23b95e9"; - revision = "2"; - editedCabalFile = "7d1c037df6cdcbf8573f518a370c9beec0adee9f2b8001b1719df6f407bb6a53"; + revision = "3"; + editedCabalFile = "1847f7f92b4878613f0f7b0062f3a3744bbd5c6aed0eb1cfd5c2ddfc5e41689b"; libraryHaskellDepends = [ base mtl transformers-compat ]; jailbreak = true; homepage = "https://github.com/haskell-compat/mtl-compat"; @@ -136962,8 +138066,8 @@ self: { pname = "mtl-compat"; version = "0.2.1.3"; sha256 = "6458ca53593a31ebce1d94ef8dd4f6a06d050dd7ed32335f6cc6b6e5d3456894"; - revision = "2"; - editedCabalFile = "6f72b1e8e7cc62b9631024e64e70a806a1018a1b4ac62e5e32a7b36e97d420dc"; + revision = "3"; + editedCabalFile = "6c94536cf0a7415c1fb740d1a98a109928e77ac0bc1fc2f77b460c7c58d6ee45"; libraryHaskellDepends = [ base mtl ]; doHaddock = false; homepage = "https://github.com/haskell-compat/mtl-compat"; @@ -137241,7 +138345,6 @@ self: { testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; - jailbreak = true; homepage = "https://github.com/aka-bash0r/multi-cabal"; description = "A tool supporting multi cabal project builds"; license = stdenv.lib.licenses.mit; @@ -138106,12 +139209,13 @@ self: { }: mkDerivation { pname = "mvc"; - version = "1.1.0"; - sha256 = "31f4d34cb82ac5a404bf11c80191d0e1ae7dd228a372d8f0901fcc49fb79ac84"; + version = "1.1.1"; + sha256 = "b97122c1df6b5eb569e75cbc2a4c84a06e8ab942f68110a2f56b9cdac1bd34f5"; libraryHaskellDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers ]; + jailbreak = true; description = "Model-view-controller"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -139100,8 +140204,8 @@ self: { }: mkDerivation { pname = "ncurses"; - version = "0.2.14"; - sha256 = "0aec2ed4a70c08d45b225a9096711ef3edf6c4b01e8d4de389069939ff1662cc"; + version = "0.2.15"; + sha256 = "d66088846d7b82ac7921a81e6456492277f1d81c0b115afe1a35b23e0ec0b198"; libraryHaskellDepends = [ base containers text transformers ]; librarySystemDepends = [ ncurses ]; libraryToolDepends = [ c2hs ]; @@ -139714,7 +140818,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) nettle;}; - "nettle" = callPackage + "nettle_0_1_1" = callPackage ({ mkDerivation, array, base, byteable, bytestring , crypto-cipher-tests, crypto-cipher-types, HUnit, nettle , QuickCheck, securemem, tagged, test-framework @@ -139740,7 +140844,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) nettle;}; - "nettle_0_2_0" = callPackage + "nettle" = callPackage ({ mkDerivation, array, base, byteable, bytestring , crypto-cipher-tests, crypto-cipher-types, HUnit, nettle , QuickCheck, securemem, tagged, test-framework @@ -139759,6 +140863,7 @@ self: { QuickCheck tagged test-framework test-framework-hunit test-framework-quickcheck2 ]; + doCheck = false; homepage = "https://github.com/stbuehler/haskell-nettle"; description = "safe nettle binding"; license = stdenv.lib.licenses.mit; @@ -141141,6 +142246,7 @@ self: { version = "0.3.0.1"; sha256 = "299e21e75cfe2c3c7914d05b5fe142209cbd50553369318cffc643b57660d8ba"; libraryHaskellDepends = [ base wai ]; + jailbreak = true; description = "A routing library for wai"; license = stdenv.lib.licenses.mit; }) {}; @@ -141361,8 +142467,8 @@ self: { }: mkDerivation { pname = "niagra"; - version = "0.2.0"; - sha256 = "ad2432ca574c5626a7340d09d37113670ae75e7db5e371469983db0676560d34"; + version = "0.2.1"; + sha256 = "5b6cb93d70015fc48a200f4937470b73c1e1fd152ce6dd2a4413e3b547d6ee00"; libraryHaskellDepends = [ base containers ghc-prim mtl text transformers ]; @@ -142560,7 +143666,6 @@ self: { aeson base bytestring lens lens-aeson pipes pipes-aeson pipes-bytestring pipes-http pipes-parse text time wreq ]; - jailbreak = true; homepage = "https://github.com/bts/nylas-hs"; description = "Client for the Nylas API"; license = stdenv.lib.licenses.bsd3; @@ -143129,6 +144234,7 @@ self: { libraryHaskellDepends = [ base contravariant ghc-prim transformers ]; + jailbreak = true; homepage = "https://github.com/sjoerdvisscher/one-liner"; description = "Constraint-based generics"; license = stdenv.lib.licenses.bsd3; @@ -143370,8 +144476,8 @@ self: { pname = "opaleye"; version = "0.4.2.0"; sha256 = "b924c4d0fa7151c0dbaee5ddcd89adfa569614204a805392625752ea6dc13c20"; - revision = "1"; - editedCabalFile = "64de3c71480e306843b335e7672e38548c4c6396222a466901096fa72c49fc17"; + revision = "2"; + editedCabalFile = "bf554e82c1ac3c72f9df13494052197f0e8f131d0f44487073443a180c51395a"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -144402,7 +145508,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "optparse-applicative" = callPackage + "optparse-applicative_0_12_0_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, process, transformers , transformers-compat }: @@ -144416,6 +145522,23 @@ self: { homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "optparse-applicative" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, process, transformers + , transformers-compat + }: + mkDerivation { + pname = "optparse-applicative"; + version = "0.12.1.0"; + sha256 = "18b46d6d2c17e941bb02f84e980390f056795dce73ece946d71d3d4d002313d5"; + libraryHaskellDepends = [ + ansi-wl-pprint base process transformers transformers-compat + ]; + homepage = "https://github.com/pcapriotti/optparse-applicative"; + description = "Utilities and combinators for parsing command line options"; + license = stdenv.lib.licenses.bsd3; }) {}; "optparse-declarative" = callPackage @@ -145230,6 +146353,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pagerduty" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring + , bytestring-conversion, conduit, data-default-class, exceptions + , generics-sop, http-client, http-types, lens, lens-aeson, mmorph + , monad-control, mtl, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "pagerduty"; + version = "0.0.4"; + sha256 = "41549771fe6689ffb97806e615e86a3c7384177cbcc1c77873167a3e9d05be9c"; + libraryHaskellDepends = [ + aeson base bifunctors bytestring bytestring-conversion conduit + data-default-class exceptions generics-sop http-client http-types + lens lens-aeson mmorph monad-control mtl template-haskell text time + time-locale-compat transformers transformers-base + transformers-compat unordered-containers + ]; + homepage = "http://github.com/brendanhay/pagerduty"; + description = "Client library for PagerDuty Integration and REST APIs"; + license = "unknown"; + }) {}; + "pagure-hook-receiver" = callPackage ({ mkDerivation, base, containers, scotty, shelly, text , transformers, unix @@ -145841,7 +146988,6 @@ self: { aeson base bytestring directory filepath pandoc pandoc-types process temporary text yaml ]; - jailbreak = true; doCheck = false; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; @@ -145874,7 +147020,6 @@ self: { aeson base bytestring directory filepath pandoc pandoc-types process temporary text yaml ]; - jailbreak = true; doCheck = false; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; @@ -145907,7 +147052,6 @@ self: { aeson base bytestring directory filepath pandoc pandoc-types process temporary text yaml ]; - jailbreak = true; doCheck = false; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; @@ -146059,6 +147203,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pandoc-japanese-filters" = callPackage + ({ mkDerivation, base, containers, data-default, effin, HaTeX + , HaTeX-qq, hxt, pandoc, pandoc-types, shelly, system-fileio + , system-filepath, text + }: + mkDerivation { + pname = "pandoc-japanese-filters"; + version = "0.1.0.1"; + sha256 = "dc97d57265b7b5f5a40fcdf3ec422e03cd04fd7c4dc5a71045642dfde0d41301"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers data-default effin HaTeX HaTeX-qq hxt pandoc + pandoc-types shelly system-fileio system-filepath text + ]; + description = "Japanese-specific markup filters for pandoc"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "pandoc-lens" = callPackage ({ mkDerivation, base, containers, lens, pandoc-types }: mkDerivation { @@ -147370,6 +148533,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "path-io" = callPackage + ({ mkDerivation, base, directory, exceptions, filepath, path, time + , transformers + }: + mkDerivation { + pname = "path-io"; + version = "0.1.1"; + sha256 = "252633966f9a2c76297260c517b5a4d45597ffe4b3b8f53dbd44a363a4eb55cc"; + libraryHaskellDepends = [ + base directory exceptions filepath path time transformers + ]; + homepage = "https://github.com/mrkkrp/path-io"; + description = "Interface to ‘directory’ package for users of ‘path’"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "path-io_0_2_0" = callPackage + ({ mkDerivation, base, directory, exceptions, filepath, path + , temporary, time, transformers + }: + mkDerivation { + pname = "path-io"; + version = "0.2.0"; + sha256 = "bb72cdbefe7083f2ad9e7eada730e6297bff9941989c0652f698342c4359e735"; + libraryHaskellDepends = [ + base directory exceptions filepath path temporary time transformers + ]; + homepage = "https://github.com/mrkkrp/path-io"; + description = "Interface to ‘directory’ package for users of ‘path’"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "path-pieces_0_1_4" = callPackage ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }: mkDerivation { @@ -148439,8 +149635,8 @@ self: { }: mkDerivation { pname = "persistable-record"; - version = "0.2.0.0"; - sha256 = "5b8549ec3ed38b92a724c6a5c2fb75749d4faad31784d63354fd3f90e9877859"; + version = "0.3.0.0"; + sha256 = "9b9383f1dfa6d3c8b700fa4417a27538175143259a3410dfd72a39e5ac299b4f"; libraryHaskellDepends = [ array base containers dlist names-th template-haskell transformers ]; @@ -149574,7 +150770,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-postgresql" = callPackage + "persistent-postgresql_2_2_1_2" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-control, monad-logger, persistent , postgresql-libpq, postgresql-simple, resourcet, text, time @@ -149592,6 +150788,28 @@ self: { 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" = 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.2"; + sha256 = "7ec31242349f8ea7da149991fbe3366a6a83f3e3915392c997b3c34fc27671cd"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers + monad-control monad-logger persistent postgresql-libpq + postgresql-simple resourcet text time transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using postgresql"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -150046,7 +151264,6 @@ self: { testHaskellDepends = [ aeson base bytestring hspec persistent QuickCheck text transformers ]; - jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; @@ -150072,7 +151289,6 @@ self: { testHaskellDepends = [ aeson base bytestring hspec persistent QuickCheck text transformers ]; - jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; @@ -151049,7 +152265,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pipes" = callPackage + "pipes_4_1_7" = callPackage ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework , test-framework-quickcheck2, transformers }: @@ -151064,6 +152280,24 @@ self: { ]; description = "Compositional pipelines"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pipes" = callPackage + ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework + , test-framework-quickcheck2, transformers + }: + mkDerivation { + pname = "pipes"; + version = "4.1.8"; + sha256 = "5a5cf658f5bd6d6cf8298841d89a1819f85d02b233937ff19e5ad55c126ece34"; + libraryHaskellDepends = [ base mmorph mtl transformers ]; + testHaskellDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + transformers + ]; + description = "Compositional pipelines"; + license = stdenv.lib.licenses.bsd3; }) {}; "pipes-aeson_0_4_1_2" = callPackage @@ -151116,7 +152350,6 @@ self: { aeson attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring pipes-parse transformers ]; - jailbreak = true; homepage = "https://github.com/k0001/pipes-aeson"; description = "Encode and decode JSON streams using Aeson and Pipes"; license = stdenv.lib.licenses.bsd3; @@ -151359,6 +152592,7 @@ self: { libraryHaskellDepends = [ base bytestring cereal mtl pipes pipes-bytestring pipes-parse ]; + jailbreak = true; description = "Encode and decode binary streams using the pipes and cereal libraries"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -151934,25 +153168,22 @@ self: { }) {}; "pipes-transduce" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, comonad, conceit - , containers, doctest, foldl, free, lens-family-core - , monoid-subclasses, pipes, pipes-bytestring, pipes-concurrency - , pipes-group, pipes-parse, pipes-safe, pipes-text, semigroupoids - , semigroups, tasty, tasty-hunit, text, transformers, void + ({ mkDerivation, base, bifunctors, bytestring, conceit, doctest + , foldl, free, lens-family-core, pipes, pipes-bytestring + , pipes-concurrency, pipes-group, pipes-parse, pipes-safe + , pipes-text, tasty, tasty-hunit, text, transformers, void }: mkDerivation { pname = "pipes-transduce"; - version = "0.2.0.0"; - sha256 = "378a636143751acb414bdedfc13053653ec02a38299cd03ba3097784c7943bb3"; + version = "0.3.0.0"; + sha256 = "073c2ac2534fa8a29d65fb42b49ae1cff752513c69b3752145681b7a8d27c62b"; libraryHaskellDepends = [ - base bifunctors bytestring comonad conceit containers foldl free - lens-family-core monoid-subclasses pipes pipes-bytestring - pipes-concurrency pipes-group pipes-parse pipes-safe pipes-text - semigroupoids semigroups text transformers void + base bifunctors bytestring conceit foldl free lens-family-core + pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse + pipes-safe pipes-text text transformers void ]; testHaskellDepends = [ - base doctest foldl free monoid-subclasses pipes tasty tasty-hunit - text + base doctest foldl free pipes tasty tasty-hunit text ]; description = "Interfacing pipes with foldl folds"; license = stdenv.lib.licenses.bsd3; @@ -151985,6 +153216,7 @@ self: { libraryHaskellDepends = [ base blaze-builder bytestring http-types pipes transformers wai ]; + jailbreak = true; homepage = "http://github.com/brewtown/pipes-wai"; description = "A port of wai-conduit for the pipes ecosystem"; license = stdenv.lib.licenses.mit; @@ -153129,6 +154361,26 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "polynom" = callPackage + ({ mkDerivation, algebra, base, base-unicode-symbols, clist + , containers, peano, smallcheck, tasty, tasty-smallcheck + , transformers + }: + mkDerivation { + pname = "polynom"; + version = "0.1.0.0"; + sha256 = "904326a098409341a6b710f2fe36b48918cc41b954b98034fb6b68e5eb92efb1"; + libraryHaskellDepends = [ + algebra base base-unicode-symbols containers + ]; + testHaskellDepends = [ + algebra base base-unicode-symbols clist containers peano smallcheck + tasty tasty-smallcheck transformers + ]; + description = "Polynomial types and operations"; + license = "unknown"; + }) {}; + "polynomial" = callPackage ({ mkDerivation, base, deepseq, pretty, vector, vector-space , vector-th-unbox @@ -153837,7 +155089,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "postgresql-binary" = 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 @@ -153860,6 +155112,37 @@ self: { tasty-quickcheck tasty-smallcheck text time transformers uuid vector ]; + jailbreak = true; + doCheck = false; + homepage = "https://github.com/nikita-volkov/postgresql-binary"; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "postgresql-binary" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, conversion, conversion-bytestring, conversion-text + , either, foldl, loch-th, placeholders, postgresql-libpq + , QuickCheck, quickcheck-instances, scientific, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, time, transformers + , uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.7.5.1"; + sha256 = "d35b169d7bd2d5f81106643e59725859446739dc69c6695136ff535cf7f55948"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring foldl loch-th + placeholders scientific text time transformers uuid vector + ]; + testHaskellDepends = [ + base base-prelude bytestring conversion conversion-bytestring + conversion-text either loch-th placeholders postgresql-libpq + QuickCheck quickcheck-instances scientific tasty tasty-hunit + tasty-quickcheck tasty-smallcheck text time transformers uuid + vector + ]; doCheck = false; homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; @@ -154843,7 +156126,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "prelude-extras" = callPackage + "prelude-extras_0_4_0_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "prelude-extras"; @@ -154853,9 +156136,10 @@ self: { homepage = "http://github.com/ekmett/prelude-extras"; description = "Higher order versions of Prelude classes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "prelude-extras_0_4_0_3" = callPackage + "prelude-extras" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "prelude-extras"; @@ -154865,7 +156149,6 @@ self: { homepage = "http://github.com/ekmett/prelude-extras"; description = "Higher order versions of Prelude classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prelude-generalize" = callPackage @@ -155544,7 +156827,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "process-extras" = callPackage + "process-extras_0_3_3_5" = callPackage ({ mkDerivation, base, bytestring, deepseq, ListLike, process, text }: mkDerivation { @@ -155559,6 +156842,7 @@ self: { homepage = "https://github.com/seereason/process-extras"; description = "Process extras"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "process-extras_0_3_3_6" = callPackage @@ -155579,6 +156863,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "process-extras" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ListLike, process, text + }: + mkDerivation { + pname = "process-extras"; + version = "0.3.3.7"; + sha256 = "50e0cfdfb1225e99c04e839270cf2b06502494b8f1953d12a04f1ddaf04fa9e1"; + revision = "1"; + editedCabalFile = "b671c93f8c252555f6a8a0dcd2335b6409a823ae36310f7518bbc7a55d593812"; + libraryHaskellDepends = [ + base bytestring deepseq ListLike process text + ]; + homepage = "https://github.com/seereason/process-extras"; + description = "Process extras"; + license = stdenv.lib.licenses.mit; + }) {}; + "process-iterio" = callPackage ({ mkDerivation, base, bytestring, cpphs, iterIO, process , transformers @@ -155824,6 +157125,7 @@ self: { base contravariant profunctors template-haskell ]; testHaskellDepends = [ base profunctors ]; + jailbreak = true; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; description = "product-profunctors"; license = stdenv.lib.licenses.bsd3; @@ -155841,6 +157143,7 @@ self: { base contravariant profunctors template-haskell ]; testHaskellDepends = [ base profunctors ]; + jailbreak = true; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; description = "product-profunctors"; license = stdenv.lib.licenses.bsd3; @@ -155854,6 +157157,8 @@ self: { pname = "product-profunctors"; version = "0.6.3.1"; sha256 = "44e082ea161dc3f2b844fd59afbadfaeea3bd88ee4a07ba0fbaf369cc6e4311d"; + revision = "1"; + editedCabalFile = "a249282eea8fad3325c86ec23d4b6af68ce46c2bd2a99d7be3272cfc94359ce1"; libraryHaskellDepends = [ base contravariant profunctors template-haskell ]; @@ -155987,7 +157292,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "profunctors" = callPackage + "profunctors_5_1_2" = callPackage ({ mkDerivation, base, bifunctors, comonad, contravariant , distributive, tagged, transformers }: @@ -156002,9 +157307,10 @@ self: { homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "profunctors_5_2" = callPackage + "profunctors" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , contravariant, distributive, tagged, transformers }: @@ -156016,11 +157322,9 @@ self: { base base-orphans bifunctors comonad contravariant distributive tagged transformers ]; - jailbreak = true; homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "progress" = callPackage @@ -156891,6 +158195,8 @@ self: { pname = "pseudo-trie"; version = "0.0.4.3"; sha256 = "6bc3d45069da2d418e00a1403a80be933a2cb1fe86e6d549f8c40568f29b1208"; + revision = "1"; + editedCabalFile = "4566dd5a8847365d789eda525e2a8a61475cda0476102bda375affd3305387f5"; libraryHaskellDepends = [ base semigroups ]; description = "A tagged rose-tree with short circuited unique leaves"; license = stdenv.lib.licenses.bsd3; @@ -157271,8 +158577,8 @@ self: { }: mkDerivation { pname = "pure-cdb"; - version = "0.1.1"; - sha256 = "16d87f4304d02dd1f4f2f61337ef8a22dc359aab0e1fbbdf161d4e28003c50fa"; + version = "0.1.2"; + sha256 = "25228a3052ad7f6cfc003569668c94c5ecaa7665a5e205b54f221bf42ff3f840"; libraryHaskellDepends = [ base binary bytestring containers directory mtl vector ]; @@ -157721,8 +159027,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "0.3.0.0"; - sha256 = "50b4a5974e7e5fbf2fb77b3c59d5a790e7151c03e4ea046432548a2eb7d8d6ec"; + version = "0.3.0.1"; + sha256 = "b71151cf6b8e39e0025930d393bde031693270b536e37af23b9c425b290bf3dc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157738,7 +159044,6 @@ self: { aeson base bytestring hspec http-client http-types mtl QuickCheck text transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/pusher-community/pusher-http-haskell"; description = "Haskell client library for the Pusher HTTP API"; license = stdenv.lib.licenses.mit; @@ -158399,7 +159704,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "quickcheck-instances" = callPackage + "quickcheck-instances_0_3_11" = callPackage ({ mkDerivation, array, base, bytestring, containers, hashable , old-time, QuickCheck, text, time, unordered-containers }: @@ -158416,6 +159721,25 @@ self: { homepage = "https://github.com/aslatter/qc-instances"; description = "Common quickcheck instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "quickcheck-instances" = callPackage + ({ mkDerivation, array, base, bytestring, containers, hashable + , old-time, QuickCheck, scientific, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "quickcheck-instances"; + version = "0.3.12"; + sha256 = "ddd5b988da50eff7f56737bff516fba52309f7461297698f04f1e8aaee9f9bf3"; + libraryHaskellDepends = [ + array base bytestring containers hashable old-time QuickCheck + scientific text time unordered-containers vector + ]; + homepage = "https://github.com/aslatter/qc-instances"; + description = "Common quickcheck instances"; + license = stdenv.lib.licenses.bsd3; }) {}; "quickcheck-io_0_1_1" = callPackage @@ -159504,14 +160828,16 @@ self: { }: mkDerivation { pname = "range-set-list"; - version = "0.1.1.0"; - sha256 = "091b01e7b98b232fcaae126c8b5701e63c08064ff5c29174c85c2a4d5a2cef3c"; - libraryHaskellDepends = [ base deepseq hashable semigroups ]; + version = "0.1.2.0"; + sha256 = "3b749cf447dcf1f81f263c9c43dd61ee533b4fb25e6e4ca3bdbe2321702bab67"; + libraryHaskellDepends = [ + base containers deepseq hashable semigroups + ]; testHaskellDepends = [ base containers deepseq hashable semigroups tasty tasty-quickcheck ]; homepage = "https://github.com/phadej/range-set-list#readme"; - description = "Memory efficient sets with continuous ranges of elements"; + description = "Memory efficient sets with ranges of elements"; license = stdenv.lib.licenses.mit; }) {}; @@ -161259,6 +162585,7 @@ self: { http-types lens mtl random readable reflex reflex-dom safe string-conv text time transformers ]; + jailbreak = true; homepage = "https://github.com/reflex-frp/reflex-dom-contrib"; description = "A playground for experimenting with infrastructure and common code for reflex applications"; license = stdenv.lib.licenses.bsd3; @@ -162247,8 +163574,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.7.1.0"; - sha256 = "04fbd9d0cfee03a299a9642d40470a8d6c89bc8163905ffa232dbd8499eb6c9d"; + version = "0.8.0.1"; + sha256 = "6484cb21a69e27c01edb4ecfe1155ed5780a7b7d608d42c5570eea402755e015"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record sql-words template-haskell text time time-locale-compat @@ -162269,8 +163596,8 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.4.0.0"; - sha256 = "b5ae3dccfb6a32b6f64f350c0349d253a3b5ff8d28f0832f5189cea7974b7650"; + version = "0.5.0.0"; + sha256 = "b6d3fb55175eab8d816b15628a24fcf401a768122a8d3db02141605f054ff789"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record relational-query relational-schemas @@ -162320,8 +163647,8 @@ self: { }: mkDerivation { pname = "relational-schemas"; - version = "0.1.2.1"; - sha256 = "648373d8931953dcfcbc770e4d9919469535b445581d3dbe03a51ffe8b7110fb"; + version = "0.1.2.2"; + sha256 = "aaab90384f20c5cbf3badab61b1dd7a0579acc7edcccc96af3ff07ebe9269626"; libraryHaskellDepends = [ base bytestring containers persistable-record relational-query template-haskell time @@ -163202,7 +164529,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "resolve-trivial-conflicts" = callPackage + "resolve-trivial-conflicts_0_3_2_1" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory , filepath, mtl, optparse-applicative, process, unix }: @@ -163216,12 +164543,14 @@ self: { ansi-terminal base base-compat Diff directory filepath mtl optparse-applicative process unix ]; + jailbreak = true; homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts"; description = "Remove trivial conflict markers in a git repository"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "resolve-trivial-conflicts_0_3_2_2" = callPackage + "resolve-trivial-conflicts" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory , filepath, mtl, optparse-applicative, process, unix }: @@ -163238,7 +164567,6 @@ self: { homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts"; description = "Remove trivial conflict markers in a git repository"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resource-effect" = callPackage @@ -164830,16 +166158,16 @@ self: { "rethinkdb-client-driver" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , hashable, hspec, hspec-smallcheck, mtl, network, old-locale - , scientific, smallcheck, template-haskell, text, time + , scientific, smallcheck, stm, template-haskell, text, time , unordered-containers, vector }: mkDerivation { pname = "rethinkdb-client-driver"; - version = "0.0.21"; - sha256 = "27bfbca15e5bff5215deed35c19d2ec17d1c27e9cc6b9fe147e8b9ed50cd76d0"; + version = "0.0.22"; + sha256 = "4a192e989e1f1b60398123ad2c74701203b66a33a220f1b5c47ad495e98575bb"; libraryHaskellDepends = [ aeson base binary bytestring containers hashable mtl network - old-locale scientific template-haskell text time + old-locale scientific stm template-haskell text time unordered-containers vector ]; testHaskellDepends = [ @@ -166778,7 +168106,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "safecopy" = callPackage + "safecopy_0_8_6" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers, lens , lens-action, old-time, quickcheck-instances, tasty , tasty-quickcheck, template-haskell, text, time, vector @@ -166797,13 +168125,15 @@ self: { array base cereal containers lens lens-action quickcheck-instances tasty tasty-quickcheck template-haskell time vector ]; + jailbreak = true; doCheck = false; homepage = "http://acid-state.seize.it/safecopy"; description = "Binary serialization with version control"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "safecopy_0_9_0_1" = callPackage + "safecopy" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers, lens , lens-action, old-time, quickcheck-instances, tasty , tasty-quickcheck, template-haskell, text, time, vector @@ -166820,11 +168150,10 @@ self: { array base cereal containers lens lens-action quickcheck-instances tasty tasty-quickcheck template-haskell time vector ]; - jailbreak = true; + doCheck = false; homepage = "http://acid-state.seize.it/safecopy"; description = "Binary serialization with version control"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safeint" = callPackage @@ -169480,12 +170809,13 @@ self: { pname = "semigroupoids"; version = "4.2"; sha256 = "88a95d383195307f4e9e20d49f194a192d816bf15fc2f12a63820a8742b9f1a3"; - revision = "1"; - editedCabalFile = "0be7058f2eb89390b2752e8596fb47d0cb5c6a4636d33123dfbe4637f2ba451d"; + revision = "2"; + editedCabalFile = "610d610c6aeddb4597f1ada0f512b9c60c11b2a570e8f8a2eb5f1a9d91adf89b"; libraryHaskellDepends = [ base comonad containers contravariant distributive semigroups transformers ]; + jailbreak = true; homepage = "http://github.com/ekmett/semigroupoids"; description = "Semigroupoids: Category sans id"; license = stdenv.lib.licenses.bsd3; @@ -169501,8 +170831,8 @@ self: { pname = "semigroupoids"; version = "4.3"; sha256 = "4ea30261a070a6af8dce041041cdb8af67154dbab95f329c9953ffc09ccbc0e2"; - revision = "1"; - editedCabalFile = "564644e3fb93fa01f5c45772256a980baa07275a763f1015859816942ab210b3"; + revision = "2"; + editedCabalFile = "235598c490e3a2b2996a8c028fa766093f6b72228a3e1a6e0f69f8eafe8199e2"; libraryHaskellDepends = [ base comonad containers contravariant distributive semigroups transformers transformers-compat @@ -169538,7 +170868,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "semigroupoids" = callPackage + "semigroupoids_5_0_0_4" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , containers, contravariant, directory, distributive, doctest , filepath, semigroups, tagged, transformers, transformers-compat @@ -169556,9 +170886,10 @@ self: { homepage = "http://github.com/ekmett/semigroupoids"; description = "Semigroupoids: Category sans id"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "semigroupoids_5_0_1" = callPackage + "semigroupoids" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , containers, contravariant, directory, distributive, doctest , filepath, semigroups, tagged, transformers, transformers-compat @@ -169577,7 +170908,6 @@ self: { homepage = "http://github.com/ekmett/semigroupoids"; description = "Semigroupoids: Category sans id"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semigroupoids-syntax" = callPackage @@ -170808,6 +172138,7 @@ self: { servant-lucid servant-server text time transformers wai wai-extra warp ]; + jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "Example programs for servant"; license = stdenv.lib.licenses.bsd3; @@ -171301,6 +172632,7 @@ self: { network parsec QuickCheck servant string-conversions temporary text transformers wai wai-extra warp ]; + jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; @@ -171359,6 +172691,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger_0_1_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec + , http-media, lens, servant, swagger2, text, time + , unordered-containers + }: + mkDerivation { + pname = "servant-swagger"; + version = "0.1.1"; + sha256 = "d89df7e8ee82978f6db32c2f278591df26bcdd6ef4282dff53933d3417d53a6c"; + libraryHaskellDepends = [ + aeson base bytestring http-media lens servant swagger2 text + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base hspec lens servant swagger2 text time + ]; + homepage = "https://github.com/dmjio/servant-swagger"; + description = "Generate Swagger specification for your servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-yaml" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, http-media , servant, servant-server, wai, warp, yaml @@ -171443,6 +172797,7 @@ self: { acid-state base containers hspec mtl safecopy serversession unordered-containers ]; + jailbreak = true; homepage = "https://github.com/yesodweb/serversession"; description = "Storage backend for serversession using acid-state"; license = stdenv.lib.licenses.mit; @@ -171699,14 +173054,18 @@ self: { }) {}; "set-cover" = callPackage - ({ mkDerivation, base, containers, utility-ht }: + ({ mkDerivation, base, containers, enummapset, psqueues, utility-ht + }: mkDerivation { pname = "set-cover"; - version = "0.0.6"; - sha256 = "6b1554247fda64306c4d47957b00794e06e0744f9996d287dbdb6612774179f9"; + version = "0.0.8"; + sha256 = "186d3a1b6e824e3bd1d479347d8310dba9f1cba98e90bc03d885c42558ea95d1"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base containers utility-ht ]; + libraryHaskellDepends = [ + base containers enummapset psqueues utility-ht + ]; + jailbreak = true; homepage = "http://hub.darcs.net/thielema/set-cover/"; description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; license = stdenv.lib.licenses.bsd3; @@ -175025,6 +176384,7 @@ self: { testHaskellDepends = [ base bytestring cereal crypto-api filepath hspec tagged ]; + jailbreak = true; homepage = "https://github.com/meteficha/skein"; description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; license = stdenv.lib.licenses.bsd3; @@ -175045,6 +176405,7 @@ self: { testHaskellDepends = [ base bytestring cereal crypto-api filepath hspec tagged ]; + jailbreak = true; homepage = "https://github.com/meteficha/skein"; description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; license = stdenv.lib.licenses.bsd3; @@ -175453,6 +176814,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "slug_0_1_2" = callPackage + ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent + , QuickCheck, test-framework, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "slug"; + version = "0.1.2"; + sha256 = "4f4a85b88dbac7b11aae52ad22947328dfdbfb1f0472d70dbd52aa63098c9d5d"; + libraryHaskellDepends = [ + aeson base exceptions path-pieces persistent text + ]; + testHaskellDepends = [ + base exceptions path-pieces QuickCheck test-framework + test-framework-quickcheck2 text + ]; + jailbreak = true; + homepage = "https://github.com/mrkkrp/slug"; + description = "Type-safe slugs for Yesod ecosystem"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "smallarray" = callPackage ({ mkDerivation, base, bytestring, deepseq, hashable }: mkDerivation { @@ -175495,6 +176878,8 @@ self: { pname = "smallcheck"; version = "1.1.1"; sha256 = "4d17607c1a620491e7e495a17575b73952932c761e7f9bdfa87e0102fb52f9f9"; + revision = "1"; + editedCabalFile = "b19c841b12cc34f6379c2b72bc4c250da9b0346c46690dae419caaa0310478fa"; libraryHaskellDepends = [ base ghc-prim logict mtl pretty ]; homepage = "https://github.com/feuerbach/smallcheck"; description = "A property-based testing library"; @@ -175708,7 +177093,6 @@ self: { version = "0.4.1"; sha256 = "f29484ce5a765334798b1107be91b4ef555f1e67a81bd3eb1049a91eec9e6e2e"; libraryHaskellDepends = [ aeson base linear text vector ]; - jailbreak = true; homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several interpolation modes"; license = stdenv.lib.licenses.bsd3; @@ -176886,7 +178270,6 @@ self: { aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers ]; - jailbreak = true; homepage = "https://github.com/faylang/snaplet-fay"; description = "Fay integration for Snap with request- and pre-compilation"; license = stdenv.lib.licenses.bsd3; @@ -177911,7 +179294,6 @@ self: { aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -178642,7 +180024,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "speculation" = callPackage + "speculation_1_5_0_2" = callPackage ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { pname = "speculation"; @@ -178652,9 +180034,10 @@ self: { homepage = "http://github.com/ekmett/speculation"; description = "A framework for safe, programmable, speculative parallelism"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "speculation_1_5_0_3" = callPackage + "speculation" = callPackage ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { pname = "speculation"; @@ -178664,7 +180047,6 @@ self: { homepage = "http://github.com/ekmett/speculation"; description = "A framework for safe, programmable, speculative parallelism"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "speculation-transformers" = callPackage @@ -180262,7 +181644,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; - "stack" = callPackage + "stack_1_0_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base , base16-bytestring, base64-bytestring, bifunctors, binary , binary-tagged, blaze-builder, byteable, bytestring, Cabal @@ -180329,6 +181711,77 @@ self: { homepage = "http://haskellstack.org"; 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, enclosed-exceptions, errors, 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 + , text-binary, time, transformers, transformers-base, unix + , unix-compat, unordered-containers, uuid, vector + , vector-binary-instances, void, word8, yaml, zlib + }: + mkDerivation { + pname = "stack"; + version = "1.0.2"; + sha256 = "4227f4c4016e5008755a974cbf04a9772319d87d1764da32228e74f13153c5c4"; + revision = "1"; + editedCabalFile = "d789ed4dceed4c226571d0f5f5e6d2d5602a6b36b7f4579b78352d330934e3ab"; + 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 enclosed-exceptions errors 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 text-binary 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 attoparsec 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 + ]; + doHaddock = false; + 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 ]; }) {}; @@ -180371,6 +181824,7 @@ self: { base profunctors tagged template-haskell transformers ]; testHaskellDepends = [ base template-haskell ]; + jailbreak = true; homepage = "https://github.com/MedeaMelana/stack-prism"; description = "Stack prisms"; license = stdenv.lib.licenses.bsd3; @@ -180383,8 +181837,8 @@ self: { }: mkDerivation { pname = "stack-run"; - version = "0.1.0.2"; - sha256 = "7ebf14489c52f6b52e38f238f6d5975ceedda95f066a60b224990dac85ca25f4"; + version = "0.1.0.5"; + sha256 = "6625d1fbfde871ae88689a3ae18550a4582d68974e5f541e014c45629c1821c7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -180419,6 +181873,7 @@ self: { async base extract-dependencies file-modules lens lens-aeson MissingH process stm-containers text time wreq ]; + doCheck = false; homepage = "http://github.com/yamadapc/stack-run-auto#readme"; description = "Initial project template from stack"; license = stdenv.lib.licenses.mit; @@ -180724,7 +182179,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stackage-curator" = callPackage + "stackage-curator_0_11_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal , classy-prelude-conduit, conduit, conduit-extra, containers @@ -180770,6 +182225,53 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stackage-curator" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async + , base, base16-bytestring, binary, binary-tagged, blaze-html + , byteable, bytestring, Cabal, classy-prelude-conduit, conduit + , conduit-extra, containers, cryptohash, cryptohash-conduit + , data-default-class, directory, filepath, hspec, html-conduit + , http-client, http-client-tls, http-conduit, lucid, mime-types + , monad-unlift, mono-traversable, mtl, old-locale + , optparse-applicative, optparse-simple, process, QuickCheck + , resourcet, semigroups, stackage-cli, stackage-install + , stackage-metadata, stackage-types, stm, streaming-commons + , system-fileio, system-filepath, tar, temporary, text, time + , transformers, unix-compat, utf8-string, xml-conduit, xml-types + , yaml, zlib + }: + mkDerivation { + pname = "stackage-curator"; + version = "0.13.0"; + sha256 = "fcbc1ff3f378f96a23a169a73a6e081c896cdb88846ecd2ff78afb06b505d612"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 async base + base16-bytestring binary binary-tagged blaze-html byteable + bytestring Cabal classy-prelude-conduit conduit conduit-extra + containers cryptohash cryptohash-conduit data-default-class + directory filepath html-conduit http-client http-client-tls + http-conduit lucid mime-types monad-unlift mono-traversable mtl + old-locale process resourcet semigroups stackage-install + stackage-metadata stackage-types stm streaming-commons + system-fileio system-filepath tar temporary text time transformers + unix-compat utf8-string xml-conduit xml-types yaml zlib + ]; + executableHaskellDepends = [ + base http-client http-client-tls optparse-applicative + optparse-simple stackage-cli system-filepath text + ]; + testHaskellDepends = [ + base Cabal classy-prelude-conduit containers hspec http-client + http-client-tls QuickCheck text yaml + ]; + homepage = "https://github.com/fpco/stackage"; + description = "Tools for curating Stackage bundles"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stackage-install_0_1_0_3" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , cryptohash, directory, filepath, http-client, http-client-tls @@ -180945,7 +182447,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stackage-types" = callPackage + "stackage-types_1_1_0" = callPackage ({ mkDerivation, aeson, base, Cabal, containers, exceptions , hashable, safe, semigroups, text, time, unordered-containers , vector @@ -180961,6 +182463,25 @@ self: { homepage = "https://github.com/fpco/stackage-types"; description = "Shared data types between various Stackage packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "stackage-types" = callPackage + ({ mkDerivation, aeson, base, Cabal, containers, exceptions + , hashable, safe, semigroups, text, time, unordered-containers + , vector + }: + mkDerivation { + pname = "stackage-types"; + version = "1.2.0"; + sha256 = "c00255049aa5aac04bb67372cea26feadc4f38442cedbe7035d611baa2edf4cb"; + libraryHaskellDepends = [ + aeson base Cabal containers exceptions hashable safe semigroups + text time unordered-containers vector + ]; + homepage = "https://github.com/fpco/stackage-types"; + description = "Shared data types between various Stackage packages"; + license = stdenv.lib.licenses.mit; }) {}; "stackage-update_0_1_1_1" = callPackage @@ -181159,11 +182680,10 @@ self: { ({ mkDerivation, base, checkers, mtl, QuickCheck }: mkDerivation { pname = "state-plus"; - version = "0.1.1"; - sha256 = "e191eef939e409e3684352435f07c918055293013015faaa08f8ee5f7d26ec27"; + version = "0.1.2"; + sha256 = "c6ed155137d40262bf8aa38155bd93ecdc4bdbcb4ac83f5b980eeb8545ee377d"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base checkers mtl QuickCheck ]; - jailbreak = true; description = "MonadPlus for StateT"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -181244,7 +182764,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "statestack" = callPackage + "statestack_0_2_0_4" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { pname = "statestack"; @@ -181255,6 +182775,20 @@ self: { ]; description = "Simple State-like monad transformer with saveable and restorable state"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "statestack" = callPackage + ({ mkDerivation, base, mtl, transformers, transformers-compat }: + mkDerivation { + pname = "statestack"; + version = "0.2.0.5"; + sha256 = "f4eadcf9b08c14cb084436f81e16edf78d6eeda77a3f93e38ba5d7e263ea5f66"; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + description = "Simple State-like monad transformer with saveable and restorable state"; + license = stdenv.lib.licenses.bsd3; }) {}; "statethread" = callPackage @@ -182382,12 +183916,14 @@ self: { }) {}; "storable-tuple" = callPackage - ({ mkDerivation, base, storable-record, utility-ht }: + ({ mkDerivation, base, base-orphans, storable-record, utility-ht }: mkDerivation { pname = "storable-tuple"; - version = "0.0.3.1"; - sha256 = "d6f035e56e7a786dc1b0fdf820260a55fec16cf8df486f9fc5ecadb13f583585"; - libraryHaskellDepends = [ base storable-record utility-ht ]; + version = "0.0.3.2"; + sha256 = "35d3f35bbffc9acc1f81e5718cfac59d6d86ac229c740f6dde22f2374b5e8982"; + libraryHaskellDepends = [ + base base-orphans storable-record utility-ht + ]; homepage = "http://code.haskell.org/~thielema/storable-tuple/"; description = "Storable instance for pairs and triples"; license = stdenv.lib.licenses.bsd3; @@ -182877,14 +184413,13 @@ self: { }: mkDerivation { pname = "streaming-utils"; - version = "0.1.4.1"; - sha256 = "f38fd329658f5d1e2f8aa720c5266458cffa58d744cbc6d93c208599c414e78a"; + version = "0.1.4.2"; + sha256 = "7a672d1a52b424e0a2ef53e04ca8d0776f41fda6db223d6d989895f9357eaa61"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-client http-client-tls json-stream mtl pipes resourcet streaming streaming-bytestring transformers ]; - jailbreak = true; homepage = "https://github.com/michaelt/streaming-utils"; description = "http, attoparsec, pipes and conduit utilities for the streaming libraries"; license = stdenv.lib.licenses.bsd3; @@ -183342,7 +184877,6 @@ self: { aeson base bytestring mtl text time transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/dmjio/stripe-haskell"; description = "Stripe API for Haskell - Pure Core"; license = stdenv.lib.licenses.mit; @@ -183372,7 +184906,6 @@ self: { aeson base bytestring HsOpenSSL http-streams io-streams stripe-core text ]; - jailbreak = true; doCheck = false; description = "Stripe API for Haskell - http-streams backend"; license = stdenv.lib.licenses.mit; @@ -184478,7 +186011,7 @@ self: { license = "unknown"; }) {}; - "swagger2" = callPackage + "swagger2_1_1_1" = callPackage ({ mkDerivation, aeson, aeson-qq, base, containers, doctest, Glob , hashable, hspec, http-media, HUnit, lens, mtl, network , QuickCheck, scientific, text, time, unordered-containers, vector @@ -184498,6 +186031,29 @@ self: { homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "swagger2" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, containers, doctest, Glob + , hashable, hspec, http-media, HUnit, lens, mtl, network + , QuickCheck, scientific, text, time, unordered-containers, vector + }: + mkDerivation { + pname = "swagger2"; + version = "1.2.1"; + sha256 = "4eba65057202562d1f57bb10dad930f4cf6e4521c414005afb83213b3901d6d9"; + libraryHaskellDepends = [ + aeson base containers hashable http-media lens mtl network + scientific text time unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base containers doctest Glob hspec HUnit lens + QuickCheck text unordered-containers vector + ]; + homepage = "https://github.com/GetShopTV/swagger2"; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; }) {}; "swapper" = callPackage @@ -184578,8 +186134,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.9.1.5"; - sha256 = "37e2fe2e0bba49c23c20118821a5b274da676783b79731919d1d9a9f63b28571"; + version = "0.9.1.7"; + sha256 = "f816c8e7e6b264043ac7d6d8572e74aedbf3c455907fc6ab6d077d2f47893b80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186129,8 +187685,8 @@ self: { pname = "tagged-exception-core"; version = "2.1.0.0"; sha256 = "5d31398c2780363254d7593b3b3ece476e6114cc92a811aab7bb38b3301080f0"; - revision = "1"; - editedCabalFile = "8f3f0eba857169c03927f8605ed326b7a4a5395582aeac4edcee44369b4c9689"; + revision = "2"; + editedCabalFile = "da217c59c330c63984c85be6a669d1c5c990985fa8911ea537087823a45bb8cf"; libraryHaskellDepends = [ base exceptions mmorph mtl transformers ]; @@ -186680,7 +188236,6 @@ self: { array base bytestring bytestring-handle containers deepseq directory filepath QuickCheck tasty tasty-quickcheck time ]; - doCheck = false; description = "Reading, writing and manipulating \".tar\" archive files."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -186777,6 +188332,8 @@ self: { pname = "tasty"; version = "0.10.1"; sha256 = "855699f3b1d7bc8aea5b10345eaa5550064f994b059aa23543753814c0810ad1"; + revision = "1"; + editedCabalFile = "5299d4b3a7175fa19834ad139198e934bca6285439fd3f4d2b91888b2b58ae42"; libraryHaskellDepends = [ ansi-terminal async base containers deepseq mtl optparse-applicative regex-tdfa-rc stm tagged time unbounded-delays @@ -186796,6 +188353,8 @@ self: { pname = "tasty"; version = "0.10.1.1"; sha256 = "360f64d2aa94a36279cebe485f7a7b38be0f9a649d11523f29fd844c0bad7dbd"; + revision = "1"; + editedCabalFile = "e506d7dd9e4d4897508b67e88af1ead3c795f1d8d8d2aa68e02c11e59507f78c"; libraryHaskellDepends = [ ansi-terminal async base containers deepseq mtl optparse-applicative regex-tdfa-rc stm tagged time unbounded-delays @@ -187321,7 +188880,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tasty-silver" = callPackage + "tasty-silver_3_1_8" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit @@ -187343,6 +188902,31 @@ self: { homepage = "https://github.com/phile314/tasty-silver"; description = "A fancy test runner, including support for golden tests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tasty-silver" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit + , temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.1.8.1"; + sha256 = "0dc1bcced319abc9984aa8e61c4bb88c30279f1b87d4d4e0f368eade99525fb0"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + stm tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + transformers + ]; + homepage = "https://github.com/phile314/tasty-silver"; + description = "A fancy test runner, including support for golden tests"; + license = stdenv.lib.licenses.mit; }) {}; "tasty-smallcheck_0_8_0_1" = callPackage @@ -187603,7 +189187,6 @@ self: { libraryHaskellDepends = [ aeson base bytestring data-default http-conduit url utf8-string ]; - jailbreak = true; description = "Telegram API client"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -187650,7 +189233,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tellbot" = callPackage + "tellbot_0_6_0_10" = callPackage ({ mkDerivation, base, bifunctors, bytestring, containers , http-conduit, mtl, network, regex-pcre, split, tagsoup, text , time, transformers @@ -187665,12 +189248,14 @@ self: { base bifunctors bytestring containers http-conduit mtl network regex-pcre split tagsoup text time transformers ]; + jailbreak = true; homepage = "https://github.com/phaazon/tellbot"; description = "IRC tellbot"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tellbot_0_6_0_11" = callPackage + "tellbot" = callPackage ({ mkDerivation, base, bifunctors, bytestring, containers , http-conduit, mtl, network, regex-pcre, split, tagsoup, text , time, transformers @@ -187688,7 +189273,6 @@ self: { homepage = "https://github.com/phaazon/tellbot"; description = "IRC tellbot"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template" = callPackage @@ -188641,15 +190225,14 @@ self: { }: mkDerivation { pname = "test-simple"; - version = "0.1.7"; - sha256 = "6a36da295bc9b96dc3c669acbc47b1004e8d16e68276a887c5410eb177093edd"; + version = "0.1.8"; + sha256 = "8e8bacb6299e82d1f3f3643144e24ce574b99b2f052bd630930a4c2e62267895"; libraryHaskellDepends = [ base mtl QuickCheck state-plus template-haskell ]; testHaskellDepends = [ base executable-path mtl process QuickCheck ]; - jailbreak = true; description = "Simple Perl inspired testing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -189962,6 +191545,8 @@ self: { pname = "th-desugar"; version = "1.4.2"; sha256 = "69a10e29337f68af0a97776cf7a7ecb0a49a8a79d5dcab53b5f772d1259c809a"; + revision = "1"; + editedCabalFile = "1ec55cb7234a4e2b229484198407fc76df4b40512df6097b07ae252a0c522b32"; libraryHaskellDepends = [ base containers mtl syb template-haskell ]; @@ -189969,6 +191554,7 @@ self: { base containers hspec HUnit mtl syb template-haskell ]; doHaddock = false; + jailbreak = true; doCheck = false; homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; description = "Functions to desugar Template Haskell"; @@ -189984,12 +191570,15 @@ self: { pname = "th-desugar"; version = "1.4.2.1"; sha256 = "59f27b6a076f71f02bb1688bd0dd078e093cb83463dc9cd1ba83eabd619047fb"; + revision = "1"; + editedCabalFile = "c7e3641a1eeafc122866550771d0e1802079d394aadfd9b52ec4eba4cce42bd5"; libraryHaskellDepends = [ base containers mtl syb template-haskell ]; testHaskellDepends = [ base containers hspec HUnit mtl syb template-haskell ]; + jailbreak = true; doCheck = false; homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; description = "Functions to desugar Template Haskell"; @@ -190260,12 +191849,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "th-lift" = callPackage + "th-lift_0_7_5" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { pname = "th-lift"; version = "0.7.5"; sha256 = "f3d483f1f85556e0be70b3c4f6570bb2828cda68a83b9d0a70f035c8c29cad8f"; + revision = "1"; + editedCabalFile = "89d1cfba7e4a65b09078476bbbd2a0d0e843922ca8d17885fd63d9ace06c25cc"; + libraryHaskellDepends = [ base ghc-prim template-haskell ]; + testHaskellDepends = [ base ghc-prim template-haskell ]; + homepage = "http://github.com/mboes/th-lift"; + description = "Derive Template Haskell's Lift class for datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "th-lift" = callPackage + ({ mkDerivation, base, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-lift"; + version = "0.7.6"; + sha256 = "326a2c9dac32506d5b7e5d9f3234c0e7a33a612256e4745bfb8de5a32803ecd1"; libraryHaskellDepends = [ base ghc-prim template-haskell ]; testHaskellDepends = [ base ghc-prim template-haskell ]; homepage = "http://github.com/mboes/th-lift"; @@ -190418,7 +192023,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "th-reify-many" = callPackage + "th-reify-many_0_1_3" = callPackage ({ mkDerivation, base, containers, mtl, safe, template-haskell , th-expand-syns }: @@ -190433,6 +192038,24 @@ self: { homepage = "http://github.com/mgsloan/th-reify-many"; description = "Recurseively reify template haskell datatype info"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "th-reify-many" = callPackage + ({ mkDerivation, base, containers, mtl, safe, template-haskell + , th-expand-syns + }: + mkDerivation { + pname = "th-reify-many"; + version = "0.1.4"; + sha256 = "6de5daac837af9d845bb2bbd302db35109b5d20ae298c5ee35eb3c7889850c42"; + libraryHaskellDepends = [ + base containers mtl safe template-haskell th-expand-syns + ]; + testHaskellDepends = [ base template-haskell ]; + homepage = "http://github.com/mgsloan/th-reify-many"; + description = "Recurseively reify template haskell datatype info"; + license = stdenv.lib.licenses.bsd3; }) {}; "th-sccs" = callPackage @@ -190560,7 +192183,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "these" = callPackage + "these_0_6_2_0" = callPackage ({ mkDerivation, base, bifunctors, containers, data-default-class , hashable, mtl, profunctors, QuickCheck, quickcheck-instances , semigroupoids, semigroups, tasty, tasty-quickcheck, transformers @@ -190570,6 +192193,33 @@ self: { pname = "these"; version = "0.6.2.0"; sha256 = "9802c398812396525789156b39e23dcb03fe3d218d588f33700386897993bee7"; + revision = "1"; + editedCabalFile = "3eb49900e4884ffe0296f8fb963b2cbf078f2ee368509c8e51a7304a7bdb5681"; + libraryHaskellDepends = [ + base bifunctors containers data-default-class hashable mtl + profunctors semigroupoids semigroups transformers + transformers-compat unordered-containers vector + ]; + testHaskellDepends = [ + base bifunctors containers hashable QuickCheck quickcheck-instances + tasty tasty-quickcheck transformers unordered-containers vector + ]; + homepage = "https://github.com/isomorphism/these"; + description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "these" = callPackage + ({ mkDerivation, base, bifunctors, containers, data-default-class + , hashable, mtl, profunctors, QuickCheck, quickcheck-instances + , semigroupoids, semigroups, tasty, tasty-quickcheck, transformers + , transformers-compat, unordered-containers, vector + }: + mkDerivation { + pname = "these"; + version = "0.6.2.1"; + sha256 = "41dd6403ec489deef66632fcae4cd058f636badb162aedff7c8b4930affb99bb"; libraryHaskellDepends = [ base bifunctors containers data-default-class hashable mtl profunctors semigroupoids semigroups transformers @@ -191381,6 +193031,8 @@ self: { pname = "time-parsers"; version = "0.1.0.0"; sha256 = "e4eb246c3d97e69785a26ecd91381b4cf80e4d1d4313381ad68861b7e72ccff8"; + revision = "1"; + editedCabalFile = "57e4187d557fd911e5578d0daf7ccc5734bb968820e211c1a3c64c291b423132"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit @@ -191957,6 +193609,7 @@ self: { aeson attoparsec base errors text unordered-containers vector ]; testHaskellDepends = [ aeson base hspec vector ]; + jailbreak = true; homepage = "https://github.com/llhotka/tiphys"; description = "Navigating and editing JSON data"; license = stdenv.lib.licenses.bsd3; @@ -193002,12 +194655,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "transformers_0_5_0_2" = callPackage + "transformers_0_5_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.5.0.2"; - sha256 = "3fb9c00cae4b0531a05d29c8d21de775352b97c8ab1091f35e9acdbee28facc6"; + version = "0.5.1.0"; + sha256 = "d1bd8fefc1bb73ac3bad35ade9af0919bed2be6d6734cdf959d9a31ba1e70cdd"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -193884,7 +195537,6 @@ self: { filepath hashable haskeline JuicyPixels mtl parsec process random template-haskell time vector yaml ]; - jailbreak = true; homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; license = stdenv.lib.licenses.mit; @@ -193908,7 +195560,6 @@ self: { filepath hashable haskeline JuicyPixels mtl parsec process random template-haskell time vector yaml ]; - jailbreak = true; homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; license = stdenv.lib.licenses.mit; @@ -194593,22 +196244,20 @@ self: { }) {}; "twitch" = callPackage - ({ mkDerivation, base, data-default, directory, fsnotify, Glob - , hspec, optparse-applicative, QuickCheck, system-fileio - , system-filepath, time, transformers + ({ mkDerivation, base, data-default, directory, filepath, fsnotify + , Glob, hspec, optparse-applicative, time, transformers }: mkDerivation { pname = "twitch"; - version = "0.1.6.1"; - sha256 = "53d566864c4467f9937e7c70707b8f475dbdb38fd51f85015871a82aa7657c43"; + version = "0.1.7.0"; + sha256 = "45579aee9ce53f729477a378320bc37755e9daf146df8297db0ed8cbf056fb36"; libraryHaskellDepends = [ - base data-default directory fsnotify Glob optparse-applicative - system-fileio system-filepath time transformers + base data-default directory filepath fsnotify Glob + optparse-applicative time transformers ]; testHaskellDepends = [ - base data-default directory fsnotify Glob hspec - optparse-applicative QuickCheck system-fileio system-filepath time - transformers + base data-default directory filepath fsnotify Glob hspec + optparse-applicative time transformers ]; homepage = "https://github.com/jfischoff/twitch"; description = "A high level file watcher DSL"; @@ -194727,7 +196376,6 @@ self: { testHaskellDepends = [ base containers HUnit test-framework test-framework-hunit ]; - jailbreak = true; homepage = "https://github.com/stackbuilders/twitter-feed"; description = "Client for fetching Twitter timeline via Oauth"; license = stdenv.lib.licenses.mit; @@ -195532,7 +197180,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "typelits-witnesses" = callPackage + "typelits-witnesses_0_1_1_0" = callPackage ({ mkDerivation, base, constraints, reflection }: mkDerivation { pname = "typelits-witnesses"; @@ -195542,6 +197190,19 @@ self: { homepage = "https://github.com/mstksg/typelits-witnesses"; description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "typelits-witnesses" = callPackage + ({ mkDerivation, base, constraints, reflection }: + mkDerivation { + pname = "typelits-witnesses"; + version = "0.2.0.0"; + sha256 = "e4119460d139dde387863da5b1169d8f5213ff03c5487e35189015c701b0c362"; + libraryHaskellDepends = [ base constraints reflection ]; + homepage = "https://github.com/mstksg/typelits-witnesses"; + description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; + license = stdenv.lib.licenses.mit; }) {}; "typeof" = callPackage @@ -195868,6 +197529,8 @@ self: { pname = "uhc-light"; version = "1.1.9.2"; sha256 = "f77b28c6e49fd36bb5369714283d72d37b8dc2f90b444e5789a5503e864d0ee7"; + revision = "1"; + editedCabalFile = "9281e38cd36593fbdd779caa5c3e678b4d4f967f496b5d3df5d55b1cd5a8a85f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195880,6 +197543,7 @@ self: { hashable mtl network old-locale primitive process syb transformers uhc-util uulib vector ]; + jailbreak = true; homepage = "https://github.com/UU-ComputerScience/uhc"; description = "Part of UHC packaged as cabal/hackage installable library"; license = stdenv.lib.licenses.bsd3; @@ -195894,10 +197558,13 @@ self: { pname = "uhc-util"; version = "0.1.6.3"; sha256 = "6d64396e186a2a05a5f3a0ace58b768e83e9655b22ab3fde42d0154152358046"; + revision = "1"; + editedCabalFile = "eedc35cfdb41a84edc0a70661797a7ea98684f7b30a506309d40975370f55c0a"; libraryHaskellDepends = [ array base binary bytestring containers directory fclabels fgl hashable mtl process syb time time-compat uulib ]; + jailbreak = true; homepage = "https://github.com/UU-ComputerScience/uhc-util"; description = "UHC utilities"; license = stdenv.lib.licenses.bsd3; @@ -196781,6 +198448,8 @@ self: { pname = "universe-instances-extended"; version = "1.0.0.1"; sha256 = "665b272701b16a6bb8d40a5396aa1dcb038f002452ebdc29d353e3be2070c997"; + revision = "1"; + editedCabalFile = "19250a2533aa23a84169d72218dc3f5a055253a866901bb78853fb2b271951db"; libraryHaskellDepends = [ adjunctions base comonad universe-instances-base void ]; @@ -196797,6 +198466,8 @@ self: { pname = "universe-instances-trans"; version = "1.0.0.1"; sha256 = "0d047cf1eb4af9f2052f44f487e7d2d44c86f51b54a3cc1fc5243ad816e8310e"; + revision = "1"; + editedCabalFile = "c96cbeb4bf0240bbe09476ca360e9d35cb07cb0af4324bfbfa5cce55df7a9c35"; libraryHaskellDepends = [ base mtl transformers universe-base universe-instances-base ]; @@ -197285,6 +198956,7 @@ self: { units-parser ]; testHaskellDepends = [ base tasty tasty-hunit ]; + jailbreak = true; homepage = "https://github.com/adamgundry/uom-plugin"; description = "Units of measure as a GHC typechecker plugin"; license = stdenv.lib.licenses.bsd3; @@ -199908,8 +201580,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.1.0"; sha256 = "30dfe03ef275d327006396c2de14a625acb067596156e48748756e388cec1e65"; - revision = "1"; - editedCabalFile = "5c71ff12b57058a0bb8f9dd2db98e705618bfbb6b1fa2181025a669a41f78d82"; + revision = "2"; + editedCabalFile = "ca09cfbd155faf95ea8bccab39ce28368e70b473fa2249a0c44b308cea8ecb3a"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -199923,8 +201595,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.1.2"; sha256 = "0df696462d424bab569cc7a8ba1b1d0057bc5a71c510567fe5bcd1a940ae4d05"; - revision = "1"; - editedCabalFile = "bddeef74d6aab09ec3f1b5c9781f96b4a92f6f1234836cbaff78a493e73ca1fa"; + revision = "2"; + editedCabalFile = "8818c78bc7bb1b72b6963416e90c75e4eea18b7f7dd367a2a33d742f5b55f46d"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; jailbreak = true; @@ -199939,6 +201611,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.1.3"; sha256 = "33db750d3d867f23d0406a7165952b030831ed610b06ef777cfae8439b382689"; + revision = "1"; + editedCabalFile = "45fb308090cd50c13a24b46c0eef6bb9afcbf82fdcf944e3dc9bba27c63d5868"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -200004,6 +201678,7 @@ self: { testHaskellDepends = [ aeson base containers hspec unordered-containers vector verdict ]; + jailbreak = true; description = "JSON instances and JSON Schema for verdict"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -200266,6 +201941,7 @@ self: { version = "0.2.0.2"; sha256 = "e38f74e57ef29514c3e655f9ae6415e6005c971a46504c1859b5ba602672297c"; libraryHaskellDepends = [ base contravariant transformers vinyl ]; + jailbreak = true; homepage = "https://github.com/marcinmrotek/vinyl-utils"; description = "Utilities for vinyl"; license = stdenv.lib.licenses.bsd3; @@ -200316,8 +201992,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "visibility"; - version = "0.1.0.1"; - sha256 = "5218ceb6f0e6e396a67721e88f00392f9348f59ade898f1a07bee08f920bc434"; + version = "0.1.0.2"; + sha256 = "a4c32de7a4e069f97b3b6248c5cd81013a2ae6a6aa1d5b6bef8130f1245f2a28"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/LukaHorvat/visibility"; description = "Simple computation of visibility polygons"; @@ -200828,7 +202504,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai" = callPackage + "wai_3_0_5_0" = callPackage ({ mkDerivation, base, blaze-builder, bytestring , bytestring-builder, hspec, http-types, network, text , transformers, unix-compat, vault @@ -200845,9 +202521,10 @@ self: { homepage = "https://github.com/yesodweb/wai"; description = "Web Application Interface"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai_3_2_0" = callPackage + "wai" = callPackage ({ mkDerivation, base, blaze-builder, bytestring , bytestring-builder, hspec, http-types, network, text , transformers, vault @@ -200864,7 +202541,6 @@ self: { homepage = "https://github.com/yesodweb/wai"; description = "Web Application Interface"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-accept-language" = callPackage @@ -200913,7 +202589,6 @@ self: { base bytestring conduit conduit-extra directory doctest filepath hspec HTTP http-types unix wai warp ]; - jailbreak = true; homepage = "http://www.mew.org/~kazu/proj/mighttpd/"; description = "File/CGI/Rev Proxy App of WAI"; license = stdenv.lib.licenses.bsd3; @@ -201170,6 +202845,7 @@ self: { base bytestring hspec http-date http-types mime-types network old-locale text time transformers unix-compat wai wai-extra zlib ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "WAI application for static serving"; license = stdenv.lib.licenses.mit; @@ -201207,6 +202883,7 @@ self: { network old-locale temporary text time transformers unix-compat wai wai-extra zlib ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "WAI application for static serving"; license = stdenv.lib.licenses.mit; @@ -201244,6 +202921,7 @@ self: { network old-locale temporary text time transformers unix-compat wai wai-extra zlib ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "WAI application for static serving"; license = stdenv.lib.licenses.mit; @@ -201281,6 +202959,7 @@ self: { network old-locale temporary text time transformers unix-compat wai wai-extra zlib ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "WAI application for static serving"; license = stdenv.lib.licenses.mit; @@ -201334,6 +203013,7 @@ self: { libraryHaskellDepends = [ base blaze-builder bytestring conduit http-types transformers wai ]; + jailbreak = true; homepage = "https://github.com/yesodweb/wai"; description = "conduit wrappers for WAI"; license = stdenv.lib.licenses.mit; @@ -201351,6 +203031,7 @@ self: { libraryHaskellDepends = [ base blaze-builder bytestring conduit http-types transformers wai ]; + jailbreak = true; homepage = "https://github.com/yesodweb/wai"; description = "conduit wrappers for WAI"; license = stdenv.lib.licenses.mit; @@ -201860,6 +203541,7 @@ self: { base blaze-builder bytestring case-insensitive cookie fast-logger hspec http-types HUnit resourcet text time transformers wai zlib ]; + jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; @@ -201889,6 +203571,7 @@ self: { base blaze-builder bytestring case-insensitive cookie fast-logger hspec http-types HUnit resourcet text time transformers wai zlib ]; + jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; @@ -201919,6 +203602,7 @@ self: { base blaze-builder bytestring case-insensitive cookie fast-logger hspec http-types HUnit resourcet text time transformers wai zlib ]; + jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; @@ -201949,6 +203633,7 @@ self: { base blaze-builder bytestring case-insensitive cookie fast-logger hspec http-types HUnit resourcet text time transformers wai zlib ]; + jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; @@ -201979,6 +203664,7 @@ self: { base blaze-builder bytestring case-insensitive cookie fast-logger hspec http-types HUnit resourcet text time transformers wai zlib ]; + jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; @@ -202140,6 +203826,7 @@ self: { base blaze-builder bytestring http-types process streaming-commons transformers wai warp ]; + jailbreak = true; description = "Launch a web app in the default browser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -202524,7 +204211,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "wai-middleware-content-type" = callPackage + "wai-middleware-content-type_0_2_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring , clay, exceptions, hashable, hspec, hspec-wai, http-media , http-types, lucid, mmorph, monad-control, monad-logger, mtl @@ -202551,6 +204238,37 @@ self: { shakespeare tasty tasty-hspec text transformers transformers-base unordered-containers urlpath wai wai-transformers warp ]; + jailbreak = true; + description = "Route to different middlewares based on the incoming Accept header"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-middleware-content-type" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring + , clay, exceptions, hashable, 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, unordered-containers + , urlpath, wai, wai-transformers, warp + }: + mkDerivation { + pname = "wai-middleware-content-type"; + version = "0.3.0"; + sha256 = "2fadb84ee1f8a25d3e3d4f07bb8c92056eccf8bd3c0dabadb0a860653407f7c4"; + libraryHaskellDepends = [ + aeson base blaze-builder blaze-html bytestring clay exceptions + hashable http-media http-types lucid mmorph monad-control + monad-logger mtl pandoc resourcet shakespeare text transformers + transformers-base unordered-containers urlpath wai wai-transformers + ]; + testHaskellDepends = [ + aeson base blaze-builder blaze-html bytestring clay exceptions + hashable 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 + unordered-containers urlpath wai wai-transformers warp + ]; description = "Route to different middlewares based on the incoming Accept header"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -203094,6 +204812,7 @@ self: { base bytestring http-types mtl QuickCheck tasty tasty-quickcheck wai ]; + jailbreak = true; description = "Minimalistic, efficient routing for WAI"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -203177,7 +204896,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-routes" = callPackage + "wai-routes_0_9_5" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, containers, cookie, data-default-class , filepath, hspec, hspec-wai, hspec-wai-json, http-types @@ -203200,6 +204919,32 @@ self: { homepage = "https://ajnsit.github.io/wai-routes/"; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-routes" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, containers, cookie, data-default-class + , filepath, hspec, hspec-wai, hspec-wai-json, http-types + , mime-types, monad-loops, mtl, path-pieces, random + , template-haskell, text, vault, wai, wai-app-static, wai-extra + }: + mkDerivation { + pname = "wai-routes"; + version = "0.9.6"; + sha256 = "347725c4e42cca525b376ea7a5017c3aaa55c15af73b600e597aee2d98f0b80b"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive containers + cookie data-default-class filepath http-types mime-types + monad-loops mtl path-pieces random template-haskell text vault wai + wai-app-static wai-extra + ]; + testHaskellDepends = [ + aeson base hspec hspec-wai hspec-wai-json text wai + ]; + homepage = "https://ajnsit.github.io/wai-routes/"; + description = "Typesafe URLs for Wai applications"; + license = stdenv.lib.licenses.mit; }) {}; "wai-routing_0_12_1" = callPackage @@ -203318,6 +205063,7 @@ self: { testHaskellDepends = [ base bytestring data-default postgresql-simple text wai-session ]; + jailbreak = true; doCheck = false; homepage = "https://github.com/hce/postgresql-session#readme"; description = "PostgreSQL backed Wai session store"; @@ -203579,6 +205325,7 @@ self: { http-types network text transformers wai wai-app-static warp websockets ]; + jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "Provide a bridge betweeen WAI and the websockets package"; license = stdenv.lib.licenses.mit; @@ -203605,6 +205352,7 @@ self: { http-types network text transformers wai wai-app-static warp websockets ]; + jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "Provide a bridge between WAI and the websockets package"; license = stdenv.lib.licenses.mit; @@ -203631,6 +205379,7 @@ self: { http-types network text transformers wai wai-app-static warp websockets ]; + jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "Provide a bridge between WAI and the websockets package"; license = stdenv.lib.licenses.mit; @@ -204416,7 +206165,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "warp" = callPackage + "warp_3_1_12" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, bytestring-builder, case-insensitive, containers , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date @@ -204443,13 +206192,15 @@ self: { streaming-commons text time transformers unix unix-compat unordered-containers vault wai word8 ]; + jailbreak = true; doCheck = false; homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "warp_3_2_2" = callPackage + "warp" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, bytestring-builder, case-insensitive, containers , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date @@ -204475,11 +206226,10 @@ self: { streaming-commons text time transformers unix unix-compat vault wai word8 ]; - jailbreak = true; + doCheck = false; homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -204744,6 +206494,7 @@ self: { base bytestring cprng-aes data-default-class network streaming-commons tls wai warp ]; + jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "HTTP over TLS support for Warp via the TLS package"; license = stdenv.lib.licenses.mit; @@ -204762,6 +206513,7 @@ self: { base bytestring cprng-aes data-default-class network streaming-commons tls wai warp ]; + jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "HTTP over TLS support for Warp via the TLS package"; license = stdenv.lib.licenses.mit; @@ -204780,6 +206532,7 @@ self: { base bytestring cprng-aes data-default-class network streaming-commons tls wai warp ]; + jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "HTTP over TLS support for Warp via the TLS package"; license = stdenv.lib.licenses.mit; @@ -204798,6 +206551,26 @@ self: { base bytestring cprng-aes data-default-class network streaming-commons tls wai warp ]; + jailbreak = true; + homepage = "http://github.com/yesodweb/wai"; + description = "HTTP over TLS support for Warp via the TLS package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "warp-tls_3_1_5" = callPackage + ({ mkDerivation, base, bytestring, cprng-aes, data-default-class + , network, streaming-commons, tls, wai, warp + }: + mkDerivation { + pname = "warp-tls"; + version = "3.1.5"; + sha256 = "abb057ba735e455c354837f5daf07ea2c0274d8edfb7d39ac48412a6ebb9759f"; + libraryHaskellDepends = [ + base bytestring cprng-aes data-default-class network + streaming-commons tls wai warp + ]; + jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "HTTP over TLS support for Warp via the TLS package"; license = stdenv.lib.licenses.mit; @@ -204805,23 +206578,6 @@ self: { }) {}; "warp-tls" = callPackage - ({ mkDerivation, base, bytestring, cprng-aes, data-default-class - , network, streaming-commons, tls, wai, warp - }: - mkDerivation { - pname = "warp-tls"; - version = "3.1.5"; - sha256 = "abb057ba735e455c354837f5daf07ea2c0274d8edfb7d39ac48412a6ebb9759f"; - libraryHaskellDepends = [ - base bytestring cprng-aes data-default-class network - streaming-commons tls wai warp - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "HTTP over TLS support for Warp via the TLS package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp-tls_3_2_0" = callPackage ({ mkDerivation, base, bytestring, cprng-aes, data-default-class , network, streaming-commons, tls, wai, warp }: @@ -204833,11 +206589,9 @@ self: { base bytestring cprng-aes data-default-class network streaming-commons tls wai warp ]; - jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "HTTP over TLS support for Warp via the TLS package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-tls-uid" = callPackage @@ -205332,29 +207086,24 @@ self: { }) {}; "webapp" = callPackage - ({ mkDerivation, alex, attoparsec, base, base16-bytestring - , 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, aeson, base, base16-bytestring, blaze-builder + , bytestring, case-insensitive, http-types, mtl, network + , optparse-applicative, regex-posix, stm, streaming-commons, text + , transformers, unix, wai, warp, warp-tls, zlib }: mkDerivation { pname = "webapp"; - version = "0.1.2"; - sha256 = "90d46c20134075352f6626509d01bd51d6862ef6c4509e524f299205e1063d0c"; + version = "0.2.0"; + sha256 = "47c0e2d790cc43318241764b73be95f53d651afcbfb9c9e7e7e1fe3348ff7572"; libraryHaskellDepends = [ - attoparsec base base16-bytestring 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 + aeson base base16-bytestring blaze-builder bytestring + case-insensitive http-types mtl network optparse-applicative + regex-posix stm streaming-commons text transformers unix wai warp + warp-tls zlib ]; - libraryToolDepends = [ alex happy ]; jailbreak = true; homepage = "https://github.com/fhsjaagshs/webapp"; - description = "Haskell web scaffolding using Scotty, WAI, and Warp"; + description = "Haskell web app framework based on WAI & Warp"; license = stdenv.lib.licenses.mit; }) {}; @@ -206278,6 +208027,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "werewolf" = callPackage + ({ mkDerivation, aeson, base, containers, directory, extra + , filepath, lens, MonadRandom, mtl, optparse-applicative + , QuickCheck, random-shuffle, tasty, tasty-quickcheck, text + , transformers + }: + mkDerivation { + pname = "werewolf"; + version = "0.3.3.2"; + sha256 = "828d060f58e92ce91f22e9b732abe5f8058a0592e701d4baf2abdd207b475440"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers directory extra filepath lens MonadRandom mtl + random-shuffle text transformers + ]; + executableHaskellDepends = [ + aeson base directory extra filepath lens mtl optparse-applicative + text transformers + ]; + testHaskellDepends = [ + base containers extra lens mtl QuickCheck tasty tasty-quickcheck + text + ]; + homepage = "https://github.com/hjwylde/werewolf"; + description = "A game engine for running werewolf in a chat client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wheb-mongo" = callPackage ({ mkDerivation, base, bson, mongoDB, mtl, text, Wheb }: mkDerivation { @@ -206407,6 +208185,7 @@ self: { monadLib pretty pretty-show profunctors text ]; libraryToolDepends = [ alex happy ]; + jailbreak = true; description = "Haskell support for the Why3 input format"; license = stdenv.lib.licenses.mit; }) {}; @@ -210718,7 +212497,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libyaml;}; - "yaml" = callPackage + "yaml_0_8_15_2" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat , bytestring, conduit, containers, directory, enclosed-exceptions , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific @@ -210745,6 +212524,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.3"; + sha256 = "f90444f327d8bbcbcab7a99bacbc79236528daf2a1e98aed03d146f1a2202a10"; + 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 @@ -211795,7 +213604,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-auth" = callPackage + "yesod-auth_1_4_11" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, conduit, conduit-extra @@ -211822,6 +213631,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.12"; + sha256 = "d1baf7dc08ee591fd8ba50a8e64a377a3a8d42575963b44e50ab0c145c2d9fa7"; + 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 @@ -214291,7 +216130,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-core" = callPackage + "yesod-core_1_4_18_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 @@ -214328,6 +216167,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.18.2"; + sha256 = "298088fbccd63a323a5bab689464848cacd014ea73ef845969c898a59c022d64"; + 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 @@ -217040,6 +218919,7 @@ self: { executableHaskellDepends = [ base bytestring docopt raw-strings-qq ]; + jailbreak = true; description = "Post to 0bin services"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; diff --git a/pkgs/development/haskell-modules/patches/regex-tdfa-text.patch b/pkgs/development/haskell-modules/patches/regex-tdfa-text.patch deleted file mode 100644 index ef349b1cb64..00000000000 --- a/pkgs/development/haskell-modules/patches/regex-tdfa-text.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- regex-tdfa-text-1.0.0.2/Text/Regex/TDFA/Text/Lazy.orig.hs 2015-08-05 20:30:01.228983428 +0100 -+++ regex-tdfa-text-1.0.0.2/Text/Regex/TDFA/Text/Lazy.hs 2015-08-05 20:39:25.682563005 +0100 -@@ -26,7 +26,7 @@ - import Data.Array.IArray((!),elems,amap) - import qualified Data.Text.Lazy as L(Text,empty,take,drop,uncons,unpack) - --import Text.Regex.Base(MatchArray,RegexContext(..),Extract(..),RegexMaker(..),RegexLike(..)) -+import Text.Regex.Base(MatchText,MatchArray,RegexContext(..),Extract(..),RegexMaker(..),RegexLike(..)) - import Text.Regex.Base.Impl(polymatch,polymatchM) - import Text.Regex.TDFA.ReadRegex(parseRegex) - import Text.Regex.TDFA.String() -- piggyback on RegexMaker for String -@@ -74,7 +74,8 @@ - ,after (o+l) source)) - (matchOnce regex source) - matchAllText regex source = -- let go i _ _ | i `seq` False = undefined -+ let go :: Int -> L.Text -> [MatchArray] -> [MatchText L.Text] -+ go i _ _ | i `seq` False = undefined - go _i _t [] = [] - go i t (x:xs) = - let (off0,len0) = x!0 diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 129c0ac6077..d22d3849b1b 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = fontsConf; LD_LIBRARY_PATH = libPath; - NIX_LDFLAGS = "-lgcc_s"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ]; @@ -51,8 +51,10 @@ stdenv.mkDerivation rec { cd src/build ''; - configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ] - ++ stdenv.lib.optional disableDocs [ "--disable-docs" ]; + shared = if stdenv.isDarwin then "dylib" else "shared"; + configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] + ++ stdenv.lib.optional disableDocs [ "--disable-docs" ] + ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ]; configureScript = "../configure"; @@ -78,6 +80,6 @@ stdenv.mkDerivation rec { homepage = http://racket-lang.org/; license = licenses.lgpl3; maintainers = with maintainers; [ kkallio henrytill ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix index d050faca245..c5b9fba37aa 100644 --- a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix +++ b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix @@ -18,7 +18,8 @@ # Normal gem packages can be used outside of bundler; a binstub is created in # $out/bin. -{ lib, ruby, rubygems, bundler, fetchurl, fetchgit, makeWrapper, git, buildRubyGem +{ lib, ruby, rubygems, bundler, fetchurl, fetchgit, makeWrapper, git, + buildRubyGem, darwin } @ defs: lib.makeOverridable ( @@ -85,6 +86,7 @@ stdenv.mkDerivation (attrs // { buildInputs = [ ruby rubygems makeWrapper ] ++ lib.optionals (type == "git") [ git bundler ] + ++ lib.optional stdenv.isDarwin darwin.libobjc ++ buildInputs; name = attrs.name or (namePrefix + gemName); diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb b/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb index 647b83b52c3..48ab5270c22 100644 --- a/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb +++ b/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb @@ -107,7 +107,6 @@ if spec.executables.any? spec.executables.each do |exe| wrapper = File.join(bin_dir, exe) File.open(wrapper, "w") do |f| - stub = generate_stub(spec.name, exe) f.write(<<-EOF) #!#{ruby} # diff --git a/pkgs/development/interpreters/ruby/gemconfig/default.nix b/pkgs/development/interpreters/ruby/gemconfig/default.nix index ae8c0ee6e6a..787c3be54e3 100644 --- a/pkgs/development/interpreters/ruby/gemconfig/default.nix +++ b/pkgs/development/interpreters/ruby/gemconfig/default.nix @@ -79,7 +79,6 @@ in "--with-exslt-lib=${libxslt}/lib" "--with-exslt-include=${libxslt}/include" ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; - buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; }; patron = attrs: { @@ -143,10 +142,6 @@ in ''; }; - unf_ext = attrs: { - buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; - }; - xapian-ruby = attrs: { # use the system xapian dontBuild = false; diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix index b6ac0480897..fb210ceff4b 100644 --- a/pkgs/development/interpreters/ruby/rubygems.nix +++ b/pkgs/development/interpreters/ruby/rubygems.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "rubygems-${version}"; - version = "2.4.1"; + version = "2.4.8"; src = fetchurl { url = "http://production.cf.rubygems.org/rubygems/${name}.tgz"; - sha256 = "0cpr6cx3h74ykpb0cp4p4xg7a8j0bhz3sk271jq69l4mm4zy4h4f"; + sha256 = "0pl4civyf0vhqsqbqaivvxrb3fsg8sid9a8jv5vfnk4hypz3ahss"; }; patches = [ ./gem_hook.patch ]; diff --git a/pkgs/development/libraries/aterm/aterm-mingw-asm.patch b/pkgs/development/libraries/aterm/aterm-mingw-asm.patch deleted file mode 100644 index ce09ead9042..00000000000 --- a/pkgs/development/libraries/aterm/aterm-mingw-asm.patch +++ /dev/null @@ -1,498 +0,0 @@ -diff -rc aterm-2.8/aterm/gc.c aterm-2.8-new/aterm/gc.c -*** aterm-2.8/aterm/gc.c 2008-11-10 13:54:22.000000000 +0100 ---- aterm-2.8-new/aterm/gc.c 2010-08-23 17:04:56.000000000 +0200 -*************** -*** 260,317 **** - AFun oddSym; - #endif - -- #ifdef WIN32 -- -- unsigned int r_eax, r_ebx, r_ecx, r_edx, \ -- r_esi, r_edi, r_esp, r_ebp; -- ATerm reg[8], real_term; -- -- __asm { -- /* Get the registers into local variables to check them -- for aterms later. */ -- mov r_eax, eax -- mov r_ebx, ebx -- mov r_ecx, ecx -- mov r_edx, edx -- mov r_esi, esi -- mov r_edi, edi -- mov r_esp, esp -- mov r_ebp, ebp -- } -- /* Put the register-values into an array */ -- reg[0] = (ATerm) r_eax; -- reg[1] = (ATerm) r_ebx; -- reg[2] = (ATerm) r_ecx; -- reg[3] = (ATerm) r_edx; -- reg[4] = (ATerm) r_esi; -- reg[5] = (ATerm) r_edi; -- reg[6] = (ATerm) r_esp; -- reg[7] = (ATerm) r_ebp; -- -- for(i=0; i<8; i++) { -- real_term = AT_isInsideValidTerm(reg[i]); -- if (real_term != NULL) { -- AT_markTerm(real_term); -- } -- if (AT_isValidSymbol((Symbol)reg[i])) { -- AT_markSymbol((Symbol)reg[i]); -- } -- } -- -- /* The register variables are on the stack aswell -- I set them to zero so they won't be processed again when -- the stack is traversed. The reg-array is also in the stack -- but that will be adjusted later */ -- r_eax = 0; -- r_ebx = 0; -- r_ecx = 0; -- r_edx = 0; -- r_esi = 0; -- r_edi = 0; -- r_esp = 0; -- r_ebp = 0; -- -- #else - jmp_buf env; - - /* Traverse possible register variables */ ---- 260,265 ---- -*************** -*** 320,326 **** - start = (ATerm *)((char *)env); - stop = ((ATerm *)(((char *)env) + sizeof(jmp_buf))); - mark_memory(start, stop); -- #endif - - stackTop = stack_top(); - ---- 268,273 ---- -*************** -*** 385,442 **** - AFun oddSym; - #endif - -- #ifdef WIN32 -- -- unsigned int r_eax, r_ebx, r_ecx, r_edx, \ -- r_esi, r_edi, r_esp, r_ebp; -- ATerm reg[8], real_term; -- -- __asm { -- /* Get the registers into local variables to check them -- for aterms later. */ -- mov r_eax, eax -- mov r_ebx, ebx -- mov r_ecx, ecx -- mov r_edx, edx -- mov r_esi, esi -- mov r_edi, edi -- mov r_esp, esp -- mov r_ebp, ebp -- } -- /* Put the register-values into an array */ -- reg[0] = (ATerm) r_eax; -- reg[1] = (ATerm) r_ebx; -- reg[2] = (ATerm) r_ecx; -- reg[3] = (ATerm) r_edx; -- reg[4] = (ATerm) r_esi; -- reg[5] = (ATerm) r_edi; -- reg[6] = (ATerm) r_esp; -- reg[7] = (ATerm) r_ebp; -- -- for(i=0; i<8; i++) { -- real_term = AT_isInsideValidTerm(reg[i]); -- if (real_term != NULL) { -- AT_markTerm_young(real_term); -- } -- if (AT_isValidSymbol((Symbol)reg[i])) { -- AT_markSymbol_young((Symbol)reg[i]); -- } -- } -- -- /* The register variables are on the stack aswell -- I set them to zero so they won't be processed again when -- the stack is traversed. The reg-array is also in the stack -- but that will be adjusted later */ -- r_eax = 0; -- r_ebx = 0; -- r_ecx = 0; -- r_edx = 0; -- r_esi = 0; -- r_edi = 0; -- r_esp = 0; -- r_ebp = 0; -- -- #else - jmp_buf env; - - /* Traverse possible register variables */ ---- 332,337 ---- -*************** -*** 445,451 **** - start = (ATerm *)((char *)env); - stop = ((ATerm *)(((char *)env) + sizeof(jmp_buf))); - mark_memory_young(start, stop); -- #endif - - stackTop = stack_top(); - start = MIN(stackTop, stackBot); ---- 340,345 ---- -Only in aterm-2.8-new/aterm: gc.c.orig -diff -rc aterm-2.8/configure aterm-2.8-new/configure -*** aterm-2.8/configure 2008-11-10 13:54:27.000000000 +0100 ---- aterm-2.8-new/configure 2010-08-23 17:08:10.000000000 +0200 -*************** -*** 19970,20295 **** - CURDATE=`date` - - -- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 -- if test "${ac_cv_c_bigendian+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -- else -- # See if sys/param.h defines the BYTE_ORDER macro. -- cat >conftest.$ac_ext <<_ACEOF -- /* confdefs.h. */ -- _ACEOF -- cat confdefs.h >>conftest.$ac_ext -- cat >>conftest.$ac_ext <<_ACEOF -- /* end confdefs.h. */ -- #include -- #include -- -- int -- main () -- { -- #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN -- bogus endian macros -- #endif -- -- ; -- return 0; -- } -- _ACEOF -- rm -f conftest.$ac_objext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- # It does; now see whether it defined to BIG_ENDIAN or not. -- cat >conftest.$ac_ext <<_ACEOF -- /* confdefs.h. */ -- _ACEOF -- cat confdefs.h >>conftest.$ac_ext -- cat >>conftest.$ac_ext <<_ACEOF -- /* end confdefs.h. */ -- #include -- #include -- -- int -- main () -- { -- #if BYTE_ORDER != BIG_ENDIAN -- not big endian -- #endif -- -- ; -- return 0; -- } -- _ACEOF -- rm -f conftest.$ac_objext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_c_bigendian=yes -- else -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_c_bigendian=no -- fi -- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- else -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- # It does not; compile a test program. -- if test "$cross_compiling" = yes; then -- # try to guess the endianness by grepping values into an object file -- ac_cv_c_bigendian=unknown -- cat >conftest.$ac_ext <<_ACEOF -- /* confdefs.h. */ -- _ACEOF -- cat confdefs.h >>conftest.$ac_ext -- cat >>conftest.$ac_ext <<_ACEOF -- /* end confdefs.h. */ -- short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -- short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -- void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -- short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -- short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -- void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } -- int -- main () -- { -- _ascii (); _ebcdic (); -- ; -- return 0; -- } -- _ACEOF -- rm -f conftest.$ac_objext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then -- ac_cv_c_bigendian=yes -- fi -- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then -- if test "$ac_cv_c_bigendian" = unknown; then -- ac_cv_c_bigendian=no -- else -- # finding both strings is unlikely to happen, but who knows? -- ac_cv_c_bigendian=unknown -- fi -- fi -- else -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- fi -- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- else -- cat >conftest.$ac_ext <<_ACEOF -- /* confdefs.h. */ -- _ACEOF -- cat confdefs.h >>conftest.$ac_ext -- cat >>conftest.$ac_ext <<_ACEOF -- /* end confdefs.h. */ -- int -- main () -- { -- /* Are we little or big endian? From Harbison&Steele. */ -- union -- { -- long l; -- char c[sizeof (long)]; -- } u; -- u.l = 1; -- exit (u.c[sizeof (long) - 1] == 1); -- } -- _ACEOF -- rm -f conftest$ac_exeext -- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_c_bigendian=no -- else -- echo "$as_me: program exited with status $ac_status" >&5 -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- ( exit $ac_status ) -- ac_cv_c_bigendian=yes -- fi -- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -- fi -- fi -- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- fi -- echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -- echo "${ECHO_T}$ac_cv_c_bigendian" >&6 -- case $ac_cv_c_bigendian in -- yes) -- -- cat >>confdefs.h <<\_ACEOF -- #define WORDS_BIGENDIAN 1 -- _ACEOF -- ;; -- no) -- ;; -- *) -- { { echo "$as_me:$LINENO: error: unknown endianness -- presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -- echo "$as_me: error: unknown endianness -- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} -- { (exit 1); exit 1; }; } ;; -- esac -- -- -- echo "$as_me:$LINENO: checking whether float word ordering is big endian" >&5 -- echo $ECHO_N "checking whether float word ordering is big endian... $ECHO_C" >&6 -- if test "${ax_cv_c_float_word_order_big+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -- else -- -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -- See \`config.log' for more details." >&5 -- echo "$as_me: error: cannot run test program while cross compiling -- See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- else -- cat >conftest.$ac_ext <<_ACEOF -- -- /* This code returns 0 if the float word order is big endian and >= 1 if it is little endian. */ -- main(){ -- #ifdef WORDS_BIGENDIAN -- return 0; /* If the system's encoding is big endian, so is the float word order. NOTE: If the encoding is big endian and WORDS_BIGENDIAN isn't defined, the code below will still return the correct float word order (big). */ -- #else -- union -- { -- double d; -- /* IEEE754 little endian encoded floating point number structure with little endian float word order. */ -- struct{ -- unsigned int mantissa1:32; -- unsigned int mantissa0:20; -- unsigned int exponent:11; -- unsigned int negative:1; -- } ieee; -- } u; -- u.d = -1; -- return (u.ieee.negative == 1); -- #endif -- } -- -- _ACEOF -- rm -f conftest$ac_exeext -- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ax_cv_c_float_word_order_big=yes -- else -- echo "$as_me: program exited with status $ac_status" >&5 -- echo "$as_me: failed program was:" >&5 -- sed 's/^/| /' conftest.$ac_ext >&5 -- -- ( exit $ac_status ) -- ax_cv_c_float_word_order_big=no -- fi -- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -- fi -- -- -- fi -- echo "$as_me:$LINENO: result: $ax_cv_c_float_word_order_big" >&5 -- echo "${ECHO_T}$ax_cv_c_float_word_order_big" >&6 -- -- case $ax_cv_c_float_word_order_big in -- yes) -- -- -- cat >>confdefs.h <<\_ACEOF -- #define FLOAT_WORD_ORDER_BIG 1 -- _ACEOF -- -- -- ;; -- no) -- ;; -- *) -- -- { { echo "$as_me:$LINENO: error: Unable to determain float word ordering. You need to manually preset ax_cv_c_float_word_order_big=(yes / no). -- " >&5 -- echo "$as_me: error: Unable to determain float word ordering. You need to manually preset ax_cv_c_float_word_order_big=(yes / no). -- " >&2;} -- { (exit 1); exit 1; }; } -- -- ;; -- esac -- -- - - - for ac_func in strdup ---- 19970,19975 ---- -diff -rc aterm-2.8/Makefile.in aterm-2.8-new/Makefile.in -*** aterm-2.8/Makefile.in 2008-11-10 13:54:28.000000000 +0100 ---- aterm-2.8-new/Makefile.in 2010-08-23 17:05:27.000000000 +0200 -*************** -*** 217,223 **** - - pkgconfig_DATA = ${PACKAGE}.pc - -! SUBDIRS = aterm utils test - - ACLOCAL_AMFLAGS = -I . - subdir = . ---- 217,223 ---- - - pkgconfig_DATA = ${PACKAGE}.pc - -! SUBDIRS = aterm utils - - ACLOCAL_AMFLAGS = -I . - subdir = . diff --git a/pkgs/development/libraries/boost/boost-155-clang.patch b/pkgs/development/libraries/boost/boost-155-clang.patch deleted file mode 100644 index 9c4e3a74cd2..00000000000 --- a/pkgs/development/libraries/boost/boost-155-clang.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/boost/atomic/detail/cas128strong.hpp b/boost/atomic/detail/cas128strong.hpp -index 906c13e..dcb4d7d 100644 ---- a/boost/atomic/detail/cas128strong.hpp -+++ b/boost/atomic/detail/cas128strong.hpp -@@ -196,15 +196,17 @@ class base_atomic - - public: - BOOST_DEFAULTED_FUNCTION(base_atomic(void), {}) -- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0) -+ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT - { -+ memset(&v_, 0, sizeof(v_)); - memcpy(&v_, &v, sizeof(value_type)); - } - - void - store(value_type const& value, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT - { -- storage_type value_s = 0; -+ storage_type value_s; -+ memset(&value_s, 0, sizeof(value_s)); - memcpy(&value_s, &value, sizeof(value_type)); - platform_fence_before_store(order); - platform_store128(value_s, &v_); -@@ -247,7 +249,9 @@ class base_atomic - memory_order success_order, - memory_order failure_order) volatile BOOST_NOEXCEPT - { -- storage_type expected_s = 0, desired_s = 0; -+ storage_type expected_s, desired_s; -+ memset(&expected_s, 0, sizeof(expected_s)); -+ memset(&desired_s, 0, sizeof(desired_s)); - memcpy(&expected_s, &expected, sizeof(value_type)); - memcpy(&desired_s, &desired, sizeof(value_type)); - -diff --git a/boost/atomic/detail/gcc-atomic.hpp b/boost/atomic/detail/gcc-atomic.hpp -index a130590..4af99a1 100644 ---- a/boost/atomic/detail/gcc-atomic.hpp -+++ b/boost/atomic/detail/gcc-atomic.hpp -@@ -958,14 +958,16 @@ class base_atomic - - public: - BOOST_DEFAULTED_FUNCTION(base_atomic(void), {}) -- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0) -+ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT - { -+ memset(&v_, 0, sizeof(v_)); - memcpy(&v_, &v, sizeof(value_type)); - } - - void store(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT - { -- storage_type tmp = 0; -+ storage_type tmp; -+ memset(&tmp, 0, sizeof(tmp)); - memcpy(&tmp, &v, sizeof(value_type)); - __atomic_store_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order)); - } -@@ -980,7 +982,8 @@ class base_atomic - - value_type exchange(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT - { -- storage_type tmp = 0; -+ storage_type tmp; -+ memset(&tmp, 0, sizeof(tmp)); - memcpy(&tmp, &v, sizeof(value_type)); - tmp = __atomic_exchange_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order)); - value_type res; -@@ -994,7 +997,9 @@ class base_atomic - memory_order success_order, - memory_order failure_order) volatile BOOST_NOEXCEPT - { -- storage_type expected_s = 0, desired_s = 0; -+ storage_type expected_s, desired_s; -+ memset(&expected_s, 0, sizeof(expected_s)); -+ memset(&desired_s, 0, sizeof(desired_s)); - memcpy(&expected_s, &expected, sizeof(value_type)); - memcpy(&desired_s, &desired, sizeof(value_type)); - const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, false, -@@ -1010,7 +1015,9 @@ class base_atomic - memory_order success_order, - memory_order failure_order) volatile BOOST_NOEXCEPT - { -- storage_type expected_s = 0, desired_s = 0; -+ storage_type expected_s, desired_s; -+ memset(&expected_s, 0, sizeof(expected_s)); -+ memset(&desired_s, 0, sizeof(desired_s)); - memcpy(&expected_s, &expected, sizeof(value_type)); - memcpy(&desired_s, &desired, sizeof(value_type)); - const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, true, diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 538a40615f1..9a3303684a1 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -68,12 +68,17 @@ stdenv.mkDerivation rec { configureFlags = optional stdenv.isDarwin "--disable-compile-warnings" - ++ optional stdenv.isFreeBSD "--with-libiconv=gnu" - ++ optional stdenv.isSunOS ["--disable-modular-tests" "--with-libiconv"]; + ++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu" + ++ optional stdenv.isSunOS "--disable-dtrace"; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" + optionalString stdenv.isSunOS " -DBSD_COMP"; + preConfigure = if !stdenv.isSunOS then null else + '' + sed -i -e 's|inotify.h|foobar-inotify.h|g' configure + ''; + preBuild = optionalString stdenv.isDarwin '' export MACOSX_DEPLOYMENT_TARGET= diff --git a/pkgs/development/libraries/gmock/default.nix b/pkgs/development/libraries/gmock/default.nix index 71ac281195b..926832dbada 100644 --- a/pkgs/development/libraries/gmock/default.nix +++ b/pkgs/development/libraries/gmock/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, unzip, cmake}: +{ stdenv, cmake, fetchzip }: stdenv.mkDerivation rec { - version = "1.7.0"; name = "gmock-${version}"; + version = "1.7.0"; - src = fetchurl { - url = "https://googlemock.googlecode.com/files/${name}.zip"; - sha256="26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b"; + src = fetchzip { + url = "https://googlemock.googlecode.com/files/gmock-${version}.zip"; + sha256 = "04n9p6pf3mrqsabrsncv32d3fqvd86zmcdq3gyni7liszgfk0paz"; }; - buildInputs = [ unzip cmake ]; + buildInputs = [ cmake ]; buildPhase = '' # avoid building gtest @@ -29,4 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.auntie ]; }; + + passthru = { source = src; }; } diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 1657ceaeece..4572387e225 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -5,10 +5,8 @@ assert useGnupg1 -> gnupg1 != null; assert !useGnupg1 -> gnupg != null; let - gpgPath = if useGnupg1 then - "${gnupg1}/bin/gpg" - else - "${gnupg}/bin/gpg2"; + gpgStorePath = if useGnupg1 then gnupg1 else gnupg; + gpgProgram = if useGnupg1 then "gpg" else "gpg2"; in stdenv.mkDerivation rec { name = "gpgme-1.6.0"; @@ -22,7 +20,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gnupg ]; - configureFlags = "--with-gpg=${gpgPath}"; + configureFlags = [ + "--with-gpg=${gpgStorePath}/bin/${gpgProgram}" + "--enable-fixed-path=${gpgStorePath}/bin" + ]; meta = { homepage = "http://www.gnupg.org/related_software/gpgme"; diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index 0ea1e96947e..9f880e3ea9f 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -3,7 +3,10 @@ stdenv.mkDerivation { name = "id3lib-3.8.3"; - patches = [ ./id3lib-3.8.3-gcc43-1.patch ]; + patches = [ + ./id3lib-3.8.3-gcc43-1.patch + ./patch_id3lib_3.8.3_UTF16_writing_bug.diff + ]; buildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff b/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff new file mode 100644 index 00000000000..b05d2cf298d --- /dev/null +++ b/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff @@ -0,0 +1,39 @@ +diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog +--- id3lib-3.8.3.orig/ChangeLog 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/ChangeLog 2006-02-22 00:33:59.946214472 +0100 +@@ -1,3 +1,8 @@ ++2006-02-17 Jerome Couderc ++ ++ * Patch from Spoon to fix UTF-16 writing bug ++ http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979 ++ + 2003-03-02 Sunday 17:38 Thijmen Klok + + * THANKS (1.20): added more people +diff -ruN id3lib-3.8.3.orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp +--- id3lib-3.8.3.orig/src/io_helpers.cpp 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/src/io_helpers.cpp 2006-02-22 00:35:02.926639992 +0100 +@@ -363,11 +363,22 @@ + // Write the BOM: 0xFEFF + unicode_t BOM = 0xFEFF; + writer.writeChars((const unsigned char*) &BOM, 2); ++ // Patch from Spoon : 2004-08-25 14:17 ++ // http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979 ++ // Wrong code ++ //for (size_t i = 0; i < size; i += 2) ++ //{ ++ // unicode_t ch = (data[i] << 8) | data[i+1]; ++ // writer.writeChars((const unsigned char*) &ch, 2); ++ //} ++ // Right code ++ unsigned char *pdata = (unsigned char *) data.c_str(); + for (size_t i = 0; i < size; i += 2) + { +- unicode_t ch = (data[i] << 8) | data[i+1]; ++ unicode_t ch = (pdata[i] << 8) | pdata[i+1]; + writer.writeChars((const unsigned char*) &ch, 2); + } ++ // End patch + } + return writer.getCur() - beg; + } diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix new file mode 100644 index 00000000000..dbe818ba561 --- /dev/null +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, flex }: + +stdenv.mkDerivation rec { + name = "libconfuse-${version}"; + version = "2.8"; + + src = fetchFromGitHub { + sha256 = "0s0asxnml4rlv17ijz5w57x949anag28wx7wdahqx6mgqz0w2j2k"; + rev = "v${version}"; + repo = "libconfuse"; + owner = "martinh"; + }; + + nativeBuildInputs = [ autoreconfHook flex ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Small configuration file parser library for C"; + longDescription = '' + libConfuse (previously libcfg) is a configuration file parser library + written in C. It supports sections and (lists of) values, as well as + some other features. It makes it very easy to add configuration file + capability to a program using a simple API. + + The goal of libConfuse is not to be the configuration file parser library + with a gazillion of features. Instead, it aims to be easy to use and + quick to integrate with your code. + ''; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/development/libraries/libedit/freebsd_weak_ref.patch b/pkgs/development/libraries/libedit/freebsd_weak_ref.patch deleted file mode 100644 index a4399593d63..00000000000 --- a/pkgs/development/libraries/libedit/freebsd_weak_ref.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- libedit-20110709-3.0/src/vi.c.old 2011-07-11 18:21:16.000000000 +0000 -+++ libedit-20110709-3.0/src/vi.c 2011-07-11 18:24:29.000000000 +0000 -@@ -918,7 +918,7 @@ - * NB: posix implies that we should enter insert mode, however - * this is against historical precedent... - */ --#ifdef __weak_reference -+#if defined(__weak_reference) && defined(__NetBSD__) - __weakref_visible char *my_get_alias_text(const char *) - __weak_reference(get_alias_text); - #endif -@@ -926,7 +926,7 @@ - /*ARGSUSED*/ - vi_alias(EditLine *el, Int c) - { --#ifdef __weak_reference -+#if defined(__weak_reference) && defined(__NetBSD__) - char alias_name[3]; - char *alias_text; - diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 7368729a881..a1beee602d7 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 = "2016-01-09"; + listVersion = "2016-01-15"; listSources = fetchFromGitHub { - sha256 = "1xsal9vyan954ahyn9pxvqpipmpcf6drp30xz7ag5xp3f2clcx8s"; - rev = "0f7cc8b00498812ddaa983c56d67ef3713e48350"; + sha256 = "1smn4fl0fhldy7gdn0k1diyghbxdxnr4cj921bjdl2i4wxas41g5"; + rev = "77cb90dce70827bda40384e1ae8bff3c958daef3"; repo = "list"; owner = "publicsuffix"; }; diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix new file mode 100644 index 00000000000..8481f857b2c --- /dev/null +++ b/pkgs/development/libraries/libutempter/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, lib, glib }: + +with lib; + +stdenv.mkDerivation rec { + name = "libutempter-${version}"; + version = "1.1.6"; + + src = fetchurl { + url = "http://archive.ubuntu.com/ubuntu/pool/main/libu/libutempter/libutempter_${version}.orig.tar.bz2"; + sha256 = "15y3xbgznjxnfmix4xg3bwmqdvghdw7slbhazb0ybmyf65gmd65q"; + }; + + buildInputs = [ glib ]; + + installFlags = [ + "libdir=\${out}/lib" + "libexecdir=\${out}/lib" + "includedir=\${out}/include" + "mandir=\${out}/share/man" + ]; + + meta = { + description = "Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = [ maintainers.msteen ]; + }; +} diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix index 900c9dc5a51..a06d4cef968 100644 --- a/pkgs/development/libraries/protobuf/3.0.nix +++ b/pkgs/development/libraries/protobuf/3.0.nix @@ -1,12 +1,43 @@ -{ callPackage, fetchFromGitHub, ... } @ args: +{ stdenv, fetchFromGitHub , autoreconfHook, zlib, gmock }: -callPackage ./generic.nix (args // rec { - version = "3.0.0-alpha-3.1"; +stdenv.mkDerivation rec { + name = "protobuf-${version}"; + + version = "3.0.0-beta-2"; # make sure you test also -A pythonPackages.protobuf src = fetchFromGitHub { owner = "google"; repo = "protobuf"; rev = "v${version}"; - sha256 = "0vzw20ymjmjrrmg84f822qslclsb2q0wf0qdj2da198gmkkbrw45"; + sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1"; }; -}) + + postPatch = '' + rm -rf gmock + cp -r ${gmock.source} gmock + chmod -R a+w gmock + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/google/protobuf/testing/googletest.cc \ + --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' + ''; + + buildInputs = [ autoreconfHook zlib ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = { + description = "Google's data interchange format"; + longDescription = + ''Protocol Buffers are a way of encoding structured data in an efficient + yet extensible format. Google uses Protocol Buffers for almost all of + its internal RPC protocols and file formats. + ''; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; + homepage = https://developers.google.com/protocol-buffers/; + }; + + passthru.version = version; +} diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index fc41187a931..51136c31aa1 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { license = "mBSD"; - homepage = http://code.google.com/p/protobuf/; + homepage = https://developers.google.com/protocol-buffers/; }; passthru.version = version; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 49745e23fca..441d9385f73 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { cmakeFlags = "-DDESIRED_QT_VERSION=${builtins.substring 0 1 qtbase.version}"; - NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ]; # remove after the next update + # should be removable after the next update + NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" "-Wno-error=unused-but-set-variable" ]; preBuild = '' NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix new file mode 100644 index 00000000000..ba2d1ab11fc --- /dev/null +++ b/pkgs/development/libraries/wcslib/default.nix @@ -0,0 +1,25 @@ +{ fetchurl, stdenv, flex }: + +stdenv.mkDerivation rec { + version = "5.12"; + name = "wcslib-${version}"; + + buildInputs = [ flex ]; + + src = fetchurl { + url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2"; + sha256 ="1r4dz5514pba2d5cc2ydpnqm85xsvy65hlvzdqayl6sl40liizsh"; + }; + + meta = { + description = "World Coordinate System Library for Astronomy"; + homepage = http://www.atnf.csiro.au/people/mcalabre/WCS/; + + longDescription = ''Library for world coordinate systems for + spherical geometries and their conversion to image coordinate + systems. This is the standard library for this purpose in + astronomy.''; + + license = stdenv.lib.licenses.lgpl3Plus; + }; +} diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index b5fa7a97e13..d18f64c9aba 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo }: +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, makeDesktopItem }: { name, src, binary-basename, ... }: @@ -6,24 +6,19 @@ stdenv.mkDerivation rec { inherit name src binary-basename; - sources10Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV10.sources.zip; - sha256 = "0aijhr3w5w3jzmnpl61g6xkwyi2l1mxy0qbvr9k3whz8zlrsijh2"; - }; + pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; }; - sources20Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV20.sources.zip; - sha256 = "1xsc0p361pp8iha5zckppw29sbapd706wbvzvgjnkv2n6n1q5gj7"; - }; - - sources30Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV30.sources.zip; - sha256 = "08d9a7gggwpwgrfbp7iv5896jgqz3vgjfrq19y3jw8k10pva98ak"; - }; - - sources40Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV40.sources.zip; - sha256 = "1xq1721ql19hpgr8ir372h92q7g8zwd6k921b21dap4wf8djqnpd"; + desktopItem = makeDesktopItem { + inherit name; + desktopName = "Pharo VM"; + genericName = "Pharo Virtual Machine"; + exec = "${binary-basename}-x %F"; + icon = "pharo"; + terminal = "false"; + type="Application"; + startupNotify = "false"; + categories = "Development;"; + mimeType = "application/x-pharo-image"; }; # Building @@ -32,9 +27,7 @@ stdenv.mkDerivation rec { ''; resources = ./resources; installPhase = '' - echo Current directory $(pwd) - echo Creating prefix "$prefix" - mkdir -p "$prefix/lib/pharo-vm" + mkdir -p "$prefix/lib/$name" cd ../../results @@ -44,9 +37,10 @@ stdenv.mkDerivation rec { mv vm-sound-ALSA vm-sound-ALSA.so mv pharo pharo-vm - cp * "$prefix/lib/pharo-vm" + cp * "$prefix/lib/$name" - cp -R "$resources/"* "$prefix/" + mkdir -p "$prefix/share/applications" + cp "${desktopItem}/share/applications/"* $prefix/share/applications mkdir $prefix/bin @@ -57,7 +51,7 @@ stdenv.mkDerivation rec { # disable parameter expansion to forward all arguments unprocessed to the VM set -f - exec $prefix/lib/pharo-vm/pharo-vm "\$@" + exec $prefix/lib/$name/pharo-vm "\$@" EOF cat > $prefix/bin/${binary-basename}-nox <The baz tag2010-03-14T00:00:00+00:00tag:,2010-03-14:tag/baz.html<p>This article overrides the listening of the articles under the <em>baz</em> tag.</p> +- ++ +\ No newline at end of file +diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml +index 3a9478a..24d31a9 100644 +--- a/pelican/tests/output/basic/feeds/all.atom.xml ++++ b/pelican/tests/output/basic/feeds/all.atom.xml +@@ -43,7 +43,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +@@ -59,4 +59,4 @@ pelican.conf, it will have nothing in default.</p> + <p>Lovely.</p> + </div> + The baz tag2010-03-14T00:00:00+00:00tag:,2010-03-14:tag/baz.html<p>This article overrides the listening of the articles under the <em>baz</em> tag.</p> +- ++ +\ No newline at end of file +diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml +index a9b5977..4ad7008 100644 +--- a/pelican/tests/output/basic/feeds/misc.atom.xml ++++ b/pelican/tests/output/basic/feeds/misc.atom.xml +@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +@@ -35,4 +35,4 @@ pelican.conf, it will have nothing in default.</p> + <p>Lovely.</p> + </div> + The baz tag2010-03-14T00:00:00+00:00tag:,2010-03-14:tag/baz.html<p>This article overrides the listening of the articles under the <em>baz</em> tag.</p> +- ++ +\ No newline at end of file +diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html +index dfb0c54..b7f8a7e 100644 +--- a/pelican/tests/output/basic/unbelievable.html ++++ b/pelican/tests/output/basic/unbelievable.html +@@ -38,7 +38,7 @@ + Published: Fri 15 October 2010 + + +-

In misc.

++

In misc.

+ +

Or completely awesome. Depends the needs.

+

a root-relative link to markdown-article +@@ -58,7 +58,7 @@ pelican.conf, it will have nothing in default.

+ +
+

Testing more sourcecode directives

+-
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
++
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
+

Lovely.

+
+
+@@ -97,4 +97,4 @@ pelican.conf, it will have nothing in default.

+ + + +- ++ +\ No newline at end of file +diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml +index cb74637..987f987 100644 +--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml ++++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml +@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml +index 2c4b116..89082ee 100644 +--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml ++++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml +@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml +index 3574ab4..75b6333 100644 +--- a/pelican/tests/output/custom/feeds/all-en.atom.xml ++++ b/pelican/tests/output/custom/feeds/all-en.atom.xml +@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml +index 391ab85..efb43cd 100644 +--- a/pelican/tests/output/custom/feeds/all.atom.xml ++++ b/pelican/tests/output/custom/feeds/all.atom.xml +@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml +index a78d2de..548b16c 100644 +--- a/pelican/tests/output/custom/feeds/all.rss.xml ++++ b/pelican/tests/output/custom/feeds/all.rss.xml +@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml +index 91d6b28..dbab63c 100644 +--- a/pelican/tests/output/custom/feeds/misc.atom.xml ++++ b/pelican/tests/output/custom/feeds/misc.atom.xml +@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml +index 3493d2a..2d13bda 100644 +--- a/pelican/tests/output/custom/feeds/misc.rss.xml ++++ b/pelican/tests/output/custom/feeds/misc.rss.xml +@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html +index 2e51cf0..b6d2136 100644 +--- a/pelican/tests/output/custom/unbelievable.html ++++ b/pelican/tests/output/custom/unbelievable.html +@@ -43,9 +43,9 @@ + + +
+- By Alexis Métaireau ++ By Alexis Métaireau +
+-

In misc.

++

In misc.

+ +

Or completely awesome. Depends the needs.

+

a root-relative link to markdown-article +@@ -65,7 +65,7 @@ pelican.conf, it will have nothing in default.

+
+
+

Testing more sourcecode directives

+-
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
++
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
+

Lovely.

+
+
+diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml +index 8fb3ef6..2090087 100644 +--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml ++++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml +@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml +index 99255ee..00944ce 100644 +--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml ++++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml +@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml +index 6b2f09b..297558d 100644 +--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml ++++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml +@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml +index 5ef59e0..78da527 100644 +--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml ++++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml +@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml +index 071e2f1..84fd5df 100644 +--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml ++++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml +@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml +index c91d4d7..fde02e6 100644 +--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml ++++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml +@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml +index 82b5898..bd727bb 100644 +--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml ++++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml +@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.</p> + </div> + <div class="section" id="testing-more-sourcecode-directives"> + <h2>Testing more sourcecode directives</h2> +-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span> <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> ++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span> <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno"> </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span> <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno"> </span> <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span> <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno"> </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span> <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno"> </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno"> </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span> <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno"> </span> <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno"> </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span> <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno"> </span> <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span> <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno"> </span> <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div> + <p>Lovely.</p> + </div> + <div class="section" id="testing-even-more-sourcecode-directives"> +diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html +index a6ea869..1e2d78f 100644 +--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html ++++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html +@@ -45,7 +45,7 @@ +
+ By Alexis Métaireau +
+-

In misc.

++

In misc.

+ +

Or completely awesome. Depends the needs.

+

a root-relative link to markdown-article +@@ -65,7 +65,7 @@ pelican.conf, it will have nothing in default.

+
+
+

Testing more sourcecode directives

+-
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
++
 8 def run(self):
       self.assert_has_content()
10     try:
           lexer = get_lexer_by_name(self.arguments[0])
12     except ValueError:
           # no lexer found - use the text one instead of an exception
14         lexer = TextLexer()
   
16     if ('linenos' in self.options and
               self.options['linenos'] not in ('table', 'inline')):
18         self.options['linenos'] = 'table'
   
20     for flag in ('nowrap', 'nobackground', 'anchorlinenos'):
           if flag in self.options:
22             self.options[flag] = True
   
24     # noclasses should already default to False, but just in case...
       formatter = HtmlFormatter(noclasses=False, **self.options)
26     parsed = highlight('\n'.join(self.content), lexer, formatter)
       return [nodes.raw('', parsed, format='html')]
+

Lovely.

+
+
diff --git a/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch b/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch deleted file mode 100644 index 2933040141a..00000000000 --- a/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7ce3b991229c74262f81ab7692a1dc6bde2416ee Mon Sep 17 00:00:00 2001 -From: Barry Warsaw -Date: Thu, 25 Jun 2015 11:54:05 -0400 -Subject: [PATCH] One way to work around the lack of - html.parser.HTMLParserError in Python 3.5 - ---- - sphinx/builders/linkcheck.py | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/sphinx/builders/linkcheck.py b/sphinx/builders/linkcheck.py -index 9f5c213..b05c5b2 100644 ---- a/sphinx/builders/linkcheck.py -+++ b/sphinx/builders/linkcheck.py -@@ -19,9 +19,19 @@ - from six.moves.urllib.request import build_opener, Request, HTTPRedirectHandler - from six.moves.urllib.parse import unquote, urlsplit, quote - from six.moves.urllib.error import HTTPError --from six.moves.html_parser import HTMLParser, HTMLParseError -+from six.moves.html_parser import HTMLParser - from docutils import nodes - -+# 2015-06-25 barry@python.org. This exception was deprecated in Python 3.3 and -+# removed in Python 3.5, however for backward compatibility reasons, we're not -+# going to just remove it. If it doesn't exist, define an exception that will -+# never be caught but leaves the code in check_anchor() intact. -+try: -+ from six.moves.html_parser import HTMLParseError -+except ImportError: -+ class HTMLParseError(Exception): -+ pass -+ - from sphinx.builders import Builder - from sphinx.util.console import purple, red, darkgreen, darkgray, \ - darkred, turquoise diff --git a/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch b/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch new file mode 100644 index 00000000000..5aa4af873cd --- /dev/null +++ b/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch @@ -0,0 +1,63 @@ +From 5574aba60ed76f2bae947722122ac4d71ab8ed5a Mon Sep 17 00:00:00 2001 +From: Takeshi KOMIYA +Date: Mon, 18 Jan 2016 12:38:02 +0900 +Subject: [PATCH] Fix tests are broken with pygments-2.1 + +--- + tests/test_build_html.py | 2 +- + tests/test_intl.py | 10 ++++++---- + 2 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/tests/test_build_html.py b/tests/test_build_html.py +index e330761..17ea089 100644 +--- a/tests/test_build_html.py ++++ b/tests/test_build_html.py +@@ -82,7 +82,7 @@ def checker(nodes): + (".//a[@href='_downloads/img1.png']", ''), + (".//pre", u'"quotes"'), + (".//pre", u"'included'"), +- (".//pre/span[@class='s']", u'üöä'), ++ (".//pre/span[@class='s2']", u'üöä'), + (".//div[@class='inc-pyobj1 highlight-text']//pre", + r'^class Foo:\n pass\n\s*$'), + (".//div[@class='inc-pyobj2 highlight-text']//pre", +diff --git a/tests/test_intl.py b/tests/test_intl.py +index 4c665d4..b24ec65 100644 +--- a/tests/test_intl.py ++++ b/tests/test_intl.py +@@ -694,14 +694,15 @@ def test_additional_targets_should_not_be_translated(app, status, warning): + yield assert_count(expected_expr, result, 1) + + # C code block with lang should not be translated but be *C* highlighted +- expected_expr = """#include <stdio.h>""" ++ expected_expr = ("""#include """ ++ """<stdio.h>""") + yield assert_count(expected_expr, result, 1) + + # doctest block should not be translated but be highlighted + expected_expr = ( + """>>> """ + """import sys """ +- """# sys importing""") ++ """# sys importing""") + yield assert_count(expected_expr, result, 1) + + ## raw.txt +@@ -754,14 +755,15 @@ def test_additional_targets_should_be_translated(app, status, warning): + yield assert_count(expected_expr, result, 1) + + # C code block with lang should be translated and be *C* highlighted +- expected_expr = """#include <STDIO.H>""" ++ expected_expr = ("""#include """ ++ """<STDIO.H>""") + yield assert_count(expected_expr, result, 1) + + # doctest block should not be translated but be highlighted + expected_expr = ( + """>>> """ + """import sys """ +- """# SYS IMPORTING""") ++ """# SYS IMPORTING""") + yield assert_count(expected_expr, result, 1) + + ## raw.txt diff --git a/pkgs/development/r-modules/patches/BayesBridge_cblas.patch b/pkgs/development/r-modules/patches/BayesBridge_cblas.patch deleted file mode 100644 index 418a6b95ee7..00000000000 --- a/pkgs/development/r-modules/patches/BayesBridge_cblas.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -ru -x '*~' BayesBridge_orig/src/Makevars BayesBridge/src/Makevars ---- BayesBridge_orig/src/Makevars 2014-07-19 05:08:55.000000000 +0900 -+++ BayesBridge/src/Makevars 2014-10-25 14:44:23.422592445 +0900 -@@ -9,4 +9,4 @@ - # PKG_CPPFLAGS = -DUSE_R -DDISABLE_FIO -I../inst/include/ -DDISABLE_SINGLE -DNTHROW - PKG_CPPFLAGS = -DUSE_R -DDISABLE_FIO -DDISABLE_SINGLE -DNTHROW - # PKG_CPPFLAGS = -DUSE_R -DDISABLE_SINGLE -DNTHROW -Wall -pedantic -Wshadow -ansi -Wsequence-point --PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -+PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -lcblas diff --git a/pkgs/development/r-modules/patches/BayesLogit_cblas.patch b/pkgs/development/r-modules/patches/BayesLogit_cblas.patch deleted file mode 100644 index ef776f3531d..00000000000 --- a/pkgs/development/r-modules/patches/BayesLogit_cblas.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' BayesLogit_orig/src/Makevars BayesLogit/src/Makevars ---- BayesLogit_orig/src/Makevars 2014-04-24 23:31:13.000000000 +0900 -+++ BayesLogit/src/Makevars 2014-10-21 21:00:15.570699136 +0900 -@@ -6,7 +6,7 @@ - ## W/OUT Dynamic Stuff - OBJECTS = Matrix.o MatrixFrame.o RRNG.o RNG.o FSF_nmix.o LogitWrapper.o \ - PolyaGamma.o PolyaGammaAlt.o PolyaGammaSP.o InvertY.o --PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -+PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -lopenblas - # PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW -Wall -pedantic -Wextra - PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW - diff --git a/pkgs/development/r-modules/patches/CARramps.patch b/pkgs/development/r-modules/patches/CARramps.patch deleted file mode 100644 index add01b28fc1..00000000000 --- a/pkgs/development/r-modules/patches/CARramps.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' CARramps_orig/src/combo1colForR1Q_d.cu CARramps/src/combo1colForR1Q_d.cu ---- CARramps_orig/src/combo1colForR1Q_d.cu 2011-12-01 22:27:06.000000000 +0900 -+++ CARramps/src/combo1colForR1Q_d.cu 2014-10-25 14:59:06.869299163 +0900 -@@ -4,7 +4,7 @@ - #include - #include - #include --#include -+#include "combo1colForR1Q_d.h" - - #define BLOCKSIZE 256 - diff --git a/pkgs/development/r-modules/patches/WideLM.patch b/pkgs/development/r-modules/patches/WideLM.patch deleted file mode 100644 index 02bbfb7e0da..00000000000 --- a/pkgs/development/r-modules/patches/WideLM.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru -x '*~' WideLM_orig/src/Makefile.in WideLM/src/Makefile.in ---- WideLM_orig/src/Makefile.in 2012-02-17 04:28:05.000000000 +0900 -+++ WideLM/src/Makefile.in 2014-10-25 18:54:49.110011921 +0900 -@@ -12,12 +12,12 @@ - #compiler/preprocessor options - R_INCS := @R_INCL@ @RCPP_INCL@ - CC_ARGS := @CU_PARAMS@ -Xcompiler @R_CPIC@ --CU_INCS := -I@CUDA_HOME@/include -+CU_INCS := -I@CUDA_HOME@/include - CU_ARCH := -gencode arch=compute_20,code=sm_20 - - #linker options --LD_PARAMS := -Xlinker "@RCPP_LDFLAGS@" --RCU_LIBS := @R_LIB@ -L@CU_LIBDIR@ -lcublas -+LD_PARAMS := -Xlinker "--export-dynamic -fopenmp -L${R_HOME}/lib -lR" -+RCU_LIBS := -Xlinker "-L@CU_LIBDIR@ -lcublas" - - all : WideLM.so - diff --git a/pkgs/development/r-modules/patches/rpud.patch b/pkgs/development/r-modules/patches/rpud.patch deleted file mode 100644 index bb904b68989..00000000000 --- a/pkgs/development/r-modules/patches/rpud.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -ru -x '*~' rpud_orig/configure rpud/configure ---- rpud_orig/configure 2010-09-08 02:14:55.000000000 +0900 -+++ rpud/configure 2014-10-25 16:46:39.479098648 +0900 -@@ -1794,7 +1794,7 @@ - fi - - LIBS="-L${CUDA_HOME}${CUDA_LIB_DIR} -lcublas -lcuda" --RPATHFLAG="-Wl,-rpath,${CUDA_HOME}${CUDA_LIB_DIR}" -+RPATHFLAG="-Xlinker -rpath=${CUDA_HOME}${CUDA_LIB_DIR}" - - - -diff -ru -x '*~' rpud_orig/src/Makefile.in rpud/src/Makefile.in ---- rpud_orig/src/Makefile.in 2010-08-31 01:53:50.000000000 +0900 -+++ rpud/src/Makefile.in 2014-10-25 16:45:30.248109883 +0900 -@@ -3,11 +3,11 @@ - OBJS := rpud.o rpudist.o - - #compiler/preprocessor options --INCS := -I@CUDA_HOME@/include -+INCS := -I@CUDA_HOME@/include - PARAMS := -Xcompiler "@R_INCLUDE@ @CPICFLAGS@" - - #linker options --LD_PARAMS := -Xlinker "@R_LIB@ @RPATHFLAG@" -+LD_PARAMS := -Xlinker "--export-dynamic -fopenmp -L${R_HOME}/lib -lR @RPATHFLAG@" - LIBS := @LIBS@ - - TARGETS := rpud.so diff --git a/pkgs/development/tools/boomerang/dlopen_path.patch b/pkgs/development/tools/boomerang/dlopen_path.patch deleted file mode 100644 index 1e4bf3c75a3..00000000000 --- a/pkgs/development/tools/boomerang/dlopen_path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/loader/BinaryFileFactory.cpp b/loader/BinaryFileFactory.cpp -index 889a4ed..ca86765 100644 ---- a/loader/BinaryFileFactory.cpp -+++ b/loader/BinaryFileFactory.cpp -@@ -109,7 +109,7 @@ BinaryFile* BinaryFileFactory::getInstanceFor( const char *sName ) { - - // Load the specific loader library - #ifndef _WIN32 // Cygwin, Unix/Linux -- libName = std::string("lib/lib") + libName; -+ libName = std::string("lib") + libName; - #ifdef __CYGWIN__ - libName += ".dll"; // Cygwin wants .dll, but is otherwise like Unix - #else diff --git a/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch b/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch deleted file mode 100644 index e16dab32632..00000000000 --- a/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch +++ /dev/null @@ -1,237 +0,0 @@ ---- cmake-2.8.10/Source/cmFileCommand.cxx 2012-10-31 10:32:06.000000000 -0500 -+++ cmake-2.8.10/Source/cmFileCommand.cxx 2013-03-16 22:55:11.306681100 -0500 -@@ -1002,7 +1002,7 @@ protected: - MatchProperties CollectMatchProperties(const char* file) - { - // Match rules are case-insensitive on some platforms. --#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) -+#if defined(_WIN32) || defined(__APPLE__) - std::string lower = cmSystemTools::LowerCase(file); - const char* file_to_match = lower.c_str(); - #else ---- cmake-2.8.10/Source/cmInstallCommand.cxx 2012-10-31 10:32:06.000000000 -0500 -+++ cmake-2.8.10/Source/cmInstallCommand.cxx 2013-03-16 22:56:21.008667800 -0500 -@@ -1090,7 +1090,7 @@ cmInstallCommand::HandleDirectoryMode(st - { - literal_args += " REGEX \""; - // Match rules are case-insensitive on some platforms. --#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) -+#if defined(_WIN32) || defined(__APPLE__) - std::string regex = cmSystemTools::LowerCase(args[i]); - #else - std::string regex = args[i]; ---- cmake-2.8.10/Source/kwsys/Glob.cxx 2012-10-31 10:32:06.000000000 -0500 -+++ cmake-2.8.10/Source/kwsys/Glob.cxx 2013-03-16 22:58:54.192429400 -0500 -@@ -37,7 +37,7 @@ - #include - namespace KWSYS_NAMESPACE - { --#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) -+#if defined(_WIN32) || defined(__APPLE__) - // On Windows and apple, no difference between lower and upper case - # define KWSYS_GLOB_CASE_INDEPENDENT - #endif ---- cmake-2.8.11/Source/kwsys/SystemInformation.cxx 2013-05-15 12:38:13.000000000 -0500 -+++ cmake-2.8.11/Source/kwsys/SystemInformation.cxx 2013-07-08 01:57:31.216321800 -0500 -@@ -888,7 +888,7 @@ void SystemInformation::RunMemoryCheck() - // Hide implementation details in an anonymous namespace. - namespace { - // ***************************************************************************** --#if defined(__linux) || defined(__APPLE__) -+#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) - int LoadLines( - FILE *file, - kwsys_stl::vector &lines) -@@ -918,7 +918,7 @@ int LoadLines( - return nRead; - } - --# if defined(__linux) -+# if defined(__linux) || defined(__CYGWIN__) - // ***************************************************************************** - int LoadLines( - const char *fileName, -@@ -957,7 +957,7 @@ int NameValue( - } - #endif - --#if defined(__linux) -+#if defined(__linux) || defined(__CYGWIN__) - // **************************************************************************** - template - int GetFieldsFromFile( -@@ -2869,7 +2869,6 @@ bool SystemInformationImplementation::Re - pos = buffer.find("processor\t",pos+1); - } - --#ifdef __linux - // Find the largest physical id. - int maxId = -1; - kwsys_stl::string idc = -@@ -2893,14 +2892,6 @@ bool SystemInformationImplementation::Re - this->NumberOfPhysicalCPU=static_cast( - numberOfCoresPerCPU*(maxId+1)); - --#else // __CYGWIN__ -- // does not have "physical id" entries, neither "cpu cores" -- // this has to be fixed for hyper-threading. -- kwsys_stl::string cpucount = -- this->ExtractValueFromCpuInfoFile(buffer,"cpu count"); -- this->NumberOfPhysicalCPU= -- this->NumberOfLogicalCPU = atoi(cpucount.c_str()); --#endif - // gotta have one, and if this is 0 then we get a / by 0n - // better to have a bad answer than a crash - if(this->NumberOfPhysicalCPU <= 0) -@@ -3086,7 +3077,7 @@ SystemInformationImplementation::GetHost - GlobalMemoryStatusEx(&statex); - return statex.ullTotalPhys/1024; - # endif --#elif defined(__linux) -+#elif defined(__linux) || defined(__CYGWIN__) - SystemInformation::LongLong memTotal=0; - int ierr=GetFieldFromFile("/proc/meminfo","MemTotal:",memTotal); - if (ierr) -@@ -3217,7 +3208,7 @@ SystemInformationImplementation::GetHost - GlobalMemoryStatusEx(&statex); - return (statex.ullTotalPhys - statex.ullAvailPhys)/1024; - # endif --#elif defined(__linux) -+#elif defined(__linux) || defined(__CYGWIN__) - const char *names[3]={"MemTotal:","MemFree:",NULL}; - SystemInformation::LongLong values[2]={SystemInformation::LongLong(0)}; - int ierr=GetFieldsFromFile("/proc/meminfo",names,values); -@@ -3276,7 +3267,7 @@ SystemInformationImplementation::GetProc - return -2; - } - return pmc.WorkingSetSize/1024; --#elif defined(__linux) -+#elif defined(__linux) || defined(__CYGWIN__) - SystemInformation::LongLong memUsed=0; - int ierr=GetFieldFromFile("/proc/self/status","VmRSS:",memUsed); - if (ierr) -@@ -3328,7 +3319,7 @@ SystemInformationImplementation::GetProc - { - #if defined(_WIN32) - return GetCurrentProcessId(); --#elif defined(__linux) || defined(__APPLE__) -+#elif defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) - return getpid(); - #else - return -1; ---- cmake-2.8.10/Source/kwsys/SystemTools.cxx 2012-10-31 10:32:06.000000000 -0500 -+++ cmake-2.8.10/Source/kwsys/SystemTools.cxx 2013-03-16 22:52:11.830415600 -0500 -@@ -75,19 +75,12 @@ - // Windows API. - #if defined(_WIN32) - # include --#elif defined (__CYGWIN__) --# include --# undef _WIN32 - #endif - - #if !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H - extern char **environ; - #endif - --#ifdef __CYGWIN__ --extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path); --#endif -- - // getpwnam doesn't exist on Windows and Cray Xt3/Catamount - // same for TIOCGWINSZ - #if defined(_WIN32) || defined (__LIBCATAMOUNT__) -@@ -1068,7 +1061,7 @@ bool SystemTools::SameFile(const char* f - } - - //---------------------------------------------------------------------------- --#if defined(_WIN32) || defined(__CYGWIN__) -+#if defined(_WIN32) - static bool WindowsFileExists(const char* filename) - { - WIN32_FILE_ATTRIBUTE_DATA fd; -@@ -1083,7 +1076,7 @@ bool SystemTools::FileExists(const char* - { - return false; - } --#if defined(__CYGWIN__) -+#if 0 - // Convert filename to native windows path if possible. - char winpath[MAX_PATH]; - if(SystemTools::PathCygwinToWin32(filename, winpath)) -@@ -1111,7 +1104,7 @@ bool SystemTools::FileExists(const char* - } - - //---------------------------------------------------------------------------- --#ifdef __CYGWIN__ -+#if 0 - bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path) - { - SystemToolsTranslationMap::iterator i = -@@ -3894,7 +3887,7 @@ bool SystemTools::LocateFileInDir(const - bool SystemTools::FileIsFullPath(const char* in_name) - { - kwsys_stl::string name = in_name; --#if defined(_WIN32) || defined(__CYGWIN__) -+#if defined(_WIN32) - // On Windows, the name must be at least two characters long. - if(name.length() < 2) - { -@@ -4712,9 +4705,6 @@ bool SystemTools::ParseURL( const kwsys_ - unsigned int SystemToolsManagerCount; - SystemToolsTranslationMap *SystemTools::TranslationMap; - SystemToolsTranslationMap *SystemTools::LongPathMap; --#ifdef __CYGWIN__ --SystemToolsTranslationMap *SystemTools::Cyg2Win32Map; --#endif - - // SystemToolsManager manages the SystemTools singleton. - // SystemToolsManager should be included in any translation unit -@@ -4760,9 +4750,6 @@ void SystemTools::ClassInitialize() - // Allocate the translation map first. - SystemTools::TranslationMap = new SystemToolsTranslationMap; - SystemTools::LongPathMap = new SystemToolsTranslationMap; --#ifdef __CYGWIN__ -- SystemTools::Cyg2Win32Map = new SystemToolsTranslationMap; --#endif - - // Add some special translation paths for unix. These are not added - // for windows because drive letters need to be maintained. Also, -@@ -4817,9 +4804,6 @@ void SystemTools::ClassFinalize() - { - delete SystemTools::TranslationMap; - delete SystemTools::LongPathMap; --#ifdef __CYGWIN__ -- delete SystemTools::Cyg2Win32Map; --#endif - } - - ---- cmake-2.8.10/Source/kwsys/SystemTools.hxx.in 2012-10-31 10:32:06.000000000 -0500 -+++ cmake-2.8.10/Source/kwsys/SystemTools.hxx.in 2013-03-16 23:10:30.185237900 -0500 -@@ -277,15 +277,6 @@ public: - static bool FileExists(const char* filename); - - /** -- * Converts Cygwin path to Win32 path. Uses dictionary container for -- * caching and calls to cygwin_conv_to_win32_path from Cygwin dll -- * for actual translation. Returns true on success, else false. -- */ --#ifdef __CYGWIN__ -- static bool PathCygwinToWin32(const char *path, char *win32_path); --#endif -- -- /** - * Return file length - */ - static unsigned long FileLength(const char *filename); -@@ -887,9 +878,6 @@ private: - */ - static SystemToolsTranslationMap *TranslationMap; - static SystemToolsTranslationMap *LongPathMap; --#ifdef __CYGWIN__ -- static SystemToolsTranslationMap *Cyg2Win32Map; --#endif - friend class SystemToolsManager; - }; - diff --git a/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch b/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch deleted file mode 100644 index 25bbd2a91ba..00000000000 --- a/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Modules/FindOpenSSL.cmake -+++ ./Modules/FindOpenSSL.cmake -@@ -264,7 +264,7 @@ - set(OPENSSL_VERSION "${_OPENSSL_VERSION}") - elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") - file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str -- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") -+ REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") - - # The version number is encoded as 0xMNNFFPPS: major minor fix patch status - # The status gives if this is a developer or prerelease and is ignored here. diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index dc6f1f8d002..0f1ecdcaa54 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchgit, lib, python, which }: let - version = "0.5.1"; + version = "0.5.3"; src = fetchgit { url = "https://github.com/gfxmonk/gup.git"; - rev = "f185052e2177ed5e46720e6c6cfb529b96cd17e2"; - sha256 = "c2e27cdba2231017ceb4868f58f5c3b224be0491b81558b4e59bb08a952ad1a5"; + rev = "55ffd8828ddc28a2a786b75422d672d6569f961f"; + sha256 = "7c2abbf5d3814c6b84da0de1c91f9f7d299c2362cf091da96f6a68d8fffcb5ce"; }; in import ./build.nix diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index dccb67efaf4..35a5b1b4d40 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -1,5 +1,5 @@ { stdenv, writeText, callPackage, fetchurl, - fetchHex, erlang, rebar3-nix-bootstrap, tree, fetchFromGitHub }: + fetchHex, erlang, hermeticRebar3 ? true, rebar3-nix-bootstrap, tree, fetchFromGitHub }: let @@ -67,6 +67,12 @@ let version = "0.2.0"; sha256 = "03kiszlbgzscfd2ns7na6bzbfzmcqdb5cx3p6qy3657jk2fai332"; }; + # {eunit_formatters, "0.2.0"} + rebar3_hex = fetchHex { + pkg = "rebar3_hex"; + version = "1.12.0"; + sha256 = "45467e93ae8d776c6038fdaeaffbc55d8f2f097f300a54dab9b81c6d1cf21f73"; + }; in stdenv.mkDerivation { @@ -78,7 +84,9 @@ stdenv.mkDerivation { sha256 = "0px66scjdia9aaa5z36qzxb848r56m0k98g0bxw065a2narsh4xy"; }; - patches = [ ./hermetic-bootstrap.patch ]; + patches = if hermeticRebar3 == true + then [ ./hermetic-bootstrap.patch ./hermetic-rebar3.patch ] + else []; buildInputs = [ erlang tree ]; propagatedBuildInputs = [ registrySnapshot rebar3-nix-bootstrap ]; @@ -88,6 +96,7 @@ stdenv.mkDerivation { rebar3-nix-bootstrap registry-only echo "$ERL_LIBS" mkdir -p _build/default/lib/ + mkdir -p _build/default/plugins cp --no-preserve=mode -R ${erlware_commons} _build/default/lib/erlware_commons cp --no-preserve=mode -R ${providers} _build/default/lib/providers cp --no-preserve=mode -R ${getopt} _build/default/lib/getopt @@ -98,6 +107,7 @@ stdenv.mkDerivation { cp --no-preserve=mode -R ${eunit_formatters} _build/default/lib/eunit_formatters cp --no-preserve=mode -R ${relx} _build/default/lib/relx cp --no-preserve=mode -R ${ssl_verify_hostname} _build/default/lib/ssl_verify_hostname + cp --no-preserve=mode -R ${rebar3_hex} _build/default/plugins/rebar3_hex ''; buildPhase = '' diff --git a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch new file mode 100644 index 00000000000..8da323ab823 --- /dev/null +++ b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch @@ -0,0 +1,108 @@ +diff --git a/src/rebar3.erl b/src/rebar3.erl +index 2b73844..af1d871 100644 +--- a/src/rebar3.erl ++++ b/src/rebar3.erl +@@ -282,9 +282,11 @@ start_and_load_apps(Caller) -> + ensure_running(crypto, Caller), + ensure_running(asn1, Caller), + ensure_running(public_key, Caller), +- ensure_running(ssl, Caller), +- inets:start(), +- inets:start(httpc, [{profile, rebar}]). ++ ensure_running(ssl, Caller). ++%% Removed due to the hermicity requirements of Nix ++%% ++%% inets:start(), ++%% inets:start(httpc, [{profile, rebar}]). + + ensure_running(App, Caller) -> + case application:start(App) of +@@ -339,4 +341,4 @@ safe_define_test_macro(Opts) -> + test_defined([{d, 'TEST'}|_]) -> true; + test_defined([{d, 'TEST', true}|_]) -> true; + test_defined([_|Rest]) -> test_defined(Rest); +-test_defined([]) -> false. +\ No newline at end of file ++test_defined([]) -> false. +diff --git a/src/rebar_hermicity.erl b/src/rebar_hermicity.erl +new file mode 100644 +index 0000000..d814e2a +--- /dev/null ++++ b/src/rebar_hermicity.erl +@@ -0,0 +1,42 @@ ++%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- ++%% ex: ts=4 sw=4 et ++%% ------------------------------------------------------------------- ++%% ++%% rebar: Erlang Build Tools ++%% ++%% Copyright (c) 2016 Eric Merritt (eric@merritt.tech) ++%% ++%% Permission is hereby granted, free of charge, to any person obtaining a copy ++%% of this software and associated documentation files (the "Software"), to deal ++%% in the Software without restriction, including without limitation the rights ++%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++%% copies of the Software, and to permit persons to whom the Software is ++%% furnished to do so, subject to the following conditions: ++%% ++%% The above copyright notice and this permission notice shall be included in ++%% all copies or substantial portions of the Software. ++%% ++%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++%% THE SOFTWARE. ++%% ------------------------------------------------------------------- ++-module(rebar_hermicity). ++ ++-export([request/5]). ++ ++-include("rebar.hrl"). ++ ++%% ==================================================================== ++%% Public API ++%% ==================================================================== ++ ++request(Method, {Url, _Headers}, _HTTPOptions, _Options, _Profile) -> ++ ?ERROR("A request is being made that violates Nix hermicity " ++ "This request has been stopped. Details of the request " ++ "are as follows:", []), ++ ?ERROR("Requesnt: ~p ~s", [Method, Url]), ++ erlang:halt(1). +diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl +index 4f55ad1..f76fd5d 100644 +--- a/src/rebar_pkg_resource.erl ++++ b/src/rebar_pkg_resource.erl +@@ -100,10 +100,10 @@ make_vsn(_) -> + {error, "Replacing version of type pkg not supported."}. + + request(Url, ETag) -> +- case httpc:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]}, +- [{ssl, ssl_opts(Url)}, {relaxed, true}], +- [{body_format, binary}], +- rebar) of ++ case rebar_hermicity:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]}, ++ [{ssl, ssl_opts(Url)}, {relaxed, true}], ++ [{body_format, binary}], ++ rebar) of + {ok, {{_Version, 200, _Reason}, Headers, Body}} -> + ?DEBUG("Successfully downloaded ~s", [Url]), + {"etag", ETag1} = lists:keyfind("etag", 1, Headers), +diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl +index 6637ebe..d82c1d8 100644 +--- a/src/rebar_prv_update.erl ++++ b/src/rebar_prv_update.erl +@@ -44,8 +44,8 @@ do(State) -> + TmpFile = filename:join(TmpDir, "packages.gz"), + + Url = rebar_state:get(State, rebar_packages_cdn, ?DEFAULT_HEX_REGISTRY), +- case httpc:request(get, {Url, []}, +- [], [{stream, TmpFile}, {sync, true}], ++ case rebar_hermicity:request(get, {Url, []}, ++ [], [{stream, TmpFile}, {sync, true}], + rebar) of + {ok, saved_to_file} -> + {ok, Data} = file:read_file(TmpFile), diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix index 8bb8f68e3a4..e7d237cfea2 100644 --- a/pkgs/development/tools/erlang/hex2nix/default.nix +++ b/pkgs/development/tools/erlang/hex2nix/default.nix @@ -2,13 +2,13 @@ buildRebar3 rec { name = "hex2nix"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "erlang-nix"; repo = "hex2nix"; rev = "${version}"; - sha256 = "18gkq5fkdiwq5zj98cz4kqxbpzjkpqcplpsw987drxwdbvq4hkwm"; + sha256 = "1snlcb60al7fz3z4c4rqrb9gqdyihyhsrr90n40v9rdm98csry3k"; }; erlangDeps = [ ibrowse jsx erlware_commons getopt ]; diff --git a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix index b32d196272b..39ec59e849f 100644 --- a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix +++ b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rebar3-nix-bootstrap"; - version = "0.0.1"; + version = "0.0.3"; src = fetchFromGitHub { owner = "erlang-nix"; repo = "rebar3-nix-bootstrap"; rev = "${version}"; - sha256 = "0xyj7j59dmxyl5nhhsmb0r1pihmk0s4k02ga1rfgm30rij6n7431"; + sha256 = "01yyaz104jj3mxx8k10q3rwpn2rh13q1ja5r0iq37qyjmg8xflhq"; }; buildInputs = [ erlang ]; diff --git a/pkgs/development/tools/haskell/ihaskell/use-classy-prelude.patch b/pkgs/development/tools/haskell/ihaskell/use-classy-prelude.patch deleted file mode 100644 index b2c1362b62f..00000000000 --- a/pkgs/development/tools/haskell/ihaskell/use-classy-prelude.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fad4e38079e91b13bf1e94732b7494504071b224 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= -Date: Sun, 28 Sep 2014 09:27:40 +0200 -Subject: [PATCH] catMaybes, explicitly use ClassyPrelude - ---- - src/IHaskell/Eval/Completion.hs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/IHaskell/Eval/Completion.hs b/src/IHaskell/Eval/Completion.hs -index 790c903..93d7ac1 100644 ---- a/src/IHaskell/Eval/Completion.hs -+++ b/src/IHaskell/Eval/Completion.hs -@@ -141,7 +141,7 @@ getTrueModuleName name = do - onlyImportDecl _ = Nothing - - -- Get all imports that we use. -- imports <- catMaybes <$> map onlyImportDecl <$> getContext -+ imports <- ClassyPrelude.catMaybes <$> map onlyImportDecl <$> getContext - - -- Find the ones that have a qualified name attached. - -- If this name isn't one of them, it already is the true name. -@@ -178,7 +178,7 @@ completionType line loc target - = Empty - - -- When in a string, complete filenames. -- | cursorInString line loc -+ | cursorInString line loc - = FilePath (getStringTarget lineUpToCursor) (getStringTarget lineUpToCursor) - - -- Complete module names in imports and elsewhere. --- -2.1.0 - diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 61824eb607b..4cc4cadc280 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -69,17 +69,15 @@ stdenv.mkDerivation rec { meta = { description = "Tools for manipulating binaries (linker, assembler, etc.)"; - longDescription = '' The GNU Binutils are a collection of binary tools. The main ones are `ld' (the GNU linker) and `as' (the GNU assembler). They also include the BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc. ''; - homepage = http://www.gnu.org/software/binutils/; - license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; /* Give binutils a lower priority than gcc-wrapper to prevent a collision due to the ld/as wrappers/symlinks in the latter. */ diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix new file mode 100644 index 00000000000..029e76e0c99 --- /dev/null +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages, buildPythonPackage, makeWrapper +}: + +stdenv.mkDerivation rec { + name = "ycmd-2016-01-12"; + + src = fetchgit { + url = "git://github.com/Valloric/ycmd.git"; + rev = "f982f6251c5ff85e3abe6e862aad8bcd19e85ece"; + sha256 = "1qp3ip6ab34610rfy0x85xsjg7blfkiy025vskwk9zw6gqglf3b3"; + }; + + buildInputs = [ python cmake llvmPackages.clang boost makeWrapper ]; + + propagatedBuildInputs = with pythonPackages; [ waitress frozendict bottle ]; + + buildPhase = '' + python build.py --clang-completer --system-libclang --system-boost + ''; + + configurePhase = ":"; + + installPhase = with pythonPackages; '' + mkdir -p $out/lib/ycmd/third_party $out/bin + cp -r ycmd/ CORE_VERSION libclang.so.* ycm_client_support.so ycm_core.so $out/lib/ycmd/ + wrapProgram $out/lib/ycmd/ycmd/__main__.py \ + --prefix PYTHONPATH : "$(toPythonPath ${waitress}):$(toPythonPath ${frozendict}):$(toPythonPath ${bottle})" + ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd + ''; + + meta = { + description = "A code-completion and comprehension server"; + homepage = "https://github.com/Valloric/ycmd"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/web/nodejs/no-xcode-4.1.0.patch b/pkgs/development/web/nodejs/no-xcode-4.1.0.patch deleted file mode 100644 index 137158b01b7..00000000000 --- a/pkgs/development/web/nodejs/no-xcode-4.1.0.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff --git a/configure b/configure -index d199975..66d903b 100755 ---- a/configure -+++ b/configure -@@ -734,7 +734,7 @@ def configure_library(lib, output): - # libpath needs to be provided ahead libraries - if pkg_libpath: - output['libraries'] += ( -- filter(None, map(str.strip, pkg_cflags.split('-L')))) -+ pkg_libpath.split()) - - default_libs = getattr(options, shared_lib + '_libname') - default_libs = map('-l{0}'.format, default_libs.split(',')) -diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py -index c002b11..fefb765 100644 ---- a/tools/gyp/pylib/gyp/xcode_emulation.py -+++ b/tools/gyp/pylib/gyp/xcode_emulation.py -@@ -446,10 +446,17 @@ class XcodeSettings(object): - - def _XcodeSdkPath(self, sdk_root): - if sdk_root not in XcodeSettings._sdk_path_cache: -- sdk_path = self._GetSdkVersionInfoItem(sdk_root, 'Path') -- XcodeSettings._sdk_path_cache[sdk_root] = sdk_path -- if sdk_root: -- XcodeSettings._sdk_root_cache[sdk_path] = sdk_root -+ try: -+ sdk_path = self._GetSdkVersionInfoItem(sdk_root, 'Path') -+ XcodeSettings._sdk_path_cache[sdk_root] = sdk_path -+ if sdk_root: -+ XcodeSettings._sdk_root_cache[sdk_path] = sdk_root -+ except: -+ # if this fails it's because xcodebuild failed, which means -+ # the user is probably on a CLT-only system, where there -+ # is no valid SDK root -+ XcodeSettings._sdk_path_cache[sdk_root] = None -+ - return XcodeSettings._sdk_path_cache[sdk_root] - - def _AppendPlatformVersionMinFlags(self, lst): -@@ -572,10 +579,12 @@ class XcodeSettings(object): - framework_root = sdk_root - else: - framework_root = '' -- config = self.spec['configurations'][self.configname] -- framework_dirs = config.get('mac_framework_dirs', []) -- for directory in framework_dirs: -- cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root)) -+ -+ if 'SDKROOT' in self._Settings(): -+ config = self.spec['configurations'][self.configname] -+ framework_dirs = config.get('mac_framework_dirs', []) -+ for directory in framework_dirs: -+ cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root)) - - self.configname = None - return cflags -@@ -826,10 +835,12 @@ class XcodeSettings(object): - sdk_root = self._SdkPath() - if not sdk_root: - sdk_root = '' -- config = self.spec['configurations'][self.configname] -- framework_dirs = config.get('mac_framework_dirs', []) -- for directory in framework_dirs: -- ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) -+ -+ if 'SDKROOT' in self._Settings(): -+ config = self.spec['configurations'][self.configname] -+ framework_dirs = config.get('mac_framework_dirs', []) -+ for directory in framework_dirs: -+ ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) - - is_extension = self._IsIosAppExtension() or self._IsIosWatchKitExtension() - if sdk_root and is_extension: -@@ -1032,7 +1043,11 @@ class XcodeSettings(object): - sdk_root = self._SdkPath(config_name) - if not sdk_root: - sdk_root = '' -- return l.replace('$(SDKROOT)', sdk_root) -+ -+ if self._SdkPath(): -+ return l.replace('$(SDKROOT)', sdk_root) -+ else: -+ return l - - def AdjustLibraries(self, libraries, config_name=None): - """Transforms entries like 'Cocoa.framework' in libraries into entries like -@@ -1248,7 +1263,7 @@ def XcodeVersion(): - if version: - version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0] - else: -- raise GypError("No Xcode or CLT version detected!") -+ version = "7.0.0" - # The CLT has no build information, so we return an empty string. - version_list = [version, ''] - version = version_list[0] diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix index f9e9ee12edc..8068e0163ce 100644 --- a/pkgs/development/web/nodejs/v5.nix +++ b/pkgs/development/web/nodejs/v5.nix @@ -7,7 +7,7 @@ assert stdenv.system != "armv5tel-linux"; let - version = "5.1.1"; + version = "5.4.1"; deps = { inherit openssl zlib libuv; @@ -31,18 +31,15 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "1hr2zjwrah8yrih1jsm3v8b449d7xla1rykmyd8yrd80z0jf0yd7"; + sha256 = "032ylpjrnjpc4cjqkrax3slli40025kw74yk2dynp86ywgr5wibq"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ]; dontDisableStatic = true; prePatch = '' patchShebangs . - sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py ''; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./pkg-libpath.patch ]; - buildInputs = [ python which zlib libuv openssl python ] ++ optionals stdenv.isLinux [ utillinux http-parser ] ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ]; diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index f9eb90f34f8..e854af58865 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { mkdir -p "$out"/share/applications while read LINE; do if [[ $LINE = "Exec=0ad" ]]; then - echo "Exec=$out/bin/pyrogenesis" + echo "Exec=$out/bin/zeroad" elif [[ $LINE = "Icon=0ad" ]]; then echo "Icon=$out/share/icons/0ad.png" else @@ -126,5 +126,6 @@ stdenv.mkDerivation rec { licenses.zlib # otherwise masked by pkgs.zlib ]; platforms = [ "x86_64-linux" "i686-linux" ]; + hydraPlatforms = []; # the data are too big (~1.5 GB) }; } diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix new file mode 100644 index 00000000000..b08f977cda6 --- /dev/null +++ b/pkgs/games/factorio/default.nix @@ -0,0 +1,100 @@ +{ stdenv, callPackage, fetchurl, makeWrapper +# Begin libraries +, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi +# Begin download parameters +, username ? "" +, password ? "" +}: + +let + version = "0.12.20"; + + fetch = callPackage ./fetch.nix { username = username; password = password; }; + arch = if stdenv.system == "x86_64-linux" then "x64" + else if stdenv.system == "i686-linux" then "x32" + else abort "Unsupported platform"; + + variants = { + x64 = { + url = "https://www.factorio.com/get-download/${version}/alpha/linux64"; + sha256 = "1xpzrx3q678519qgjl92fxn3qv55hd188x9jp6dcfk2ljhi1gmqk"; + }; + + x32 = { + url = "https://www.factorio.com/get-download/${version}/alpha/linux32"; + sha256 = "1dl1dsp4nni5nda437ckyw1ss6w168g19v51h7cdvb3cgsdb7sab"; + }; + }; +in + +stdenv.mkDerivation rec { + name = "factorio-${version}"; + + src = fetch variants.${arch}; + + libPath = stdenv.lib.makeLibraryPath [ + alsaLib + libX11 + libXcursor + libXinerama + libXrandr + libXi + ]; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/{bin,share/factorio} + cp -a bin/${arch}/factorio $out/bin/factorio.${arch} + cp -a doc-html data $out/share/factorio/ + + # Fortunately, Factorio already supports system-wide installs. + # Unfortunately it's a bit inconvenient to set the paths. + cat > $out/share/factorio/config-base.cfg < $out/share/factorio/update-config.sh < password +# Might as well hide the username as well. +echo "username-or-email=$username" > username + +# Log in. We don't especially care about the result, but let's check if login failed. +$curl -c cookies -d @username -d @password $loginUrl -D headers > /dev/null + +if grep -q 'Location: /' headers; then + # Now download. We need --insecure for this, but the sha256 should cover us. + $curl -b cookies --insecure --location $url > $out +else + echo 'Login failed' + echo 'Please set username and password with config.nix,' + echo 'or /etc/nix/nixpkgs-config.nix if on NixOS.' + echo + echo 'Example:' + echo '{' + echo ' packageOverrides = pkgs: rec {' + echo ' factorio = pkgs.factorio.override {' + echo ' username = "";' + echo ' password = "";' + echo ' };' + echo ' };' + echo '}' + + exit 1 +fi diff --git a/pkgs/games/hedgewars/fix-ghc-7.8-build-failure.diff b/pkgs/games/hedgewars/fix-ghc-7.8-build-failure.diff deleted file mode 100644 index 7974c6797fc..00000000000 --- a/pkgs/games/hedgewars/fix-ghc-7.8-build-failure.diff +++ /dev/null @@ -1,16 +0,0 @@ -## fix-ghc-7.8-build-failure.diff [diff] -diff --git a/gameServer/Actions.hs b/gameServer/Actions.hs -index 2cebe4f..355ee26 100644 ---- a/gameServer/Actions.hs -+++ b/gameServer/Actions.hs -@@ -562,7 +562,7 @@ processAction (AddClient cl) = do - si <- gets serverInfo - newClId <- io $ do - ci <- addClient rnc cl -- _ <- Exception.mask (forkIO . clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci) -+ _ <- Exception.mask (\x -> forkIO $ clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci x) - - infoM "Clients" (show ci ++ ": New client. Time: " ++ show (connectTime cl)) - - - diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix new file mode 100644 index 00000000000..fc5bfbb4b70 --- /dev/null +++ b/pkgs/games/pioneer/default.nix @@ -0,0 +1,42 @@ +{ fetchFromGitHub, stdenv, automake, curl, libsigcxx, SDL2 +, SDL2_image, freetype, libvorbis, libpng, assimp, mesa +, autoconf, pkgconfig }: + +let + version = "20160116"; + checksum = "07w5yin2xhb0fdlj1aipi64yx6vnr1siahsy0bxvzi06d73ffj6r"; +in +stdenv.mkDerivation rec { + name = "pioneer-${version}"; + + src = fetchFromGitHub{ + owner = "pioneerspacesim"; + repo = "pioneer"; + rev = version; + sha256 = checksum; + }; + + buildInputs = [ + automake curl libsigcxx SDL2 SDL2_image freetype libvorbis + libpng assimp mesa autoconf pkgconfig + ]; + + NIX_CFLAGS_COMPILE = [ + "-I${SDL2}/include/SDL2" + ]; + + + preConfigure = '' + export PIONEER_DATA_DIR="$out/share/pioneer/data"; + ./bootstrap + ''; + + meta = with stdenv.lib; { + description = "Pioneer is a space adventure game set in the Milky Way galaxy at the turn of the 31st century."; + homepage = "http://pioneerspacesim.net"; + license = with licenses; [ + gpl3 cc-by-sa-30 + ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 7cc4c2b96b1..15b7f87ed10 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = "MAME"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux; + broken = true; # URL doesn't work anymore }; } diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix index 7858a655b4e..56a20a971ef 100644 --- a/pkgs/misc/emulators/wine/versions.nix +++ b/pkgs/misc/emulators/wine/versions.nix @@ -12,8 +12,8 @@ rec { monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c"; }; unstable = { - wineVersion = "1.9.0"; - wineSha256 = "1yfmcckb8biyp1d4czjxlfd10537dpi636g3zsj1cxp7jyn228mp"; + wineVersion = "1.9.1"; + wineSha256 = "1dhbp2jy9s3rqsbgc43jz967n2rls8dwdfi96qdxybg8kbxnachb"; inherit (stable) geckoVersion geckoSha256 gecko64Version gecko64Sha256 @@ -21,10 +21,10 @@ rec { }; staging = { version = unstable.wineVersion; - sha256 = "1frp7zrgvx24m6yqmpvsz99rn18jjgg1bxl5qgcsf3kiych4i8r1"; + sha256 = "05072wgxy8n6i71bb6649sm0ggh5c4g97clryrr8vkmgsklfkadi"; }; winetricks = { - version = "20151116"; - sha256 = "1iih2b85s7f4if1mn36infc43hd4pdp8bl84q0nml3gh3fh8zqpr"; + version = "20160109"; + sha256 = "0pnl5362g5q7py368vj07swbdp1fqbpvpq4jv4l5ddyclps8ajg8"; }; } diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 470c1960c7c..264a60cc205 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -152,22 +152,22 @@ rec { }; Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Supertab-2015-08-28"; + name = "Supertab-2016-01-03"; src = fetchgit { url = "git://github.com/ervandew/supertab"; - rev = "9f7da6d4988daf863ebc414f221bb12c2614f59e"; - sha256 = "18c74fde13eced99e492c7747a7924d1b2c33bfb99a87a6d7c44f1c8ca9e9225"; + rev = "66511772a430a5eaad7f7d03dbb02e8f33c4a641"; + sha256 = "fd49314e9f3ca3262e40b67f05311de94f50d03c946fc53e25b3bd61e33eb418"; }; dependencies = []; }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2016-01-08"; + name = "Syntastic-2016-01-18"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "c57ba0da9f0e935ecc87363c1ac3339b1e1cb75f"; - sha256 = "0f4d73b024bd6e43f7b27bee629f1ff46bcb5f773eebdcda09652f101ab70504"; + rev = "d1a179d750bd1d136d7f38e69f2c5b8439886de7"; + sha256 = "e2cfa0fa27b0249b1e5d783883f4c72a13a167a869218d73ae1b2cad631c3a28"; }; dependencies = []; @@ -218,11 +218,11 @@ rec { }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2015-12-22"; + name = "UltiSnips-2016-01-20"; src = fetchgit { url = "git://github.com/SirVer/ultisnips"; - rev = "dbd43ad27cbfed14c9dc3de6d5acb5f4edb8f649"; - sha256 = "3a1c59ae4097e72c91724157249d6a578e7ef2b10ed675e4372ce9968d66af66"; + rev = "3f2c591c3b547e7d7b80d15897ac7a9e3bf85ec8"; + sha256 = "6644e8603202adc1ade58a972164e5e6470248ca1d2c40cd949b8f35e67b8019"; }; dependencies = []; @@ -278,11 +278,11 @@ rec { }; ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-py-matcher-2015-12-22"; + name = "ctrlp-py-matcher-2016-01-13"; src = fetchgit { url = "git://github.com/FelikZ/ctrlp-py-matcher"; - rev = "08b98ff7ba5191616fa4f099a63cdcbad70a0c0f"; - sha256 = "72514b65e12dfa249e51d676d38ff88933309827ef0ece71f3a90a21b4a943e6"; + rev = "8a803267a741cff3d6147650745f83c8f2125578"; + sha256 = "27fc887bdad36bd33a0e8645465e287c20158533408b241f46141528313baa34"; }; dependencies = []; @@ -311,22 +311,22 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2015-12-26"; + name = "fugitive-2016-01-08"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "18d6d1ab82d9ac15586d7d3c1a36f9ef6fb50eae"; - sha256 = "f448970d07eaf35c0a6d29634ee2114650934943602da8f2bf5a4e3920d62aa2"; + rev = "fd36aa9c61e06d71befdbe8931f97137c489b065"; + sha256 = "ef87be5ad469368f11185db32a8acc14ac08f1b151d0c58492042b0a9314c87e"; }; dependencies = []; }; ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-2015-12-10"; + name = "ghcmod-2016-01-20"; src = fetchgit { url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "1cab59653ef0fba71574c7f64e60a27df2bc38fc"; - sha256 = "34556e0d4d7059fb6842eabfc4e9d0065e69b0e45b54e224b684e562f2917556"; + rev = "a7c76b979918889fa6de02a3f712925931f62cb8"; + sha256 = "2ad76948c97e9141eca81423a8d27d092e0f5c62818c66f08679d9cae70268f6"; }; dependencies = []; @@ -355,11 +355,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2015-12-31"; + name = "neomake-2016-01-21"; src = fetchgit { url = "git://github.com/benekastah/neomake"; - rev = "6342a7d7e09083a549800a3cdc0ef95358a73ba7"; - sha256 = "b7d3637b8575ae94dc0e68c4e5fcc41197b3083d1d7302c2e038431a24a3e9d7"; + rev = "e0fa23401c1231bd942779c79c5c71d08f28e440"; + sha256 = "0d0536188127538cacedda77a81e0749d6207fa882ca1f34f36852d009aa73f9"; }; dependencies = []; @@ -388,33 +388,33 @@ rec { }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2016-01-06"; + name = "ctrlp-vim-2016-01-18"; src = fetchgit { url = "git://github.com/ctrlpvim/ctrlp.vim"; - rev = "0fb2c58353ee041500eb67fb5bde2377bf486417"; - sha256 = "5731f5fb2ac024ca3b53fdb56ff6ad5809db166f91dccf5494343ff490fe80e9"; + rev = "7f74368d85bb521951dd58123349ce66b947d058"; + sha256 = "fecd1137845ccfe72a1d2e3e1660f8e2264dc46cc34dfa9f1037f14f84115f33"; }; dependencies = []; }; vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jade-2016-01-03"; + name = "vim-jade-2016-01-21"; src = fetchgit { url = "git://github.com/digitaltoad/vim-jade"; - rev = "999cd2859a7772de707a70afc97f5a7d41a82df9"; - sha256 = "039c1e9b91ac6417c2f38e8b30647115b10ad5485e78782a84100f22ae2da1d8"; + rev = "319cba1ee5313e8b50fd912d10dfe40a171f0312"; + sha256 = "280ef32d862793b42685aba4802f919928b52b93328d0cef35584a83baf884d0"; }; dependencies = []; }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2015-11-20"; + name = "neco-ghc-2016-01-20"; src = fetchgit { url = "git://github.com/eagletmt/neco-ghc"; - rev = "53a3d63bc4ecc10d8506a40a0472987f262050da"; - sha256 = "85ff5e1564a7fd81bbfcec1f4d16e675c2dd1fba38223dbae134f665f03985a8"; + rev = "26515b4219c04448d37d6cb4a3c54f2d3080b056"; + sha256 = "265ee24be8f9bf6d067213a751fd54ddcb53570831e7520af41c3eb7f5184fcd"; }; dependencies = []; @@ -432,11 +432,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2016-01-04"; + name = "vim-go-2016-01-22"; src = fetchgit { url = "git://github.com/fatih/vim-go"; - rev = "eec4e3e8a8227fe24618e114ff2e644615f51ad6"; - sha256 = "6868d9e9cd8ddad25526407ef843530e86f62e734649e600c8aef9cc2adea381"; + rev = "1beac4aadccb921b3cb264a8e254b75c8a326c21"; + sha256 = "02e92ab38a667c0355a4e5c48e1fc53a7ad416208e9151ff4a9cbd7d477c0fc6"; }; dependencies = []; @@ -454,33 +454,33 @@ rec { }; idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "idris-vim-2016-01-04"; + name = "idris-vim-2016-01-14"; src = fetchgit { url = "git://github.com/idris-hackers/idris-vim"; - rev = "f8e7fda4b8984c7248fd805b62c4a3a2e61bce94"; - sha256 = "3b4ca5a65acea2c429fc721d1ab00c7ba286c929c31bd131896d8e508df1caaf"; + rev = "09772ea37a83f8633890fc5cd9221bcf6e22c157"; + sha256 = "28eab2793950781a416e76657dfdcb58601c31ffafb336e3beb9790eef6a268d"; }; dependencies = []; }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2015-10-01"; + name = "calendar-vim-2016-01-19"; src = fetchgit { url = "git://github.com/itchyny/calendar.vim"; - rev = "9aa130feab18fd142265487ce86f664746a080e0"; - sha256 = "03b1ddec54f0b06be61dae2c42ac3cffd52833ecbcebd269f0e2a0d720aa9b83"; + rev = "2a6c13ee8056fe5b82ce6529f426ed63096dc6bc"; + sha256 = "8228b6e97c42254eb8e8e35e391f24a7fc2f55753af913fe1605b9ade0ff9d98"; }; dependencies = []; }; thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "thumbnail-vim-2015-03-15"; + name = "thumbnail-vim-2016-01-14"; src = fetchgit { url = "git://github.com/itchyny/thumbnail.vim"; - rev = "19bd717307a8d0986a4a77116f47168fbe11e178"; - sha256 = "c8c100e1b0ee9c75fc3b6db00b68c47d91bcca8979f6de046aade43fd09e3882"; + rev = "cf4463dc31722ab116bc61779c515a4b7a1e9af1"; + sha256 = "7037916b16f72ea2aaff666e4fa3e1f9546995c0d6fb4634d2dbfac5b184bb26"; }; dependencies = []; @@ -509,11 +509,11 @@ rec { }; vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-buffergator-2015-12-16"; + name = "vim-buffergator-2016-01-21"; src = fetchgit { url = "git://github.com/jeetsukumaran/vim-buffergator"; - rev = "ab5ef1a2c3b5076204ed3ee1601fcedda379967b"; - sha256 = "5c479d884bccf6a07891aff2cb09fbaf59d8460bdc91ad9fb19cf0d8e020c29d"; + rev = "9a6a946a41bcf492dfe8da5eee4cc2ee3d55c77f"; + sha256 = "6df3d1bffb42f7a96b3136ed80534380ba9e2f508b14dbd665260ffe240ccfee"; }; dependencies = []; @@ -619,33 +619,33 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2016-01-07"; + name = "vimtex-2016-01-15"; src = fetchgit { url = "git://github.com/lervag/vimtex"; - rev = "db137566d540ac01a6013263069463a95f64a61d"; - sha256 = "352436cd29aba8919f05d0e5e544c9d9addd62d850572d06bcbb58d15e9f8f8a"; + rev = "1aedd5a7464c93af5af86fec2f4cfce97d5f2947"; + sha256 = "5fcc46c0dcfd41e15dfdbc66417834e1b933cfb7ae3de9e16cfd3975bc196ba1"; }; dependencies = []; }; vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2016-01-03"; + name = "vim-easymotion-2016-01-22"; src = fetchgit { url = "git://github.com/lokaltog/vim-easymotion"; - rev = "39abbf30a7bfc16de139b52ce0d7d2a286da52a8"; - sha256 = "5c0be765c2fdb95c632020e0d03a70a2683a9d8f5b2d934be94b89cdb9bbd089"; + rev = "799491e007515890aff363b6eac5dbc9c5aa7f80"; + sha256 = "037ee34adc0811571c536cdd37fcfa2d483dd76276380c8858dfe134893bf5e7"; }; dependencies = []; }; vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-xkbswitch-2016-01-08"; + name = "vim-xkbswitch-2016-01-12"; src = fetchgit { url = "git://github.com/lyokha/vim-xkbswitch"; - rev = "89d7719ca1b69d4d18eda271b8fa75af2eec0aa9"; - sha256 = "afb8bdba422cc176f18ee3d23cdd9c208bf7f87c488f0b230071806c45c71d0f"; + rev = "46858cbe11a8d1a2abc94de8c817465d0020d6f6"; + sha256 = "36f89ca04c4fa15f4b792620660fefc48f31233351dcc0387d2c4ee0f3c50bbf"; }; dependencies = []; patchPhase = '' @@ -656,11 +656,11 @@ rec { }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2016-01-05"; + name = "vim-startify-2016-01-12"; src = fetchgit { url = "git://github.com/mhinz/vim-startify"; - rev = "e3fb0cd845f9726d30d92ac6293a84bece687c64"; - sha256 = "42c77cca362aa8b40345d3296689fc1df564362ea3bd781d114315e64fc9a380"; + rev = "8545f6f553640dc0318582c9749c893f2be3345e"; + sha256 = "cf98c35c106998d7432df572501f7e3d9e452e8104eec3726e9fa6c94c592029"; }; dependencies = []; @@ -700,22 +700,22 @@ rec { }; vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-watchdogs-2015-12-27"; + name = "vim-watchdogs-2016-01-13"; src = fetchgit { url = "git://github.com/osyo-manga/vim-watchdogs"; - rev = "52842b03ab0c2e60563ff121d274f8a66ca7e0fc"; - sha256 = "bbf304319a40e755d47afbe0f172ad47aea35f5253669e5da60d8bd717b67070"; + rev = "ebcf3df39007aa5d65910f44eb20c9caea9007df"; + sha256 = "3261d098ae472ec29159b724cf4851d6304d7798e3da6daa4d34be8d308b1a2c"; }; dependencies = []; }; racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "racer-2016-01-02"; + name = "racer-2016-01-22"; src = fetchgit { url = "git://github.com/phildawes/racer"; - rev = "c94a17f844c13d2f115a53013c0f9e063bc31f23"; - sha256 = "fc42c224fbe12459e17c941ab6d084c838f11b1aabec55eaeebf617df2037124"; + rev = "1021df4b42436673f0124a62cad09e62d181635d"; + sha256 = "cef501a639da79bce31532b5f06570bd9c255a3d29ac97c6a4b67d640758bddb"; }; dependencies = []; buildPhase = '' @@ -725,44 +725,44 @@ rec { }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2016-01-03"; + name = "neocomplete-vim-2016-01-22"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "4c108ddadcf44c83c2ee38e5ac0dc8b0b31ed9a8"; - sha256 = "b112cfac177c142f09e4904f9d1b30ca402ed7642f0a4f8f003808dd804df52a"; + rev = "1606b89be1c4718115503156a657344bb3c62593"; + sha256 = "18c11d7f2aab440d895a742d63c58df5aa7d6353cbbf396ff31d1c85c617295a"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2016-01-04"; + name = "neosnippet-snippets-2016-01-22"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "1c6dacb99fcbeb186646ecafda3f07e07484b326"; - sha256 = "fd834aa6d612f124d9d443d1ac11a0749d4df18f012de0c3729de2ecc3cbead5"; + rev = "ac866f64a507f8a9c7e2691d947e5eaea679e50b"; + sha256 = "b1493c4b26ec68fab5e994f462c71f8db0341a2d4b8e42c4ee4f2604562b1247"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2016-01-04"; + name = "neosnippet-vim-2016-01-20"; src = fetchgit { url = "git://github.com/shougo/neosnippet.vim"; - rev = "ac6ac62a5bf259f2db5aaf0751b919b377d1a9b2"; - sha256 = "e9eaf68211965a71619bd3ff477982af7eccc30e6cb430a8fbf553469b22c127"; + rev = "52f8a2948957018572760837c165113dbb450e2b"; + sha256 = "a3451afd1896c0198fa9a3f3fd354efd2d0c7f1b59c15b43adf5db1b6c5e276b"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2016-01-06"; + name = "unite-vim-2016-01-17"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "98e9f3922b058145a0de08c5eb47990d34175252"; - sha256 = "eebec7f7c292ecbcc84219f79f1b74fa4183b1147fa577e9f1035f9c553fc95e"; + rev = "c9ce3b13c19352e3b791db227aa373c0b028d656"; + sha256 = "34319f371b11d97ca3b08b367c919f534bff13a8ab10cf532207e1bf62092f72"; }; dependencies = []; @@ -798,11 +798,11 @@ rec { }; gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gundo-vim-2015-12-07"; + name = "gundo-vim-2016-01-19"; src = fetchgit { url = "git://github.com/sjl/gundo.vim"; - rev = "dd5ab1e930deb8c74ea9046654dd0587df0cf459"; - sha256 = "6fe21b7398d8eb9b18f2015f64b7d40768123c2dbbde829d654d3dbf1ffb8070"; + rev = "e7fe41024ace9047eee610f23311d44fd9d917c0"; + sha256 = "30955656dd2cb6017e14658a3a5e98c79ec87ff1264b70cd6f628a4f3216bfcd"; }; dependencies = []; @@ -875,11 +875,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2016-01-05"; + name = "youcompleteme-2016-01-20"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "4168a829accbe895ebc82b54de6f929afe4ac9a5"; - sha256 = "a6df584dd9f244f8888bae0e60bb5742b841169fcf8efef9a052c0353c775405"; + rev = "d05bf551a677ac70d5b6de707a7174a97dccd4dd"; + sha256 = "28478612ddd2b917170e88d069687b65778fcb71a31f4aca7c26aa478b09a849"; }; dependencies = []; buildInputs = [ @@ -906,7 +906,7 @@ rec { homepage = http://github.com/Valloric/YouCompleteMe; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; }; @@ -1010,22 +1010,22 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2016-01-06"; + name = "vim-wakatime-2016-01-11"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "044b2138fb536df7e90fc4b3b2257eda43e76378"; - sha256 = "2a9589bdf89471c090394bfb4001e673d1da9064dfe3d100e1f9ac3672d7250b"; + rev = "91262cb3c04fe4d98ecdffe8da2197537c66359c"; + sha256 = "992e41ba32d575bb0bced8b2616cf08aab73f9980292fbc58c94c7f99f914540"; }; dependencies = []; buildInputs = [ python ]; }; command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2016-01-01"; + name = "command-t-2016-01-19"; src = fetchgit { url = "git://github.com/wincent/command-t"; - rev = "978c0a6bbd8a318023a19787f95cc2041c614db6"; - sha256 = "954bf0285ec37e975b227d3a1e80165fc52be673d9c5e510265dc911e06ff066"; + rev = "b772049e7e92a354702a9400ad185070ac7e7646"; + sha256 = "425f50d0c21c7f95bdd29532f487d00c7bccb97fb2e372a87a6a5bf2fd11a916"; }; dependencies = []; buildInputs = [ perl ruby ]; @@ -1071,11 +1071,11 @@ rec { }; pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen-2015-12-25"; + name = "pathogen-2016-01-19"; src = fetchgit { url = "git://github.com/tpope/vim-pathogen"; - rev = "4d584ea8c85408ca0d68b7b1693f3e2db8aa762a"; - sha256 = "1a1b5e650aa5ff107ce68fecf4d9a57cafc2c15ab74686c5ea3c5985de07470d"; + rev = "b4f20ff0acc8267875ca7a3841756fe18d55db15"; + sha256 = "649bdbc573fff16bf4bbb2f50f87978576a86af6fd836bef4f64e1e7996fdfe2"; }; dependencies = []; @@ -1202,11 +1202,11 @@ rec { }; tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2016-01-06"; + name = "tlib-2016-01-21"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "e8b53d80f73d98a9accd8b33344fd8821c8e71f7"; - sha256 = "5269b8949170443ebfccd8ce21238ef3c5cb2aeb857b1ea4aa5733298a75a382"; + rev = "3232708995e0e61d8e39af40e7a92598e30b84e8"; + sha256 = "525c31d4fdef8c44709b8d0b77d8ef70acf77b2375df40837088aeb0d4368747"; }; dependencies = []; @@ -1433,11 +1433,11 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2016-01-05"; + name = "vim-airline-2016-01-22"; src = fetchgit { url = "git://github.com/bling/vim-airline"; - rev = "ca6ab34e3ce2d25e5625fe56ef31d5032c69dbec"; - sha256 = "0a4352d8d1602c8eba62ab5c97c418c14eee9be142eb949d49c7b2866892e259"; + rev = "fb255b570de5582af13563e243fba743dfd0edc9"; + sha256 = "2dbd61c157ba58213bdccb595bfa13951f4e1db8fa4fbce8ddf94aa3a87c938c"; }; dependencies = []; @@ -1466,22 +1466,22 @@ rec { }; vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gista-2015-09-30"; + name = "vim-gista-2016-01-23"; src = fetchgit { url = "git://github.com/lambdalisue/vim-gista"; - rev = "a6cc5edc4e6dfcf7f6d7cf4dbcfbca6082f78957"; - sha256 = "68ecb6e1700e4e8f16c4096a8a554e3517e15d84bd1c07dbec4680c3947d1970"; + rev = "2021858d9cada2289a866387ba728dd025093aa1"; + sha256 = "1e3e925cdb6a9296f20c2261efb96eac0792e12c3b7a4f6a1637ac0a96255eb4"; }; dependencies = []; }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2015-12-16"; + name = "vim-gitgutter-2016-01-19"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "f52f875fc7b25b601366bd6c0d67c53ad84f9559"; - sha256 = "43e36cff7c12115f05dc3dc5225f38e6c084bf37f8a43a600ad54861392eadf7"; + rev = "4510e9b33506b4b09168c99934c42ee1ce89bba2"; + sha256 = "77d97922e8970fcdb037272a53c2ab4209d804aced7ae654f6aeb4501705bcd8"; }; dependencies = []; @@ -1510,11 +1510,11 @@ rec { }; vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2016-01-01"; + name = "vim-multiple-cursors-2016-01-14"; src = fetchgit { url = "git://github.com/terryma/vim-multiple-cursors"; - rev = "0dfd3f91b0ea1c70be8873d0a9e5c7d00369610f"; - sha256 = "820662a93102bc1fac679f108d5e3400f7f5431196d84abf24484849e004c325"; + rev = "e543fc86f0c6a8981c9679beceb06482778c3531"; + sha256 = "d10506c2196b32d389027a359f382d41c7c972f615a6745b9ee41c17741e062a"; }; dependencies = []; @@ -1532,22 +1532,22 @@ rec { }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2016-01-07"; + name = "vim-signify-2016-01-15"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "e134c152e05ec750091349629f048fe3d5d49962"; - sha256 = "68615d43c4d8a2573c19011a77409d8de62eede252759d84f6318409009e15d3"; + rev = "4f69c11c7cd7b75bb23cf7565f278af918816546"; + sha256 = "816f7472f04043139f216b91fc36612a9d73cddd86ca6c1cf86a7d48ca2d20e3"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2016-01-08"; + name = "vim-snippets-2016-01-17"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "ac2c763c05fa5ff27ed66b3a0f22f0f41c22192d"; - sha256 = "52ccca1e588a15745754651c3cbc57ae706d42d2dff8d4401374502b02787d60"; + rev = "0fc7fd1181f33b26c015d0f306d149b756f9d679"; + sha256 = "d67ccdcfa42e8e713e7a5bee34b5b150fb955a81fdddfe9c956a1f652f1235b6"; }; dependencies = []; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme index e498eef8c0b..48f5322267b 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme @@ -22,5 +22,5 @@ homepage = http://github.com/Valloric/YouCompleteMe; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index 520f20e2ed6..844f30e0c60 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -6,15 +6,14 @@ set -x die(){ echo $@; exit 1; } -# custom unpack: -mkdir fglrx +mkdir fglrx # custom unpack: cd fglrx unzip $src cd .. run_file=$(echo fglrx/amd-driver-installer-*) sh $run_file --extract . -eval "$patchPhase" +eval "$patchPhase1" case "$system" in x86_64-linux) @@ -31,6 +30,7 @@ case "$system" in esac # Handle/Build the kernel module. + if test -z "$libsOnly"; then kernelVersion=$(cd ${kernel}/lib/modules && ls) @@ -41,6 +41,7 @@ if test -z "$libsOnly"; then # current kbuild infrastructure allows using CONFIG_* defines # but ati sources don't use them yet.. # copy paste from make.sh + setSMP(){ linuxincludes=$kernelBuild/include @@ -68,7 +69,6 @@ if test -z "$libsOnly"; then if [ "$SMP" = 0 ]; then echo "assuming default: SMP=$SMP" fi - # act on final result if [ ! "$SMP" = 0 ]; then smp="-SMP" @@ -147,19 +147,15 @@ if test -z "$libsOnly"; then fi { # install - mkdir -p $out/lib/xorg - cp -r common/usr/include $out cp -r common/usr/sbin $out cp -r common/usr/share $out - cp -r common/usr/X11R6 $out - + mkdir $out/bin/ + cp -f common/usr/X11R6/bin/* $out/bin/ # cp -r arch/$arch/lib $out/lib - # what are those files used for? cp -r common/etc $out - cp -r $DIR_DEPENDING_ON_XORG_VERSION/usr/X11R6/$lib_arch/* $out/lib/xorg # install kernel module @@ -179,30 +175,26 @@ fi cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri/* $out/lib cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/*.so* $out/lib cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/fglrx/fglrx-libGL.so.1.2 $out/lib/fglrx-libGL.so.1.2 - cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib - - # cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib ln -s libatiuki.so.1.0 $out/lib/libatiuki.so.1 ln -s fglrx-libGL.so.1.2 $out/lib/libGL.so.1 ln -s fglrx-libGL.so.1.2 $out/lib/libGL.so - - ln -s libfglrx_gamma.so.1.0 $out/lib/libfglrx_gamma.so.1 + # FIXME : This file is missing or has changed versions + #ln -s libfglrx_gamma.so.1.0 $out/lib/libfglrx_gamma.so.1 # make xorg use the ati version ln -s $out/lib/xorg/modules/extensions/{fglrx/fglrx-libglx.so,libglx.so} - # Correct some paths that are hardcoded into binary libs. if [ "$arch" == "x86_64" ]; then for lib in \ - lib/xorg/modules/extensions/fglrx/fglrx-libglx.so \ - lib/xorg/modules/glesx.so \ - lib/dri/fglrx_dri.so \ - lib/fglrx_dri.so \ - lib/fglrx-libGL.so.1.2 + xorg/modules/extensions/fglrx/fglrx-libglx.so \ + xorg/modules/glesx.so \ + dri/fglrx_dri.so \ + fglrx_dri.so \ + fglrx-libGL.so.1.2 do oldPaths="/usr/X11R6/lib/modules/dri" newPaths="/run/opengl-driver/lib/dri" - sed -i -e "s|$oldPaths|$newPaths|" $out/$lib + sed -i -e "s|$oldPaths|$newPaths|" $out/lib/$lib done else oldPaths="/usr/X11R6/lib32/modules/dri\x00/usr/lib32/dri" @@ -211,34 +203,45 @@ fi $out/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so for lib in \ - lib/dri/fglrx_dri.so \ - lib/fglrx_dri.so \ - lib/xorg/modules/glesx.so + dri/fglrx_dri.so \ + fglrx_dri.so \ + xorg/modules/glesx.so do oldPaths="/usr/X11R6/lib32/modules/dri/" newPaths="/run/opengl-driver-32/lib/dri" - sed -i -e "s|$oldPaths|$newPaths|" $out/$lib + sed -i -e "s|$oldPaths|$newPaths|" $out/lib/$lib done oldPaths="/usr/X11R6/lib32/modules/dri\x00" newPaths="/run/opengl-driver-32/lib/dri" sed -i -e "s|$oldPaths|$newPaths|" $out/lib/fglrx-libGL.so.1.2 fi - # libstdc++ and gcc are needed by some libs - patchelf --set-rpath $gcc/$lib_arch $out/lib/libatiadlxx.so - patchelf --set-rpath $gcc/$lib_arch $out/lib/xorg/modules/glesx.so + for pelib1 in \ + fglrx_dri.so \ + dri/fglrx_dri.so + do + patchelf --remove-needed libX11.so.6 $out/lib/$pelib1 + done + + for pelib2 in \ + libatiadlxx.so \ + xorg/modules/glesx.so \ + dri/fglrx_dri.so \ + fglrx_dri.so \ + libaticaldd.so + do + patchelf --set-rpath $gcc/$lib_arch/ $out/lib/$pelib2 + done } if test -z "$libsOnly"; then { # build samples mkdir -p $out/bin - mkdir -p samples cd samples tar xfz ../common/usr/src/ati/fglrx_sample_source.tgz - eval "$patchPhaseSamples" ( # build and install fgl_glxgears @@ -252,27 +255,42 @@ if test -z "$libsOnly"; then true || ( # build and install + ### + ## FIXME ? # doesn't build undefined reference to `FGLRX_X11SetGamma' - # wich should be contained in -lfglrx_gamma + # which should be contained in -lfglrx_gamma + # This should create $out/lib/libfglrx_gamma.so.1.0 ? because there is + # a symlink named libfglrx_gamma.so.1 linking to libfglrx_gamma.so.1.0 in $out/lib/ cd programs/fglrx_gamma gcc -fPIC -I${libXxf86vm}/include \ -I${xf86vidmodeproto}/include \ -I$out/X11R6/include \ -L$out/lib \ - -Wall -lm -lfglrx_gamma -lX11 -lXext -o fglrx_xgamma fglrx_xgamma.c + -Wall -lm -lfglrx_gamma -lX11 -lXext -o $out/bin/fglrx_xgamma fglrx_xgamma.c ) - { # copy binaries and wrap them: + { + # patch and copy statically linked qt libs used by amdcccle + patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 && + patchelf --set-rpath $gcc/$lib_arch/ $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 && + patchelf --set-rpath $gcc/$lib_arch/:$out/share/ati/:$libXrender/lib/:$libSM/lib/:$libICE/lib/:$libfontconfig/lib/:$libfreetype/lib/ $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtGui.so.4 && + mkdir -p $out/share/ati + cp -r $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 $out/share/ati/ + cp -r $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtGui.so.4 $out/share/ati/ + # copy binaries and wrap them: BIN=$TMP/arch/$arch/usr/X11R6/bin - cp $BIN/* $out/bin + patchelf --set-rpath $gcc/$lib_arch/:$out/share/ati/:$libXinerama/lib/:$libXrandr/lib/ $TMP/arch/$arch/usr/X11R6/bin/amdcccle + patchelf --set-rpath $libXrender/lib/:$libXrandr/lib/ $TMP/arch/$arch/usr/X11R6/bin/aticonfig + patchelf --shrink-rpath $BIN/amdcccle for prog in $BIN/*; do - patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $out/bin/$(basename $prog) - wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib:$gcc/lib:$qt4/lib:$LD_LIBRARY_PATH + cp -f $prog $out/bin && + patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $out/bin/$(basename $prog) && + wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib/:$gcc/lib/:$out/share/ati/:$libXinerama/lib/:$libXrandr/lib/:$libfontconfig/lib/:$libfreetype/lib/:$LD_LIBRARY_PATH done } - rm -fr $out/lib/modules/fglrx # don't think those .a files are needed. They cause failure of the mod + rm -f $out/lib/fglrx/switchlibglx && rm -f $out/lib/fglrx/switchlibGL } diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index bb088885509..377297feaf7 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -1,9 +1,6 @@ -{ stdenv, fetchurl, kernel ? null, which, imake -, mesa # for fgl_glxgears -, libXxf86vm, xf86vidmodeproto # for fglrx_gamma -, xorg, makeWrapper, glibc, patchelf -, unzip -, qt4 # for amdcccle +{ stdenv, fetchurl, kernel ? null, which +, xorg, makeWrapper, glibc, patchelf, unzip +, fontconfig, freetype, mesa # for fgl_glxgears , # Whether to build the libraries only (i.e. not the kernel module or # driver utils). Used to support 32-bit binaries on 64-bit # Linux. @@ -12,6 +9,15 @@ assert (!libsOnly) -> kernel != null; +with stdenv.lib; + +let + version = "15.7"; +in + +# This derivation requires a maximum of gcc49, Linux kernel 4.1 and xorg.xserver 1.17 +# and will not build or run using versions newer + # If you want to use a different Xorg version probably # DIR_DEPENDING_ON_XORG_VERSION in builder.sh has to be adopted (?) # make sure libglx.so of ati is used. xorg.xorgserver does provide it as well @@ -20,23 +26,37 @@ assert (!libsOnly) -> kernel != null; # See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a # workaround (TODO) -# The gentoo ebuild contains much more magic and is usually a great resource to -# find patches :) +# The gentoo ebuild contains much more "magic" and is usually a great resource to +# find patches XD # http://wiki.cchtml.com/index.php/Main_Page -# There is one issue left: +# # /usr/lib/dri/fglrx_dri.so must point to /run/opengl-driver/lib/fglrx_dri.so - -with stdenv.lib; +# This is done in the builder script. stdenv.mkDerivation { - name = "ati-drivers-15.7" + (optionalString (!libsOnly) "-${kernel.version}"); + + linuxonly = + if stdenv.system == "i686-linux" then + true + else if stdenv.system == "x86_64-linux" then + true + else throw "ati-drivers are Linux only. Sorry. The build was stopped."; + + name = "ati-drivers-${version}" + (optionalString (!libsOnly) "-${kernel.version}"); builder = ./builder.sh; - - inherit libXxf86vm xf86vidmodeproto; gcc = stdenv.cc.cc; + libXinerama = xorg.libXinerama; + libXrandr = xorg.libXrandr; + libXrender = xorg.libXrender; + libXxf86vm = xorg.libXxf86vm; + xf86vidmodeproto = xorg.xf86vidmodeproto; + libSM = xorg.libSM; + libICE = xorg.libICE; + libfreetype = freetype; + libfontconfig = fontconfig; src = fetchurl { url = "http://www2.ati.com/drivers/linux/amd-driver-installer-15.20.1046-x86.x86_64.zip"; @@ -44,16 +64,19 @@ stdenv.mkDerivation { curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; }; - patchPhase = "patch -p1 < ${./kernel-api-fixes.patch}"; patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}"; + patchPhase1 = "patch -p1 < ${./kernel-api-fixes.patch}"; buildInputs = - [ xorg.libXext xorg.libX11 xorg.libXinerama - xorg.libXrandr which imake makeWrapper + [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM + xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE patchelf unzip mesa - qt4 + fontconfig + freetype + makeWrapper + which ]; inherit libsOnly; @@ -63,26 +86,37 @@ stdenv.mkDerivation { inherit glibc /* glibc only used for setting interpreter */; LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" - [ "${xorg.libXrandr}/lib" - "${xorg.libXrender}/lib" - "${xorg.libXext}/lib" - "${xorg.libX11}/lib" - "${xorg.libXinerama}/lib" + [ "${xorg.libXrandr}/lib/" + "${xorg.libXrender}/lib/" + "${xorg.libXext}/lib/" + "${xorg.libX11}/lib/" + "${xorg.libXinerama}/lib/" + "${xorg.libSM}/lib/" + "${xorg.libICE}/lib/" + "${stdenv.cc.cc}/lib/" ]; # without this some applications like blender don't start, but they start # with nvidia. This causes them to be symlinked to $out/lib so that they # appear in /run/opengl-driver/lib which get's added to LD_LIBRARY_PATH - extraDRIlibs = [ xorg.libXext ]; - inherit mesa qt4; # only required to build examples and amdcccle + extraDRIlibs = [ xorg.libXrandr xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM xorg.libICE ]; + + inherit mesa; # only required to build the examples + + enableParallelBuilding = true; meta = with stdenv.lib; { - description = "ATI drivers"; + description = "ATI Catalyst display drivers"; homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; license = licenses.unfree; maintainers = with maintainers; [ marcweber offline jgeerds ]; platforms = platforms.linux; hydraPlatforms = []; + # Copied from the nvidia default.nix to prevent a store collision. + priority = 4; }; + + + } diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index a42194d7193..72f14ff2d68 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap }: let - ver = "2015.2"; + ver = "2016.0"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0cyr3bxwypddifg18yi3i5mcdam8izlq3ayrbkjir2b4vqhixs3s"; + sha256 = "1zlmcp9r1xwp6li56j5ip9x7h5gjdhh0gi6cb3f8x6ydszhynxbf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 3ea4fc5f96e..c17f7beb74f 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2015.2"; + ver = "2016.0"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "1yv9i304bicm34mgl387c21ynv711yr2m5ycx9hjbxprkyzjlkdi"; + sha256 = "0khpw0w26j6pc1263phk086chs64p9m6a63azk62pxs1cmmbr80y"; }; nativeBuildInputs = [ pkgconfig ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index e50d613624d..b8bef1b5a9a 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -2,14 +2,14 @@ #assert stdenv.lib.versionOlder kernel.version "3.17"; -let base = "batman-adv-2015.2"; in +let base = "batman-adv-2016.0"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "0lj8q9fnrf9n434h9wb2385z65skmq8q64svx5hbnlcj0bjhyxw6"; + sha256 = "0r5faf12ifpj8h1fklkzvy4ck359cadk8xh1l3n7vimh67hxbxbz"; }; preBuild = '' diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 753771bf44e..cc132ddc397 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.36"; + name = "bluez-5.37"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "1wkqwmi5krr37mxcqqlp5m2xnw7vw70v3ww7j09vvlskxcdflhx3"; + sha256 = "c14ba9ddcb0055522073477b8fd8bf1ddf5d219e75fdfd4699b7e0ce5350d6b0"; }; pythonPath = with pythonPackages; diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix index db5f88b935f..0b67a5382f7 100644 --- a/pkgs/os-specific/linux/e1000e/default.nix +++ b/pkgs/os-specific/linux/e1000e/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kernel }: stdenv.mkDerivation { - name = "e1000e-2.5.4-${kernel.version}"; + name = "e1000e-3.3.1-${kernel.version}"; src = fetchurl { - url = "mirror://sourceforge/e1000/e1000e-2.5.4.tar.gz"; - sha256 = "0bmihkc7y37jzwi996ryqblnyflyhhbimbnrnmlk419vxlzg1pzi"; + url = "mirror://sourceforge/e1000/e1000e-3.3.1.tar.gz"; + sha256 = "07hg6xxqgqshnys1qs9wbl9qr7d4ixdkd1y1fj27cg6bn8s2n797"; }; configurePhase = '' diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/pkgs/os-specific/linux/firmware/rt5677/default.nix new file mode 100644 index 00000000000..46716b3f490 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/rt5677/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation { + name = "rt5677-firmware"; + + src = fetchgit { + url = "https://github.com/raphael/linux-samus"; + rev = "995de6c2093797905fbcd79f1a3625dd3f50be37"; + sha256 = "6e59f7ce24122eb9474e7863e63729de632e4c7afcb8f08534cb2102007f8381"; + }; + + + installPhase = '' + mkdir -p $out/lib/firmware + cp ./firmware/rt5677_elf_vad $out/lib/firmware + ''; + + meta = with stdenv.lib; { + description = "Firmware for Realtek rt5677 device"; + license = licenses.unfreeRedistributableFirmware; + maintainers = [ maintainers.zohl ]; + }; +} diff --git a/pkgs/os-specific/linux/kernel-headers/unifdef-getline.patch b/pkgs/os-specific/linux/kernel-headers/unifdef-getline.patch deleted file mode 100644 index 8caabfd3286..00000000000 --- a/pkgs/os-specific/linux/kernel-headers/unifdef-getline.patch +++ /dev/null @@ -1,35 +0,0 @@ -This patch fixes a trivial compilation error with glibc 2.11. -From http://patchwork.kernel.org/patch/11166/ . - -diff --git a/scripts/unifdef.c b/scripts/unifdef.c -index 552025e..977e682 100644 ---- a/scripts/unifdef.c -+++ b/scripts/unifdef.c -@@ -206,7 +206,7 @@ static void done(void); - static void error(const char *); - static int findsym(const char *); - static void flushline(bool); --static Linetype getline(void); -+static Linetype parseline(void); - static Linetype ifeval(const char **); - static void ignoreoff(void); - static void ignoreon(void); -@@ -512,7 +512,7 @@ process(void) - - for (;;) { - linenum++; -- lineval = getline(); -+ lineval = parseline(); - trans_table[ifstate[depth]][lineval](); - debug("process %s -> %s depth %d", - linetype_name[lineval], -@@ -526,7 +526,7 @@ process(void) - * help from skipcomment(). - */ - static Linetype --getline(void) -+parseline(void) - { - const char *cp; - int cursym; - diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch deleted file mode 100644 index b411f43298c..00000000000 --- a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch +++ /dev/null @@ -1,553 +0,0 @@ -From 125fccb600288968aa3395883c0a394c47176fcd Mon Sep 17 00:00:00 2001 -From: John Johansen -Date: Wed, 10 Aug 2011 22:02:39 -0700 -Subject: [PATCH 1/3] AppArmor: compatibility patch for v5 network controll - -Add compatibility for v5 network rules. - -Signed-off-by: John Johansen ---- - include/linux/lsm_audit.h | 4 + - security/apparmor/Makefile | 19 +++- - security/apparmor/include/net.h | 40 +++++++++ - security/apparmor/include/policy.h | 3 + - security/apparmor/lsm.c | 112 ++++++++++++++++++++++++ - security/apparmor/net.c | 170 ++++++++++++++++++++++++++++++++++++ - security/apparmor/policy.c | 1 + - security/apparmor/policy_unpack.c | 48 +++++++++- - 8 files changed, 394 insertions(+), 3 deletions(-) - create mode 100644 security/apparmor/include/net.h - create mode 100644 security/apparmor/net.c - -diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h -index 88e78de..c63979a 100644 ---- a/include/linux/lsm_audit.h -+++ b/include/linux/lsm_audit.h -@@ -124,6 +124,10 @@ struct common_audit_data { - u32 denied; - uid_t ouid; - } fs; -+ struct { -+ int type, protocol; -+ struct sock *sk; -+ } net; - }; - } apparmor_audit_data; - #endif -diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile -index 2dafe50..7cefef9 100644 ---- a/security/apparmor/Makefile -+++ b/security/apparmor/Makefile -@@ -4,9 +4,9 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o - - apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \ - path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \ -- resource.o sid.o file.o -+ resource.o sid.o file.o net.o - --clean-files := capability_names.h rlim_names.h -+clean-files := capability_names.h rlim_names.h af_names.h - - - # Build a lower case string table of capability names -@@ -44,9 +44,24 @@ cmd_make-rlim = echo "static const char *rlim_names[] = {" > $@ ;\ - sed -r -n "s/^\# ?define[ \t]+(RLIMIT_[A-Z0-9_]+).*/\1,/p" $< >> $@ ;\ - echo "};" >> $@ - -+# Build a lower case string table of address family names. -+# Transform lines from -+# #define AF_INET 2 /* Internet IP Protocol */ -+# to -+# [2] = "inet", -+quiet_cmd_make-af = GEN $@ -+cmd_make-af = echo "static const char *address_family_names[] = {" > $@ ;\ -+ sed $< >> $@ -r -n -e "/AF_MAX/d" -e "/AF_LOCAL/d" -e \ -+ 's/^\#define[ \t]+AF_([A-Z0-9_]+)[ \t]+([0-9]+).*/[\2] = "\L\1",/p';\ -+ echo "};" >> $@ -+ -+ - $(obj)/capability.o : $(obj)/capability_names.h - $(obj)/resource.o : $(obj)/rlim_names.h -+$(obj)/net.o : $(obj)/af_names.h - $(obj)/capability_names.h : $(srctree)/include/linux/capability.h - $(call cmd,make-caps) - $(obj)/rlim_names.h : $(srctree)/include/asm-generic/resource.h - $(call cmd,make-rlim) -+$(obj)/af_names.h : $(srctree)/include/linux/socket.h -+ $(call cmd,make-af) -\ No newline at end of file -diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h -new file mode 100644 -index 0000000..3c7d599 ---- /dev/null -+++ b/security/apparmor/include/net.h -@@ -0,0 +1,40 @@ -+/* -+ * AppArmor security module -+ * -+ * This file contains AppArmor network mediation definitions. -+ * -+ * Copyright (C) 1998-2008 Novell/SUSE -+ * Copyright 2009-2010 Canonical Ltd. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation, version 2 of the -+ * License. -+ */ -+ -+#ifndef __AA_NET_H -+#define __AA_NET_H -+ -+#include -+ -+/* struct aa_net - network confinement data -+ * @allowed: basic network families permissions -+ * @audit_network: which network permissions to force audit -+ * @quiet_network: which network permissions to quiet rejects -+ */ -+struct aa_net { -+ u16 allow[AF_MAX]; -+ u16 audit[AF_MAX]; -+ u16 quiet[AF_MAX]; -+}; -+ -+extern int aa_net_perm(int op, struct aa_profile *profile, u16 family, -+ int type, int protocol, struct sock *sk); -+extern int aa_revalidate_sk(int op, struct sock *sk); -+ -+static inline void aa_free_net_rules(struct aa_net *new) -+{ -+ /* NOP */ -+} -+ -+#endif /* __AA_NET_H */ -diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h -index aeda5cf..6776929 100644 ---- a/security/apparmor/include/policy.h -+++ b/security/apparmor/include/policy.h -@@ -27,6 +27,7 @@ - #include "capability.h" - #include "domain.h" - #include "file.h" -+#include "net.h" - #include "resource.h" - - extern const char *profile_mode_names[]; -@@ -145,6 +146,7 @@ struct aa_namespace { - * @size: the memory consumed by this profiles rules - * @file: The set of rules governing basic file access and domain transitions - * @caps: capabilities for the profile -+ * @net: network controls for the profile - * @rlimits: rlimits for the profile - * - * The AppArmor profile contains the basic confinement data. Each profile -@@ -181,6 +183,7 @@ struct aa_profile { - - struct aa_file_rules file; - struct aa_caps caps; -+ struct aa_net net; - struct aa_rlimit rlimits; - }; - -diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c -index 3783202..7459547 100644 ---- a/security/apparmor/lsm.c -+++ b/security/apparmor/lsm.c -@@ -32,6 +32,7 @@ - #include "include/context.h" - #include "include/file.h" - #include "include/ipc.h" -+#include "include/net.h" - #include "include/path.h" - #include "include/policy.h" - #include "include/procattr.h" -@@ -621,6 +622,104 @@ static int apparmor_task_setrlimit(struct task_struct *task, - return error; - } - -+static int apparmor_socket_create(int family, int type, int protocol, int kern) -+{ -+ struct aa_profile *profile; -+ int error = 0; -+ -+ if (kern) -+ return 0; -+ -+ profile = __aa_current_profile(); -+ if (!unconfined(profile)) -+ error = aa_net_perm(OP_CREATE, profile, family, type, protocol, -+ NULL); -+ return error; -+} -+ -+static int apparmor_socket_bind(struct socket *sock, -+ struct sockaddr *address, int addrlen) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_BIND, sk); -+} -+ -+static int apparmor_socket_connect(struct socket *sock, -+ struct sockaddr *address, int addrlen) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_CONNECT, sk); -+} -+ -+static int apparmor_socket_listen(struct socket *sock, int backlog) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_LISTEN, sk); -+} -+ -+static int apparmor_socket_accept(struct socket *sock, struct socket *newsock) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_ACCEPT, sk); -+} -+ -+static int apparmor_socket_sendmsg(struct socket *sock, -+ struct msghdr *msg, int size) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_SENDMSG, sk); -+} -+ -+static int apparmor_socket_recvmsg(struct socket *sock, -+ struct msghdr *msg, int size, int flags) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_RECVMSG, sk); -+} -+ -+static int apparmor_socket_getsockname(struct socket *sock) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_GETSOCKNAME, sk); -+} -+ -+static int apparmor_socket_getpeername(struct socket *sock) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_GETPEERNAME, sk); -+} -+ -+static int apparmor_socket_getsockopt(struct socket *sock, int level, -+ int optname) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_GETSOCKOPT, sk); -+} -+ -+static int apparmor_socket_setsockopt(struct socket *sock, int level, -+ int optname) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_SETSOCKOPT, sk); -+} -+ -+static int apparmor_socket_shutdown(struct socket *sock, int how) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_SOCK_SHUTDOWN, sk); -+} -+ - static struct security_operations apparmor_ops = { - .name = "apparmor", - -@@ -652,6 +751,19 @@ static struct security_operations apparmor_ops = { - .getprocattr = apparmor_getprocattr, - .setprocattr = apparmor_setprocattr, - -+ .socket_create = apparmor_socket_create, -+ .socket_bind = apparmor_socket_bind, -+ .socket_connect = apparmor_socket_connect, -+ .socket_listen = apparmor_socket_listen, -+ .socket_accept = apparmor_socket_accept, -+ .socket_sendmsg = apparmor_socket_sendmsg, -+ .socket_recvmsg = apparmor_socket_recvmsg, -+ .socket_getsockname = apparmor_socket_getsockname, -+ .socket_getpeername = apparmor_socket_getpeername, -+ .socket_getsockopt = apparmor_socket_getsockopt, -+ .socket_setsockopt = apparmor_socket_setsockopt, -+ .socket_shutdown = apparmor_socket_shutdown, -+ - .cred_alloc_blank = apparmor_cred_alloc_blank, - .cred_free = apparmor_cred_free, - .cred_prepare = apparmor_cred_prepare, -diff --git a/security/apparmor/net.c b/security/apparmor/net.c -new file mode 100644 -index 0000000..1765901 ---- /dev/null -+++ b/security/apparmor/net.c -@@ -0,0 +1,170 @@ -+/* -+ * AppArmor security module -+ * -+ * This file contains AppArmor network mediation -+ * -+ * Copyright (C) 1998-2008 Novell/SUSE -+ * Copyright 2009-2010 Canonical Ltd. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation, version 2 of the -+ * License. -+ */ -+ -+#include "include/apparmor.h" -+#include "include/audit.h" -+#include "include/context.h" -+#include "include/net.h" -+#include "include/policy.h" -+ -+#include "af_names.h" -+ -+static const char *sock_type_names[] = { -+ "unknown(0)", -+ "stream", -+ "dgram", -+ "raw", -+ "rdm", -+ "seqpacket", -+ "dccp", -+ "unknown(7)", -+ "unknown(8)", -+ "unknown(9)", -+ "packet", -+}; -+ -+/* audit callback for net specific fields */ -+static void audit_cb(struct audit_buffer *ab, void *va) -+{ -+ struct common_audit_data *sa = va; -+ -+ audit_log_format(ab, " family="); -+ if (address_family_names[sa->u.net.family]) { -+ audit_log_string(ab, address_family_names[sa->u.net.family]); -+ } else { -+ audit_log_format(ab, " \"unknown(%d)\"", sa->u.net.family); -+ } -+ -+ audit_log_format(ab, " sock_type="); -+ if (sock_type_names[sa->aad.net.type]) { -+ audit_log_string(ab, sock_type_names[sa->aad.net.type]); -+ } else { -+ audit_log_format(ab, "\"unknown(%d)\"", sa->aad.net.type); -+ } -+ -+ audit_log_format(ab, " protocol=%d", sa->aad.net.protocol); -+} -+ -+/** -+ * audit_net - audit network access -+ * @profile: profile being enforced (NOT NULL) -+ * @op: operation being checked -+ * @family: network family -+ * @type: network type -+ * @protocol: network protocol -+ * @sk: socket auditing is being applied to -+ * @error: error code for failure else 0 -+ * -+ * Returns: %0 or sa->error else other errorcode on failure -+ */ -+static int audit_net(struct aa_profile *profile, int op, u16 family, int type, -+ int protocol, struct sock *sk, int error) -+{ -+ int audit_type = AUDIT_APPARMOR_AUTO; -+ struct common_audit_data sa; -+ if (sk) { -+ COMMON_AUDIT_DATA_INIT(&sa, NET); -+ } else { -+ COMMON_AUDIT_DATA_INIT(&sa, NONE); -+ } -+ /* todo fill in socket addr info */ -+ -+ sa.aad.op = op, -+ sa.u.net.family = family; -+ sa.u.net.sk = sk; -+ sa.aad.net.type = type; -+ sa.aad.net.protocol = protocol; -+ sa.aad.error = error; -+ -+ if (likely(!sa.aad.error)) { -+ u16 audit_mask = profile->net.audit[sa.u.net.family]; -+ if (likely((AUDIT_MODE(profile) != AUDIT_ALL) && -+ !(1 << sa.aad.net.type & audit_mask))) -+ return 0; -+ audit_type = AUDIT_APPARMOR_AUDIT; -+ } else { -+ u16 quiet_mask = profile->net.quiet[sa.u.net.family]; -+ u16 kill_mask = 0; -+ u16 denied = (1 << sa.aad.net.type) & ~quiet_mask; -+ -+ if (denied & kill_mask) -+ audit_type = AUDIT_APPARMOR_KILL; -+ -+ if ((denied & quiet_mask) && -+ AUDIT_MODE(profile) != AUDIT_NOQUIET && -+ AUDIT_MODE(profile) != AUDIT_ALL) -+ return COMPLAIN_MODE(profile) ? 0 : sa.aad.error; -+ } -+ -+ return aa_audit(audit_type, profile, GFP_KERNEL, &sa, audit_cb); -+} -+ -+/** -+ * aa_net_perm - very course network access check -+ * @op: operation being checked -+ * @profile: profile being enforced (NOT NULL) -+ * @family: network family -+ * @type: network type -+ * @protocol: network protocol -+ * -+ * Returns: %0 else error if permission denied -+ */ -+int aa_net_perm(int op, struct aa_profile *profile, u16 family, int type, -+ int protocol, struct sock *sk) -+{ -+ u16 family_mask; -+ int error; -+ -+ if ((family < 0) || (family >= AF_MAX)) -+ return -EINVAL; -+ -+ if ((type < 0) || (type >= SOCK_MAX)) -+ return -EINVAL; -+ -+ /* unix domain and netlink sockets are handled by ipc */ -+ if (family == AF_UNIX || family == AF_NETLINK) -+ return 0; -+ -+ family_mask = profile->net.allow[family]; -+ -+ error = (family_mask & (1 << type)) ? 0 : -EACCES; -+ -+ return audit_net(profile, op, family, type, protocol, sk, error); -+} -+ -+/** -+ * aa_revalidate_sk - Revalidate access to a sock -+ * @op: operation being checked -+ * @sk: sock being revalidated (NOT NULL) -+ * -+ * Returns: %0 else error if permission denied -+ */ -+int aa_revalidate_sk(int op, struct sock *sk) -+{ -+ struct aa_profile *profile; -+ int error = 0; -+ -+ /* aa_revalidate_sk should not be called from interrupt context -+ * don't mediate these calls as they are not task related -+ */ -+ if (in_interrupt()) -+ return 0; -+ -+ profile = __aa_current_profile(); -+ if (!unconfined(profile)) -+ error = aa_net_perm(op, profile, sk->sk_family, sk->sk_type, -+ sk->sk_protocol, sk); -+ -+ return error; -+} -diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c -index 4f0eade..4d5ce13 100644 ---- a/security/apparmor/policy.c -+++ b/security/apparmor/policy.c -@@ -745,6 +745,7 @@ static void free_profile(struct aa_profile *profile) - - aa_free_file_rules(&profile->file); - aa_free_cap_rules(&profile->caps); -+ aa_free_net_rules(&profile->net); - aa_free_rlimit_rules(&profile->rlimits); - - aa_free_sid(profile->sid); -diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c -index 741dd13..ee8043e 100644 ---- a/security/apparmor/policy_unpack.c -+++ b/security/apparmor/policy_unpack.c -@@ -190,6 +190,19 @@ fail: - return 0; - } - -+static bool unpack_u16(struct aa_ext *e, u16 *data, const char *name) -+{ -+ if (unpack_nameX(e, AA_U16, name)) { -+ if (!inbounds(e, sizeof(u16))) -+ return 0; -+ if (data) -+ *data = le16_to_cpu(get_unaligned((u16 *) e->pos)); -+ e->pos += sizeof(u16); -+ return 1; -+ } -+ return 0; -+} -+ - static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name) - { - if (unpack_nameX(e, AA_U32, name)) { -@@ -468,7 +481,8 @@ static struct aa_profile *unpack_profile(struct aa_ext *e) - { - struct aa_profile *profile = NULL; - const char *name = NULL; -- int error = -EPROTO; -+ size_t size = 0; -+ int i, error = -EPROTO; - kernel_cap_t tmpcap; - u32 tmp; - -@@ -559,6 +573,38 @@ static struct aa_profile *unpack_profile(struct aa_ext *e) - if (!unpack_rlimits(e, profile)) - goto fail; - -+ size = unpack_array(e, "net_allowed_af"); -+ if (size) { -+ -+ for (i = 0; i < size; i++) { -+ /* discard extraneous rules that this kernel will -+ * never request -+ */ -+ if (i >= AF_MAX) { -+ u16 tmp; -+ if (!unpack_u16(e, &tmp, NULL) || -+ !unpack_u16(e, &tmp, NULL) || -+ !unpack_u16(e, &tmp, NULL)) -+ goto fail; -+ continue; -+ } -+ if (!unpack_u16(e, &profile->net.allow[i], NULL)) -+ goto fail; -+ if (!unpack_u16(e, &profile->net.audit[i], NULL)) -+ goto fail; -+ if (!unpack_u16(e, &profile->net.quiet[i], NULL)) -+ goto fail; -+ } -+ if (!unpack_nameX(e, AA_ARRAYEND, NULL)) -+ goto fail; -+ /* -+ * allow unix domain and netlink sockets they are handled -+ * by IPC -+ */ -+ } -+ profile->net.allow[AF_UNIX] = 0xffff; -+ profile->net.allow[AF_NETLINK] = 0xffff; -+ - /* get file rules */ - profile->file.dfa = unpack_dfa(e); - if (IS_ERR(profile->file.dfa)) { --- -1.7.9.5 - diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch deleted file mode 100644 index aa4b6b1109f..00000000000 --- a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch +++ /dev/null @@ -1,391 +0,0 @@ -From 004192fb5223c7b81a949e36a080a5da56132826 Mon Sep 17 00:00:00 2001 -From: John Johansen -Date: Wed, 10 Aug 2011 22:02:40 -0700 -Subject: [PATCH 2/3] AppArmor: compatibility patch for v5 interface - -Signed-off-by: John Johansen ---- - security/apparmor/Kconfig | 9 + - security/apparmor/Makefile | 1 + - security/apparmor/apparmorfs-24.c | 287 ++++++++++++++++++++++++++++++++ - security/apparmor/apparmorfs.c | 18 +- - security/apparmor/include/apparmorfs.h | 6 + - 5 files changed, 319 insertions(+), 2 deletions(-) - create mode 100644 security/apparmor/apparmorfs-24.c - -diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig -index 9b9013b..51ebf96 100644 ---- a/security/apparmor/Kconfig -+++ b/security/apparmor/Kconfig -@@ -29,3 +29,12 @@ config SECURITY_APPARMOR_BOOTPARAM_VALUE - boot. - - If you are unsure how to answer this question, answer 1. -+ -+config SECURITY_APPARMOR_COMPAT_24 -+ bool "Enable AppArmor 2.4 compatability" -+ depends on SECURITY_APPARMOR -+ default y -+ help -+ This option enables compatability with AppArmor 2.4. It is -+ recommended if compatability with older versions of AppArmor -+ is desired. -diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile -index 7cefef9..0bb604b 100644 ---- a/security/apparmor/Makefile -+++ b/security/apparmor/Makefile -@@ -5,6 +5,7 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o - apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \ - path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \ - resource.o sid.o file.o net.o -+apparmor-$(CONFIG_SECURITY_APPARMOR_COMPAT_24) += apparmorfs-24.o - - clean-files := capability_names.h rlim_names.h af_names.h - -diff --git a/security/apparmor/apparmorfs-24.c b/security/apparmor/apparmorfs-24.c -new file mode 100644 -index 0000000..dc8c744 ---- /dev/null -+++ b/security/apparmor/apparmorfs-24.c -@@ -0,0 +1,287 @@ -+/* -+ * AppArmor security module -+ * -+ * This file contains AppArmor /sys/kernel/secrutiy/apparmor interface functions -+ * -+ * Copyright (C) 1998-2008 Novell/SUSE -+ * Copyright 2009-2010 Canonical Ltd. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation, version 2 of the -+ * License. -+ * -+ * -+ * This file contain functions providing an interface for <= AppArmor 2.4 -+ * compatibility. It is dependent on CONFIG_SECURITY_APPARMOR_COMPAT_24 -+ * being set (see Makefile). -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "include/apparmor.h" -+#include "include/audit.h" -+#include "include/context.h" -+#include "include/policy.h" -+ -+ -+/* apparmor/matching */ -+static ssize_t aa_matching_read(struct file *file, char __user *buf, -+ size_t size, loff_t *ppos) -+{ -+ const char matching[] = "pattern=aadfa audit perms=crwxamlk/ " -+ "user::other"; -+ -+ return simple_read_from_buffer(buf, size, ppos, matching, -+ sizeof(matching) - 1); -+} -+ -+const struct file_operations aa_fs_matching_fops = { -+ .read = aa_matching_read, -+}; -+ -+/* apparmor/features */ -+static ssize_t aa_features_read(struct file *file, char __user *buf, -+ size_t size, loff_t *ppos) -+{ -+ const char features[] = "file=3.1 capability=2.0 network=1.0 " -+ "change_hat=1.5 change_profile=1.1 " "aanamespaces=1.1 rlimit=1.1"; -+ -+ return simple_read_from_buffer(buf, size, ppos, features, -+ sizeof(features) - 1); -+} -+ -+const struct file_operations aa_fs_features_fops = { -+ .read = aa_features_read, -+}; -+ -+/** -+ * __next_namespace - find the next namespace to list -+ * @root: root namespace to stop search at (NOT NULL) -+ * @ns: current ns position (NOT NULL) -+ * -+ * Find the next namespace from @ns under @root and handle all locking needed -+ * while switching current namespace. -+ * -+ * Returns: next namespace or NULL if at last namespace under @root -+ * NOTE: will not unlock root->lock -+ */ -+static struct aa_namespace *__next_namespace(struct aa_namespace *root, -+ struct aa_namespace *ns) -+{ -+ struct aa_namespace *parent; -+ -+ /* is next namespace a child */ -+ if (!list_empty(&ns->sub_ns)) { -+ struct aa_namespace *next; -+ next = list_first_entry(&ns->sub_ns, typeof(*ns), base.list); -+ read_lock(&next->lock); -+ return next; -+ } -+ -+ /* check if the next ns is a sibling, parent, gp, .. */ -+ parent = ns->parent; -+ while (parent) { -+ read_unlock(&ns->lock); -+ list_for_each_entry_continue(ns, &parent->sub_ns, base.list) { -+ read_lock(&ns->lock); -+ return ns; -+ } -+ if (parent == root) -+ return NULL; -+ ns = parent; -+ parent = parent->parent; -+ } -+ -+ return NULL; -+} -+ -+/** -+ * __first_profile - find the first profile in a namespace -+ * @root: namespace that is root of profiles being displayed (NOT NULL) -+ * @ns: namespace to start in (NOT NULL) -+ * -+ * Returns: unrefcounted profile or NULL if no profile -+ */ -+static struct aa_profile *__first_profile(struct aa_namespace *root, -+ struct aa_namespace *ns) -+{ -+ for ( ; ns; ns = __next_namespace(root, ns)) { -+ if (!list_empty(&ns->base.profiles)) -+ return list_first_entry(&ns->base.profiles, -+ struct aa_profile, base.list); -+ } -+ return NULL; -+} -+ -+/** -+ * __next_profile - step to the next profile in a profile tree -+ * @profile: current profile in tree (NOT NULL) -+ * -+ * Perform a depth first taversal on the profile tree in a namespace -+ * -+ * Returns: next profile or NULL if done -+ * Requires: profile->ns.lock to be held -+ */ -+static struct aa_profile *__next_profile(struct aa_profile *p) -+{ -+ struct aa_profile *parent; -+ struct aa_namespace *ns = p->ns; -+ -+ /* is next profile a child */ -+ if (!list_empty(&p->base.profiles)) -+ return list_first_entry(&p->base.profiles, typeof(*p), -+ base.list); -+ -+ /* is next profile a sibling, parent sibling, gp, subling, .. */ -+ parent = p->parent; -+ while (parent) { -+ list_for_each_entry_continue(p, &parent->base.profiles, -+ base.list) -+ return p; -+ p = parent; -+ parent = parent->parent; -+ } -+ -+ /* is next another profile in the namespace */ -+ list_for_each_entry_continue(p, &ns->base.profiles, base.list) -+ return p; -+ -+ return NULL; -+} -+ -+/** -+ * next_profile - step to the next profile in where ever it may be -+ * @root: root namespace (NOT NULL) -+ * @profile: current profile (NOT NULL) -+ * -+ * Returns: next profile or NULL if there isn't one -+ */ -+static struct aa_profile *next_profile(struct aa_namespace *root, -+ struct aa_profile *profile) -+{ -+ struct aa_profile *next = __next_profile(profile); -+ if (next) -+ return next; -+ -+ /* finished all profiles in namespace move to next namespace */ -+ return __first_profile(root, __next_namespace(root, profile->ns)); -+} -+ -+/** -+ * p_start - start a depth first traversal of profile tree -+ * @f: seq_file to fill -+ * @pos: current position -+ * -+ * Returns: first profile under current namespace or NULL if none found -+ * -+ * acquires first ns->lock -+ */ -+static void *p_start(struct seq_file *f, loff_t *pos) -+ __acquires(root->lock) -+{ -+ struct aa_profile *profile = NULL; -+ struct aa_namespace *root = aa_current_profile()->ns; -+ loff_t l = *pos; -+ f->private = aa_get_namespace(root); -+ -+ -+ /* find the first profile */ -+ read_lock(&root->lock); -+ profile = __first_profile(root, root); -+ -+ /* skip to position */ -+ for (; profile && l > 0; l--) -+ profile = next_profile(root, profile); -+ -+ return profile; -+} -+ -+/** -+ * p_next - read the next profile entry -+ * @f: seq_file to fill -+ * @p: profile previously returned -+ * @pos: current position -+ * -+ * Returns: next profile after @p or NULL if none -+ * -+ * may acquire/release locks in namespace tree as necessary -+ */ -+static void *p_next(struct seq_file *f, void *p, loff_t *pos) -+{ -+ struct aa_profile *profile = p; -+ struct aa_namespace *root = f->private; -+ (*pos)++; -+ -+ return next_profile(root, profile); -+} -+ -+/** -+ * p_stop - stop depth first traversal -+ * @f: seq_file we are filling -+ * @p: the last profile writen -+ * -+ * Release all locking done by p_start/p_next on namespace tree -+ */ -+static void p_stop(struct seq_file *f, void *p) -+ __releases(root->lock) -+{ -+ struct aa_profile *profile = p; -+ struct aa_namespace *root = f->private, *ns; -+ -+ if (profile) { -+ for (ns = profile->ns; ns && ns != root; ns = ns->parent) -+ read_unlock(&ns->lock); -+ } -+ read_unlock(&root->lock); -+ aa_put_namespace(root); -+} -+ -+/** -+ * seq_show_profile - show a profile entry -+ * @f: seq_file to file -+ * @p: current position (profile) (NOT NULL) -+ * -+ * Returns: error on failure -+ */ -+static int seq_show_profile(struct seq_file *f, void *p) -+{ -+ struct aa_profile *profile = (struct aa_profile *)p; -+ struct aa_namespace *root = f->private; -+ -+ if (profile->ns != root) -+ seq_printf(f, ":%s://", aa_ns_name(root, profile->ns)); -+ seq_printf(f, "%s (%s)\n", profile->base.hname, -+ COMPLAIN_MODE(profile) ? "complain" : "enforce"); -+ -+ return 0; -+} -+ -+static const struct seq_operations aa_fs_profiles_op = { -+ .start = p_start, -+ .next = p_next, -+ .stop = p_stop, -+ .show = seq_show_profile, -+}; -+ -+static int profiles_open(struct inode *inode, struct file *file) -+{ -+ return seq_open(file, &aa_fs_profiles_op); -+} -+ -+static int profiles_release(struct inode *inode, struct file *file) -+{ -+ return seq_release(inode, file); -+} -+ -+const struct file_operations aa_fs_profiles_fops = { -+ .open = profiles_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = profiles_release, -+}; -diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c -index 69ddb47..867995c 100644 ---- a/security/apparmor/apparmorfs.c -+++ b/security/apparmor/apparmorfs.c -@@ -187,7 +187,11 @@ void __init aa_destroy_aafs(void) - aafs_remove(".remove"); - aafs_remove(".replace"); - aafs_remove(".load"); -- -+#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24 -+ aafs_remove("profiles"); -+ aafs_remove("matching"); -+ aafs_remove("features"); -+#endif - securityfs_remove(aa_fs_dentry); - aa_fs_dentry = NULL; - } -@@ -218,7 +222,17 @@ static int __init aa_create_aafs(void) - aa_fs_dentry = NULL; - goto error; - } -- -+#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24 -+ error = aafs_create("matching", 0444, &aa_fs_matching_fops); -+ if (error) -+ goto error; -+ error = aafs_create("features", 0444, &aa_fs_features_fops); -+ if (error) -+ goto error; -+#endif -+ error = aafs_create("profiles", 0440, &aa_fs_profiles_fops); -+ if (error) -+ goto error; - error = aafs_create(".load", 0640, &aa_fs_profile_load); - if (error) - goto error; -diff --git a/security/apparmor/include/apparmorfs.h b/security/apparmor/include/apparmorfs.h -index cb1e93a..14f955c 100644 ---- a/security/apparmor/include/apparmorfs.h -+++ b/security/apparmor/include/apparmorfs.h -@@ -17,4 +17,10 @@ - - extern void __init aa_destroy_aafs(void); - -+#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24 -+extern const struct file_operations aa_fs_matching_fops; -+extern const struct file_operations aa_fs_features_fops; -+extern const struct file_operations aa_fs_profiles_fops; -+#endif -+ - #endif /* __AA_APPARMORFS_H */ --- -1.7.9.5 - diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch deleted file mode 100644 index 7dd55781fda..00000000000 --- a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch +++ /dev/null @@ -1,69 +0,0 @@ -From e5d90918aa31f948ecec2f3c088567dbab30c90b Mon Sep 17 00:00:00 2001 -From: John Johansen -Date: Wed, 10 Aug 2011 22:02:41 -0700 -Subject: [PATCH 3/3] AppArmor: Allow dfa backward compatibility with broken - userspace - -The apparmor_parser when compiling policy could generate invalid dfas -that did not have sufficient padding to avoid invalid references, when -used by the kernel. The kernels check to verify the next/check table -size was broken meaning invalid dfas were being created by userspace -and not caught. - -To remain compatible with old tools that are not fixed, pad the loaded -dfas next/check table. The dfa's themselves are valid except for the -high padding for potentially invalid transitions (high bounds error), -which have a maximimum is 256 entries. So just allocate an extra null filled -256 entries for the next/check tables. This will guarentee all bounds -are good and invalid transitions go to the null (0) state. - -Signed-off-by: John Johansen ---- - security/apparmor/match.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/security/apparmor/match.c b/security/apparmor/match.c -index 94de6b4..081491e 100644 ---- a/security/apparmor/match.c -+++ b/security/apparmor/match.c -@@ -57,8 +57,17 @@ static struct table_header *unpack_table(char *blob, size_t bsize) - if (bsize < tsize) - goto out; - -+ /* Pad table allocation for next/check by 256 entries to remain -+ * backwards compatible with old (buggy) tools and remain safe without -+ * run time checks -+ */ -+ if (th.td_id == YYTD_ID_NXT || th.td_id == YYTD_ID_CHK) -+ tsize += 256 * th.td_flags; -+ - table = kvmalloc(tsize); - if (table) { -+ /* ensure the pad is clear, else there will be errors */ -+ memset(table, 0, tsize); - *table = th; - if (th.td_flags == YYTD_DATA8) - UNPACK_ARRAY(table->td_data, blob, th.td_lolen, -@@ -134,11 +143,19 @@ static int verify_dfa(struct aa_dfa *dfa, int flags) - goto out; - - if (flags & DFA_FLAG_VERIFY_STATES) { -+ int warning = 0; - for (i = 0; i < state_count; i++) { - if (DEFAULT_TABLE(dfa)[i] >= state_count) - goto out; - /* TODO: do check that DEF state recursion terminates */ - if (BASE_TABLE(dfa)[i] + 255 >= trans_count) { -+ if (warning) -+ continue; -+ printk(KERN_WARNING "AppArmor DFA next/check " -+ "upper bounds error fixed, upgrade " -+ "user space tools \n"); -+ warning = 1; -+ } else if (BASE_TABLE(dfa)[i] >= trans_count) { - printk(KERN_ERR "AppArmor DFA next/check upper " - "bounds error\n"); - goto out; --- -1.7.9.5 - diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch deleted file mode 100644 index 88a50ca780a..00000000000 --- a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch +++ /dev/null @@ -1,264 +0,0 @@ -From 8de755e4dfdbc40bfcaca848ae6b5aeaf0ede0e8 Mon Sep 17 00:00:00 2001 -From: John Johansen -Date: Thu, 22 Jul 2010 02:32:02 -0700 -Subject: [PATCH 1/3] UBUNTU: SAUCE: AppArmor: Add profile introspection file - to interface - -Add the dynamic profiles file to the interace, to allow load policy -introspection. - -Signed-off-by: John Johansen -Acked-by: Kees Cook -Signed-off-by: Tim Gardner ---- - security/apparmor/apparmorfs.c | 227 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 227 insertions(+) - -diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c -index 16c15ec..89bdc62 100644 ---- a/security/apparmor/apparmorfs.c -+++ b/security/apparmor/apparmorfs.c -@@ -182,6 +182,232 @@ const struct file_operations aa_fs_seq_file_ops = { - .release = single_release, - }; - -+/** -+ * __next_namespace - find the next namespace to list -+ * @root: root namespace to stop search at (NOT NULL) -+ * @ns: current ns position (NOT NULL) -+ * -+ * Find the next namespace from @ns under @root and handle all locking needed -+ * while switching current namespace. -+ * -+ * Returns: next namespace or NULL if at last namespace under @root -+ * NOTE: will not unlock root->lock -+ */ -+static struct aa_namespace *__next_namespace(struct aa_namespace *root, -+ struct aa_namespace *ns) -+{ -+ struct aa_namespace *parent; -+ -+ /* is next namespace a child */ -+ if (!list_empty(&ns->sub_ns)) { -+ struct aa_namespace *next; -+ next = list_first_entry(&ns->sub_ns, typeof(*ns), base.list); -+ read_lock(&next->lock); -+ return next; -+ } -+ -+ /* check if the next ns is a sibling, parent, gp, .. */ -+ parent = ns->parent; -+ while (parent) { -+ read_unlock(&ns->lock); -+ list_for_each_entry_continue(ns, &parent->sub_ns, base.list) { -+ read_lock(&ns->lock); -+ return ns; -+ } -+ if (parent == root) -+ return NULL; -+ ns = parent; -+ parent = parent->parent; -+ } -+ -+ return NULL; -+} -+ -+/** -+ * __first_profile - find the first profile in a namespace -+ * @root: namespace that is root of profiles being displayed (NOT NULL) -+ * @ns: namespace to start in (NOT NULL) -+ * -+ * Returns: unrefcounted profile or NULL if no profile -+ */ -+static struct aa_profile *__first_profile(struct aa_namespace *root, -+ struct aa_namespace *ns) -+{ -+ for ( ; ns; ns = __next_namespace(root, ns)) { -+ if (!list_empty(&ns->base.profiles)) -+ return list_first_entry(&ns->base.profiles, -+ struct aa_profile, base.list); -+ } -+ return NULL; -+} -+ -+/** -+ * __next_profile - step to the next profile in a profile tree -+ * @profile: current profile in tree (NOT NULL) -+ * -+ * Perform a depth first taversal on the profile tree in a namespace -+ * -+ * Returns: next profile or NULL if done -+ * Requires: profile->ns.lock to be held -+ */ -+static struct aa_profile *__next_profile(struct aa_profile *p) -+{ -+ struct aa_profile *parent; -+ struct aa_namespace *ns = p->ns; -+ -+ /* is next profile a child */ -+ if (!list_empty(&p->base.profiles)) -+ return list_first_entry(&p->base.profiles, typeof(*p), -+ base.list); -+ -+ /* is next profile a sibling, parent sibling, gp, subling, .. */ -+ parent = p->parent; -+ while (parent) { -+ list_for_each_entry_continue(p, &parent->base.profiles, -+ base.list) -+ return p; -+ p = parent; -+ parent = parent->parent; -+ } -+ -+ /* is next another profile in the namespace */ -+ list_for_each_entry_continue(p, &ns->base.profiles, base.list) -+ return p; -+ -+ return NULL; -+} -+ -+/** -+ * next_profile - step to the next profile in where ever it may be -+ * @root: root namespace (NOT NULL) -+ * @profile: current profile (NOT NULL) -+ * -+ * Returns: next profile or NULL if there isn't one -+ */ -+static struct aa_profile *next_profile(struct aa_namespace *root, -+ struct aa_profile *profile) -+{ -+ struct aa_profile *next = __next_profile(profile); -+ if (next) -+ return next; -+ -+ /* finished all profiles in namespace move to next namespace */ -+ return __first_profile(root, __next_namespace(root, profile->ns)); -+} -+ -+/** -+ * p_start - start a depth first traversal of profile tree -+ * @f: seq_file to fill -+ * @pos: current position -+ * -+ * Returns: first profile under current namespace or NULL if none found -+ * -+ * acquires first ns->lock -+ */ -+static void *p_start(struct seq_file *f, loff_t *pos) -+ __acquires(root->lock) -+{ -+ struct aa_profile *profile = NULL; -+ struct aa_namespace *root = aa_current_profile()->ns; -+ loff_t l = *pos; -+ f->private = aa_get_namespace(root); -+ -+ -+ /* find the first profile */ -+ read_lock(&root->lock); -+ profile = __first_profile(root, root); -+ -+ /* skip to position */ -+ for (; profile && l > 0; l--) -+ profile = next_profile(root, profile); -+ -+ return profile; -+} -+ -+/** -+ * p_next - read the next profile entry -+ * @f: seq_file to fill -+ * @p: profile previously returned -+ * @pos: current position -+ * -+ * Returns: next profile after @p or NULL if none -+ * -+ * may acquire/release locks in namespace tree as necessary -+ */ -+static void *p_next(struct seq_file *f, void *p, loff_t *pos) -+{ -+ struct aa_profile *profile = p; -+ struct aa_namespace *root = f->private; -+ (*pos)++; -+ -+ return next_profile(root, profile); -+} -+ -+/** -+ * p_stop - stop depth first traversal -+ * @f: seq_file we are filling -+ * @p: the last profile writen -+ * -+ * Release all locking done by p_start/p_next on namespace tree -+ */ -+static void p_stop(struct seq_file *f, void *p) -+ __releases(root->lock) -+{ -+ struct aa_profile *profile = p; -+ struct aa_namespace *root = f->private, *ns; -+ -+ if (profile) { -+ for (ns = profile->ns; ns && ns != root; ns = ns->parent) -+ read_unlock(&ns->lock); -+ } -+ read_unlock(&root->lock); -+ aa_put_namespace(root); -+} -+ -+/** -+ * seq_show_profile - show a profile entry -+ * @f: seq_file to file -+ * @p: current position (profile) (NOT NULL) -+ * -+ * Returns: error on failure -+ */ -+static int seq_show_profile(struct seq_file *f, void *p) -+{ -+ struct aa_profile *profile = (struct aa_profile *)p; -+ struct aa_namespace *root = f->private; -+ -+ if (profile->ns != root) -+ seq_printf(f, ":%s://", aa_ns_name(root, profile->ns)); -+ seq_printf(f, "%s (%s)\n", profile->base.hname, -+ COMPLAIN_MODE(profile) ? "complain" : "enforce"); -+ -+ return 0; -+} -+ -+static const struct seq_operations aa_fs_profiles_op = { -+ .start = p_start, -+ .next = p_next, -+ .stop = p_stop, -+ .show = seq_show_profile, -+}; -+ -+static int profiles_open(struct inode *inode, struct file *file) -+{ -+ return seq_open(file, &aa_fs_profiles_op); -+} -+ -+static int profiles_release(struct inode *inode, struct file *file) -+{ -+ return seq_release(inode, file); -+} -+ -+const struct file_operations aa_fs_profiles_fops = { -+ .open = profiles_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = profiles_release, -+}; -+ - /** Base file system setup **/ - - static struct aa_fs_entry aa_fs_entry_file[] = { -@@ -210,6 +436,7 @@ static struct aa_fs_entry aa_fs_entry_apparmor[] = { - AA_FS_FILE_FOPS(".load", 0640, &aa_fs_profile_load), - AA_FS_FILE_FOPS(".replace", 0640, &aa_fs_profile_replace), - AA_FS_FILE_FOPS(".remove", 0640, &aa_fs_profile_remove), -+ AA_FS_FILE_FOPS("profiles", 0640, &aa_fs_profiles_fops), - AA_FS_DIR("features", aa_fs_entry_features), - { } - }; --- -1.7.9.5 - diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch deleted file mode 100644 index 01316b9db78..00000000000 --- a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch +++ /dev/null @@ -1,603 +0,0 @@ -From 423e2cb454d75d6185eecd0c1b5cf6ccc2d8482d Mon Sep 17 00:00:00 2001 -From: John Johansen -Date: Mon, 4 Oct 2010 15:03:36 -0700 -Subject: [PATCH 2/3] UBUNTU: SAUCE: AppArmor: basic networking rules - -Base support for network mediation. - -Signed-off-by: John Johansen ---- - security/apparmor/.gitignore | 2 +- - security/apparmor/Makefile | 42 +++++++++- - security/apparmor/apparmorfs.c | 1 + - security/apparmor/include/audit.h | 4 + - security/apparmor/include/net.h | 44 ++++++++++ - security/apparmor/include/policy.h | 3 + - security/apparmor/lsm.c | 112 +++++++++++++++++++++++++ - security/apparmor/net.c | 162 ++++++++++++++++++++++++++++++++++++ - security/apparmor/policy.c | 1 + - security/apparmor/policy_unpack.c | 46 ++++++++++ - 10 files changed, 414 insertions(+), 3 deletions(-) - create mode 100644 security/apparmor/include/net.h - create mode 100644 security/apparmor/net.c - -diff --git a/security/apparmor/.gitignore b/security/apparmor/.gitignore -index 4d995ae..d5b291e 100644 ---- a/security/apparmor/.gitignore -+++ b/security/apparmor/.gitignore -@@ -1,6 +1,6 @@ - # - # Generated include files - # --af_names.h -+net_names.h - capability_names.h - rlim_names.h -diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile -index 806bd19..19daa85 100644 ---- a/security/apparmor/Makefile -+++ b/security/apparmor/Makefile -@@ -4,9 +4,9 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o - - apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \ - path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \ -- resource.o sid.o file.o -+ resource.o sid.o file.o net.o - --clean-files := capability_names.h rlim_names.h -+clean-files := capability_names.h rlim_names.h net_names.h - - - # Build a lower case string table of capability names -@@ -20,6 +20,38 @@ cmd_make-caps = echo "static const char *const capability_names[] = {" > $@ ;\ - -e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/[\2] = "\L\1",/p';\ - echo "};" >> $@ - -+# Build a lower case string table of address family names -+# Transform lines from -+# define AF_LOCAL 1 /* POSIX name for AF_UNIX */ -+# #define AF_INET 2 /* Internet IP Protocol */ -+# to -+# [1] = "local", -+# [2] = "inet", -+# -+# and build the securityfs entries for the mapping. -+# Transforms lines from -+# #define AF_INET 2 /* Internet IP Protocol */ -+# to -+# #define AA_FS_AF_MASK "local inet" -+quiet_cmd_make-af = GEN $@ -+cmd_make-af = echo "static const char *address_family_names[] = {" > $@ ;\ -+ sed $< >>$@ -r -n -e "/AF_MAX/d" -e "/AF_LOCAL/d" -e \ -+ 's/^\#define[ \t]+AF_([A-Z0-9_]+)[ \t]+([0-9]+)(.*)/[\2] = "\L\1",/p';\ -+ echo "};" >> $@ ;\ -+ echo -n '\#define AA_FS_AF_MASK "' >> $@ ;\ -+ sed -r -n 's/^\#define[ \t]+AF_([A-Z0-9_]+)[ \t]+([0-9]+)(.*)/\L\1/p'\ -+ $< | tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@ -+ -+# Build a lower case string table of sock type names -+# Transform lines from -+# SOCK_STREAM = 1, -+# to -+# [1] = "stream", -+quiet_cmd_make-sock = GEN $@ -+cmd_make-sock = echo "static const char *sock_type_names[] = {" >> $@ ;\ -+ sed $^ >>$@ -r -n \ -+ -e 's/^\tSOCK_([A-Z0-9_]+)[\t]+=[ \t]+([0-9]+)(.*)/[\2] = "\L\1",/p';\ -+ echo "};" >> $@ - - # Build a lower case string table of rlimit names. - # Transforms lines from -@@ -56,6 +88,7 @@ cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \ - tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@ - - $(obj)/capability.o : $(obj)/capability_names.h -+$(obj)/net.o : $(obj)/net_names.h - $(obj)/resource.o : $(obj)/rlim_names.h - $(obj)/capability_names.h : $(srctree)/include/linux/capability.h \ - $(src)/Makefile -@@ -63,3 +96,8 @@ $(obj)/capability_names.h : $(srctree)/include/linux/capability.h \ - $(obj)/rlim_names.h : $(srctree)/include/asm-generic/resource.h \ - $(src)/Makefile - $(call cmd,make-rlim) -+$(obj)/net_names.h : $(srctree)/include/linux/socket.h \ -+ $(srctree)/include/linux/net.h \ -+ $(src)/Makefile -+ $(call cmd,make-af) -+ $(call cmd,make-sock) -diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c -index 89bdc62..c66315d 100644 ---- a/security/apparmor/apparmorfs.c -+++ b/security/apparmor/apparmorfs.c -@@ -427,6 +427,7 @@ static struct aa_fs_entry aa_fs_entry_domain[] = { - static struct aa_fs_entry aa_fs_entry_features[] = { - AA_FS_DIR("domain", aa_fs_entry_domain), - AA_FS_DIR("file", aa_fs_entry_file), -+ AA_FS_DIR("network", aa_fs_entry_network), - AA_FS_FILE_U64("capability", VFS_CAP_FLAGS_MASK), - AA_FS_DIR("rlimit", aa_fs_entry_rlimit), - { } -diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h -index 3868b1e..c1ff09c 100644 ---- a/security/apparmor/include/audit.h -+++ b/security/apparmor/include/audit.h -@@ -126,6 +126,10 @@ struct apparmor_audit_data { - u32 denied; - uid_t ouid; - } fs; -+ struct { -+ int type, protocol; -+ struct sock *sk; -+ } net; - }; - }; - -diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h -new file mode 100644 -index 0000000..cb8a121 ---- /dev/null -+++ b/security/apparmor/include/net.h -@@ -0,0 +1,44 @@ -+/* -+ * AppArmor security module -+ * -+ * This file contains AppArmor network mediation definitions. -+ * -+ * Copyright (C) 1998-2008 Novell/SUSE -+ * Copyright 2009-2012 Canonical Ltd. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation, version 2 of the -+ * License. -+ */ -+ -+#ifndef __AA_NET_H -+#define __AA_NET_H -+ -+#include -+ -+#include "apparmorfs.h" -+ -+/* struct aa_net - network confinement data -+ * @allowed: basic network families permissions -+ * @audit_network: which network permissions to force audit -+ * @quiet_network: which network permissions to quiet rejects -+ */ -+struct aa_net { -+ u16 allow[AF_MAX]; -+ u16 audit[AF_MAX]; -+ u16 quiet[AF_MAX]; -+}; -+ -+extern struct aa_fs_entry aa_fs_entry_network[]; -+ -+extern int aa_net_perm(int op, struct aa_profile *profile, u16 family, -+ int type, int protocol, struct sock *sk); -+extern int aa_revalidate_sk(int op, struct sock *sk); -+ -+static inline void aa_free_net_rules(struct aa_net *new) -+{ -+ /* NOP */ -+} -+ -+#endif /* __AA_NET_H */ -diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h -index bda4569..eb13a73 100644 ---- a/security/apparmor/include/policy.h -+++ b/security/apparmor/include/policy.h -@@ -27,6 +27,7 @@ - #include "capability.h" - #include "domain.h" - #include "file.h" -+#include "net.h" - #include "resource.h" - - extern const char *const profile_mode_names[]; -@@ -157,6 +158,7 @@ struct aa_policydb { - * @policy: general match rules governing policy - * @file: The set of rules governing basic file access and domain transitions - * @caps: capabilities for the profile -+ * @net: network controls for the profile - * @rlimits: rlimits for the profile - * - * The AppArmor profile contains the basic confinement data. Each profile -@@ -194,6 +196,7 @@ struct aa_profile { - struct aa_policydb policy; - struct aa_file_rules file; - struct aa_caps caps; -+ struct aa_net net; - struct aa_rlimit rlimits; - }; - -diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c -index ad05d39..3cde194 100644 ---- a/security/apparmor/lsm.c -+++ b/security/apparmor/lsm.c -@@ -32,6 +32,7 @@ - #include "include/context.h" - #include "include/file.h" - #include "include/ipc.h" -+#include "include/net.h" - #include "include/path.h" - #include "include/policy.h" - #include "include/procattr.h" -@@ -622,6 +623,104 @@ static int apparmor_task_setrlimit(struct task_struct *task, - return error; - } - -+static int apparmor_socket_create(int family, int type, int protocol, int kern) -+{ -+ struct aa_profile *profile; -+ int error = 0; -+ -+ if (kern) -+ return 0; -+ -+ profile = __aa_current_profile(); -+ if (!unconfined(profile)) -+ error = aa_net_perm(OP_CREATE, profile, family, type, protocol, -+ NULL); -+ return error; -+} -+ -+static int apparmor_socket_bind(struct socket *sock, -+ struct sockaddr *address, int addrlen) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_BIND, sk); -+} -+ -+static int apparmor_socket_connect(struct socket *sock, -+ struct sockaddr *address, int addrlen) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_CONNECT, sk); -+} -+ -+static int apparmor_socket_listen(struct socket *sock, int backlog) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_LISTEN, sk); -+} -+ -+static int apparmor_socket_accept(struct socket *sock, struct socket *newsock) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_ACCEPT, sk); -+} -+ -+static int apparmor_socket_sendmsg(struct socket *sock, -+ struct msghdr *msg, int size) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_SENDMSG, sk); -+} -+ -+static int apparmor_socket_recvmsg(struct socket *sock, -+ struct msghdr *msg, int size, int flags) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_RECVMSG, sk); -+} -+ -+static int apparmor_socket_getsockname(struct socket *sock) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_GETSOCKNAME, sk); -+} -+ -+static int apparmor_socket_getpeername(struct socket *sock) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_GETPEERNAME, sk); -+} -+ -+static int apparmor_socket_getsockopt(struct socket *sock, int level, -+ int optname) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_GETSOCKOPT, sk); -+} -+ -+static int apparmor_socket_setsockopt(struct socket *sock, int level, -+ int optname) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_SETSOCKOPT, sk); -+} -+ -+static int apparmor_socket_shutdown(struct socket *sock, int how) -+{ -+ struct sock *sk = sock->sk; -+ -+ return aa_revalidate_sk(OP_SOCK_SHUTDOWN, sk); -+} -+ - static struct security_operations apparmor_ops = { - .name = "apparmor", - -@@ -653,6 +752,19 @@ static struct security_operations apparmor_ops = { - .getprocattr = apparmor_getprocattr, - .setprocattr = apparmor_setprocattr, - -+ .socket_create = apparmor_socket_create, -+ .socket_bind = apparmor_socket_bind, -+ .socket_connect = apparmor_socket_connect, -+ .socket_listen = apparmor_socket_listen, -+ .socket_accept = apparmor_socket_accept, -+ .socket_sendmsg = apparmor_socket_sendmsg, -+ .socket_recvmsg = apparmor_socket_recvmsg, -+ .socket_getsockname = apparmor_socket_getsockname, -+ .socket_getpeername = apparmor_socket_getpeername, -+ .socket_getsockopt = apparmor_socket_getsockopt, -+ .socket_setsockopt = apparmor_socket_setsockopt, -+ .socket_shutdown = apparmor_socket_shutdown, -+ - .cred_alloc_blank = apparmor_cred_alloc_blank, - .cred_free = apparmor_cred_free, - .cred_prepare = apparmor_cred_prepare, -diff --git a/security/apparmor/net.c b/security/apparmor/net.c -new file mode 100644 -index 0000000..084232b ---- /dev/null -+++ b/security/apparmor/net.c -@@ -0,0 +1,162 @@ -+/* -+ * AppArmor security module -+ * -+ * This file contains AppArmor network mediation -+ * -+ * Copyright (C) 1998-2008 Novell/SUSE -+ * Copyright 2009-2012 Canonical Ltd. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation, version 2 of the -+ * License. -+ */ -+ -+#include "include/apparmor.h" -+#include "include/audit.h" -+#include "include/context.h" -+#include "include/net.h" -+#include "include/policy.h" -+ -+#include "net_names.h" -+ -+struct aa_fs_entry aa_fs_entry_network[] = { -+ AA_FS_FILE_STRING("af_mask", AA_FS_AF_MASK), -+ { } -+}; -+ -+/* audit callback for net specific fields */ -+static void audit_cb(struct audit_buffer *ab, void *va) -+{ -+ struct common_audit_data *sa = va; -+ -+ audit_log_format(ab, " family="); -+ if (address_family_names[sa->u.net->family]) { -+ audit_log_string(ab, address_family_names[sa->u.net->family]); -+ } else { -+ audit_log_format(ab, "\"unknown(%d)\"", sa->u.net->family); -+ } -+ audit_log_format(ab, " sock_type="); -+ if (sock_type_names[sa->aad->net.type]) { -+ audit_log_string(ab, sock_type_names[sa->aad->net.type]); -+ } else { -+ audit_log_format(ab, "\"unknown(%d)\"", sa->aad->net.type); -+ } -+ audit_log_format(ab, " protocol=%d", sa->aad->net.protocol); -+} -+ -+/** -+ * audit_net - audit network access -+ * @profile: profile being enforced (NOT NULL) -+ * @op: operation being checked -+ * @family: network family -+ * @type: network type -+ * @protocol: network protocol -+ * @sk: socket auditing is being applied to -+ * @error: error code for failure else 0 -+ * -+ * Returns: %0 or sa->error else other errorcode on failure -+ */ -+static int audit_net(struct aa_profile *profile, int op, u16 family, int type, -+ int protocol, struct sock *sk, int error) -+{ -+ int audit_type = AUDIT_APPARMOR_AUTO; -+ struct common_audit_data sa; -+ struct apparmor_audit_data aad = { }; -+ struct lsm_network_audit net = { }; -+ if (sk) { -+ COMMON_AUDIT_DATA_INIT(&sa, NET); -+ } else { -+ COMMON_AUDIT_DATA_INIT(&sa, NONE); -+ } -+ /* todo fill in socket addr info */ -+ sa.aad = &aad; -+ sa.u.net = &net; -+ sa.aad->op = op, -+ sa.u.net->family = family; -+ sa.u.net->sk = sk; -+ sa.aad->net.type = type; -+ sa.aad->net.protocol = protocol; -+ sa.aad->error = error; -+ -+ if (likely(!sa.aad->error)) { -+ u16 audit_mask = profile->net.audit[sa.u.net->family]; -+ if (likely((AUDIT_MODE(profile) != AUDIT_ALL) && -+ !(1 << sa.aad->net.type & audit_mask))) -+ return 0; -+ audit_type = AUDIT_APPARMOR_AUDIT; -+ } else { -+ u16 quiet_mask = profile->net.quiet[sa.u.net->family]; -+ u16 kill_mask = 0; -+ u16 denied = (1 << sa.aad->net.type) & ~quiet_mask; -+ -+ if (denied & kill_mask) -+ audit_type = AUDIT_APPARMOR_KILL; -+ -+ if ((denied & quiet_mask) && -+ AUDIT_MODE(profile) != AUDIT_NOQUIET && -+ AUDIT_MODE(profile) != AUDIT_ALL) -+ return COMPLAIN_MODE(profile) ? 0 : sa.aad->error; -+ } -+ -+ return aa_audit(audit_type, profile, GFP_KERNEL, &sa, audit_cb); -+} -+ -+/** -+ * aa_net_perm - very course network access check -+ * @op: operation being checked -+ * @profile: profile being enforced (NOT NULL) -+ * @family: network family -+ * @type: network type -+ * @protocol: network protocol -+ * -+ * Returns: %0 else error if permission denied -+ */ -+int aa_net_perm(int op, struct aa_profile *profile, u16 family, int type, -+ int protocol, struct sock *sk) -+{ -+ u16 family_mask; -+ int error; -+ -+ if ((family < 0) || (family >= AF_MAX)) -+ return -EINVAL; -+ -+ if ((type < 0) || (type >= SOCK_MAX)) -+ return -EINVAL; -+ -+ /* unix domain and netlink sockets are handled by ipc */ -+ if (family == AF_UNIX || family == AF_NETLINK) -+ return 0; -+ -+ family_mask = profile->net.allow[family]; -+ -+ error = (family_mask & (1 << type)) ? 0 : -EACCES; -+ -+ return audit_net(profile, op, family, type, protocol, sk, error); -+} -+ -+/** -+ * aa_revalidate_sk - Revalidate access to a sock -+ * @op: operation being checked -+ * @sk: sock being revalidated (NOT NULL) -+ * -+ * Returns: %0 else error if permission denied -+ */ -+int aa_revalidate_sk(int op, struct sock *sk) -+{ -+ struct aa_profile *profile; -+ int error = 0; -+ -+ /* aa_revalidate_sk should not be called from interrupt context -+ * don't mediate these calls as they are not task related -+ */ -+ if (in_interrupt()) -+ return 0; -+ -+ profile = __aa_current_profile(); -+ if (!unconfined(profile)) -+ error = aa_net_perm(op, profile, sk->sk_family, sk->sk_type, -+ sk->sk_protocol, sk); -+ -+ return error; -+} -diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c -index f1f7506..b8100a7 100644 ---- a/security/apparmor/policy.c -+++ b/security/apparmor/policy.c -@@ -745,6 +745,7 @@ static void free_profile(struct aa_profile *profile) - - aa_free_file_rules(&profile->file); - aa_free_cap_rules(&profile->caps); -+ aa_free_net_rules(&profile->net); - aa_free_rlimit_rules(&profile->rlimits); - - aa_free_sid(profile->sid); -diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c -index deab7c7..8f8e9c1 100644 ---- a/security/apparmor/policy_unpack.c -+++ b/security/apparmor/policy_unpack.c -@@ -193,6 +193,19 @@ fail: - return 0; - } - -+static bool unpack_u16(struct aa_ext *e, u16 *data, const char *name) -+{ -+ if (unpack_nameX(e, AA_U16, name)) { -+ if (!inbounds(e, sizeof(u16))) -+ return 0; -+ if (data) -+ *data = le16_to_cpu(get_unaligned((u16 *) e->pos)); -+ e->pos += sizeof(u16); -+ return 1; -+ } -+ return 0; -+} -+ - static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name) - { - if (unpack_nameX(e, AA_U32, name)) { -@@ -471,6 +484,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e) - { - struct aa_profile *profile = NULL; - const char *name = NULL; -+ size_t size = 0; - int i, error = -EPROTO; - kernel_cap_t tmpcap; - u32 tmp; -@@ -564,6 +578,38 @@ static struct aa_profile *unpack_profile(struct aa_ext *e) - if (!unpack_rlimits(e, profile)) - goto fail; - -+ size = unpack_array(e, "net_allowed_af"); -+ if (size) { -+ -+ for (i = 0; i < size; i++) { -+ /* discard extraneous rules that this kernel will -+ * never request -+ */ -+ if (i >= AF_MAX) { -+ u16 tmp; -+ if (!unpack_u16(e, &tmp, NULL) || -+ !unpack_u16(e, &tmp, NULL) || -+ !unpack_u16(e, &tmp, NULL)) -+ goto fail; -+ continue; -+ } -+ if (!unpack_u16(e, &profile->net.allow[i], NULL)) -+ goto fail; -+ if (!unpack_u16(e, &profile->net.audit[i], NULL)) -+ goto fail; -+ if (!unpack_u16(e, &profile->net.quiet[i], NULL)) -+ goto fail; -+ } -+ if (!unpack_nameX(e, AA_ARRAYEND, NULL)) -+ goto fail; -+ } -+ /* -+ * allow unix domain and netlink sockets they are handled -+ * by IPC -+ */ -+ profile->net.allow[AF_UNIX] = 0xffff; -+ profile->net.allow[AF_NETLINK] = 0xffff; -+ - if (unpack_nameX(e, AA_STRUCT, "policydb")) { - /* generic policy dfa - optional and may be NULL */ - profile->policy.dfa = unpack_dfa(e); --- -1.7.9.5 - diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch deleted file mode 100644 index 48b34343e0b..00000000000 --- a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch +++ /dev/null @@ -1,957 +0,0 @@ -From a94d5e11c0484af59e5feebf144cc48c186892ad Mon Sep 17 00:00:00 2001 -From: John Johansen -Date: Wed, 16 May 2012 10:58:05 -0700 -Subject: [PATCH 3/3] UBUNTU: SAUCE: apparmor: Add the ability to mediate - mount - -Add the ability for apparmor to do mediation of mount operations. Mount -rules require an updated apparmor_parser (2.8 series) for policy compilation. - -The basic form of the rules are. - - [audit] [deny] mount [conds]* [device] [ -> [conds] path], - [audit] [deny] remount [conds]* [path], - [audit] [deny] umount [conds]* [path], - [audit] [deny] pivotroot [oldroot=] - - remount is just a short cut for mount options=remount - - where [conds] can be - fstype= - options= - -Example mount commands - mount, # allow all mounts, but not umount or pivotroot - - mount fstype=procfs, # allow mounting procfs anywhere - - mount options=(bind, ro) /foo -> /bar, # readonly bind mount - - mount /dev/sda -> /mnt, - - mount /dev/sd** -> /mnt/**, - - mount fstype=overlayfs options=(rw,upperdir=/tmp/upper/,lowerdir=/) -> /mnt/ - - umount, - - umount /m*, - -See the apparmor userspace for full documentation - -Signed-off-by: John Johansen -Acked-by: Kees Cook ---- - security/apparmor/Makefile | 2 +- - security/apparmor/apparmorfs.c | 13 + - security/apparmor/audit.c | 4 + - security/apparmor/domain.c | 2 +- - security/apparmor/include/apparmor.h | 3 +- - security/apparmor/include/audit.h | 11 + - security/apparmor/include/domain.h | 2 + - security/apparmor/include/mount.h | 54 +++ - security/apparmor/lsm.c | 59 ++++ - security/apparmor/mount.c | 620 ++++++++++++++++++++++++++++++++++ - 10 files changed, 767 insertions(+), 3 deletions(-) - create mode 100644 security/apparmor/include/mount.h - create mode 100644 security/apparmor/mount.c - -diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile -index 19daa85..63e0a4c 100644 ---- a/security/apparmor/Makefile -+++ b/security/apparmor/Makefile -@@ -4,7 +4,7 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o - - apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \ - path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \ -- resource.o sid.o file.o net.o -+ resource.o sid.o file.o net.o mount.o - - clean-files := capability_names.h rlim_names.h net_names.h - -diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c -index c66315d..ff19009 100644 ---- a/security/apparmor/apparmorfs.c -+++ b/security/apparmor/apparmorfs.c -@@ -424,10 +424,23 @@ static struct aa_fs_entry aa_fs_entry_domain[] = { - { } - }; - -+static struct aa_fs_entry aa_fs_entry_mount[] = { -+ AA_FS_FILE_STRING("mask", "mount umount"), -+ { } -+}; -+ -+static struct aa_fs_entry aa_fs_entry_namespaces[] = { -+ AA_FS_FILE_BOOLEAN("profile", 1), -+ AA_FS_FILE_BOOLEAN("pivot_root", 1), -+ { } -+}; -+ - static struct aa_fs_entry aa_fs_entry_features[] = { - AA_FS_DIR("domain", aa_fs_entry_domain), - AA_FS_DIR("file", aa_fs_entry_file), - AA_FS_DIR("network", aa_fs_entry_network), -+ AA_FS_DIR("mount", aa_fs_entry_mount), -+ AA_FS_DIR("namespaces", aa_fs_entry_namespaces), - AA_FS_FILE_U64("capability", VFS_CAP_FLAGS_MASK), - AA_FS_DIR("rlimit", aa_fs_entry_rlimit), - { } -diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c -index cc3520d..b9f5ee9 100644 ---- a/security/apparmor/audit.c -+++ b/security/apparmor/audit.c -@@ -44,6 +44,10 @@ const char *const op_table[] = { - "file_mmap", - "file_mprotect", - -+ "pivotroot", -+ "mount", -+ "umount", -+ - "create", - "post_create", - "bind", -diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c -index 6327685..dfdc47b 100644 ---- a/security/apparmor/domain.c -+++ b/security/apparmor/domain.c -@@ -242,7 +242,7 @@ static const char *next_name(int xtype, const char *name) - * - * Returns: refcounted profile, or NULL on failure (MAYBE NULL) - */ --static struct aa_profile *x_table_lookup(struct aa_profile *profile, u32 xindex) -+struct aa_profile *x_table_lookup(struct aa_profile *profile, u32 xindex) - { - struct aa_profile *new_profile = NULL; - struct aa_namespace *ns = profile->ns; -diff --git a/security/apparmor/include/apparmor.h b/security/apparmor/include/apparmor.h -index 40aedd9..e243d96 100644 ---- a/security/apparmor/include/apparmor.h -+++ b/security/apparmor/include/apparmor.h -@@ -29,8 +29,9 @@ - #define AA_CLASS_NET 4 - #define AA_CLASS_RLIMITS 5 - #define AA_CLASS_DOMAIN 6 -+#define AA_CLASS_MOUNT 7 - --#define AA_CLASS_LAST AA_CLASS_DOMAIN -+#define AA_CLASS_LAST AA_CLASS_MOUNT - - /* Control parameters settable through module/boot flags */ - extern enum audit_mode aa_g_audit; -diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h -index c1ff09c..7b90900c 100644 ---- a/security/apparmor/include/audit.h -+++ b/security/apparmor/include/audit.h -@@ -73,6 +73,10 @@ enum aa_ops { - OP_FMMAP, - OP_FMPROT, - -+ OP_PIVOTROOT, -+ OP_MOUNT, -+ OP_UMOUNT, -+ - OP_CREATE, - OP_POST_CREATE, - OP_BIND, -@@ -121,6 +125,13 @@ struct apparmor_audit_data { - unsigned long max; - } rlim; - struct { -+ const char *src_name; -+ const char *type; -+ const char *trans; -+ const char *data; -+ unsigned long flags; -+ } mnt; -+ struct { - const char *target; - u32 request; - u32 denied; -diff --git a/security/apparmor/include/domain.h b/security/apparmor/include/domain.h -index de04464..a3f70c5 100644 ---- a/security/apparmor/include/domain.h -+++ b/security/apparmor/include/domain.h -@@ -23,6 +23,8 @@ struct aa_domain { - char **table; - }; - -+struct aa_profile *x_table_lookup(struct aa_profile *profile, u32 xindex); -+ - int apparmor_bprm_set_creds(struct linux_binprm *bprm); - int apparmor_bprm_secureexec(struct linux_binprm *bprm); - void apparmor_bprm_committing_creds(struct linux_binprm *bprm); -diff --git a/security/apparmor/include/mount.h b/security/apparmor/include/mount.h -new file mode 100644 -index 0000000..bc17a53 ---- /dev/null -+++ b/security/apparmor/include/mount.h -@@ -0,0 +1,54 @@ -+/* -+ * AppArmor security module -+ * -+ * This file contains AppArmor file mediation function definitions. -+ * -+ * Copyright 2012 Canonical Ltd. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation, version 2 of the -+ * License. -+ */ -+ -+#ifndef __AA_MOUNT_H -+#define __AA_MOUNT_H -+ -+#include -+#include -+ -+#include "domain.h" -+#include "policy.h" -+ -+/* mount perms */ -+#define AA_MAY_PIVOTROOT 0x01 -+#define AA_MAY_MOUNT 0x02 -+#define AA_MAY_UMOUNT 0x04 -+#define AA_AUDIT_DATA 0x40 -+#define AA_CONT_MATCH 0x40 -+ -+#define AA_MS_IGNORE_MASK (MS_KERNMOUNT | MS_NOSEC | MS_ACTIVE | MS_BORN) -+ -+int aa_remount(struct aa_profile *profile, struct path *path, -+ unsigned long flags, void *data); -+ -+int aa_bind_mount(struct aa_profile *profile, struct path *path, -+ const char *old_name, unsigned long flags); -+ -+ -+int aa_mount_change_type(struct aa_profile *profile, struct path *path, -+ unsigned long flags); -+ -+int aa_move_mount(struct aa_profile *profile, struct path *path, -+ const char *old_name); -+ -+int aa_new_mount(struct aa_profile *profile, const char *dev_name, -+ struct path *path, const char *type, unsigned long flags, -+ void *data); -+ -+int aa_umount(struct aa_profile *profile, struct vfsmount *mnt, int flags); -+ -+int aa_pivotroot(struct aa_profile *profile, struct path *old_path, -+ struct path *new_path); -+ -+#endif /* __AA_MOUNT_H */ -diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c -index 3cde194..4512cc6 100644 ---- a/security/apparmor/lsm.c -+++ b/security/apparmor/lsm.c -@@ -36,6 +36,7 @@ - #include "include/path.h" - #include "include/policy.h" - #include "include/procattr.h" -+#include "include/mount.h" - - /* Flag indicating whether initialization completed */ - int apparmor_initialized __initdata; -@@ -512,6 +513,60 @@ static int apparmor_file_mprotect(struct vm_area_struct *vma, - !(vma->vm_flags & VM_SHARED) ? MAP_PRIVATE : 0); - } - -+static int apparmor_sb_mount(char *dev_name, struct path *path, char *type, -+ unsigned long flags, void *data) -+{ -+ struct aa_profile *profile; -+ int error = 0; -+ -+ /* Discard magic */ -+ if ((flags & MS_MGC_MSK) == MS_MGC_VAL) -+ flags &= ~MS_MGC_MSK; -+ -+ flags &= ~AA_MS_IGNORE_MASK; -+ -+ profile = __aa_current_profile(); -+ if (!unconfined(profile)) { -+ if (flags & MS_REMOUNT) -+ error = aa_remount(profile, path, flags, data); -+ else if (flags & MS_BIND) -+ error = aa_bind_mount(profile, path, dev_name, flags); -+ else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | -+ MS_UNBINDABLE)) -+ error = aa_mount_change_type(profile, path, flags); -+ else if (flags & MS_MOVE) -+ error = aa_move_mount(profile, path, dev_name); -+ else -+ error = aa_new_mount(profile, dev_name, path, type, -+ flags, data); -+ } -+ return error; -+} -+ -+static int apparmor_sb_umount(struct vfsmount *mnt, int flags) -+{ -+ struct aa_profile *profile; -+ int error = 0; -+ -+ profile = __aa_current_profile(); -+ if (!unconfined(profile)) -+ error = aa_umount(profile, mnt, flags); -+ -+ return error; -+} -+ -+static int apparmor_sb_pivotroot(struct path *old_path, struct path *new_path) -+{ -+ struct aa_profile *profile; -+ int error = 0; -+ -+ profile = __aa_current_profile(); -+ if (!unconfined(profile)) -+ error = aa_pivotroot(profile, old_path, new_path); -+ -+ return error; -+} -+ - static int apparmor_getprocattr(struct task_struct *task, char *name, - char **value) - { -@@ -729,6 +784,10 @@ static struct security_operations apparmor_ops = { - .capget = apparmor_capget, - .capable = apparmor_capable, - -+ .sb_mount = apparmor_sb_mount, -+ .sb_umount = apparmor_sb_umount, -+ .sb_pivotroot = apparmor_sb_pivotroot, -+ - .path_link = apparmor_path_link, - .path_unlink = apparmor_path_unlink, - .path_symlink = apparmor_path_symlink, -diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c -new file mode 100644 -index 0000000..63d8493 ---- /dev/null -+++ b/security/apparmor/mount.c -@@ -0,0 +1,620 @@ -+/* -+ * AppArmor security module -+ * -+ * This file contains AppArmor mediation of files -+ * -+ * Copyright (C) 1998-2008 Novell/SUSE -+ * Copyright 2009-2012 Canonical Ltd. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation, version 2 of the -+ * License. -+ */ -+ -+#include -+#include -+#include -+ -+#include "include/apparmor.h" -+#include "include/audit.h" -+#include "include/context.h" -+#include "include/domain.h" -+#include "include/file.h" -+#include "include/match.h" -+#include "include/mount.h" -+#include "include/path.h" -+#include "include/policy.h" -+ -+ -+static void audit_mnt_flags(struct audit_buffer *ab, unsigned long flags) -+{ -+ if (flags & MS_RDONLY) -+ audit_log_format(ab, "ro"); -+ else -+ audit_log_format(ab, "rw"); -+ if (flags & MS_NOSUID) -+ audit_log_format(ab, ", nosuid"); -+ if (flags & MS_NODEV) -+ audit_log_format(ab, ", nodev"); -+ if (flags & MS_NOEXEC) -+ audit_log_format(ab, ", noexec"); -+ if (flags & MS_SYNCHRONOUS) -+ audit_log_format(ab, ", sync"); -+ if (flags & MS_REMOUNT) -+ audit_log_format(ab, ", remount"); -+ if (flags & MS_MANDLOCK) -+ audit_log_format(ab, ", mand"); -+ if (flags & MS_DIRSYNC) -+ audit_log_format(ab, ", dirsync"); -+ if (flags & MS_NOATIME) -+ audit_log_format(ab, ", noatime"); -+ if (flags & MS_NODIRATIME) -+ audit_log_format(ab, ", nodiratime"); -+ if (flags & MS_BIND) -+ audit_log_format(ab, flags & MS_REC ? ", rbind" : ", bind"); -+ if (flags & MS_MOVE) -+ audit_log_format(ab, ", move"); -+ if (flags & MS_SILENT) -+ audit_log_format(ab, ", silent"); -+ if (flags & MS_POSIXACL) -+ audit_log_format(ab, ", acl"); -+ if (flags & MS_UNBINDABLE) -+ audit_log_format(ab, flags & MS_REC ? ", runbindable" : -+ ", unbindable"); -+ if (flags & MS_PRIVATE) -+ audit_log_format(ab, flags & MS_REC ? ", rprivate" : -+ ", private"); -+ if (flags & MS_SLAVE) -+ audit_log_format(ab, flags & MS_REC ? ", rslave" : -+ ", slave"); -+ if (flags & MS_SHARED) -+ audit_log_format(ab, flags & MS_REC ? ", rshared" : -+ ", shared"); -+ if (flags & MS_RELATIME) -+ audit_log_format(ab, ", relatime"); -+ if (flags & MS_I_VERSION) -+ audit_log_format(ab, ", iversion"); -+ if (flags & MS_STRICTATIME) -+ audit_log_format(ab, ", strictatime"); -+ if (flags & MS_NOUSER) -+ audit_log_format(ab, ", nouser"); -+} -+ -+/** -+ * audit_cb - call back for mount specific audit fields -+ * @ab: audit_buffer (NOT NULL) -+ * @va: audit struct to audit values of (NOT NULL) -+ */ -+static void audit_cb(struct audit_buffer *ab, void *va) -+{ -+ struct common_audit_data *sa = va; -+ -+ if (sa->aad->mnt.type) { -+ audit_log_format(ab, " fstype="); -+ audit_log_untrustedstring(ab, sa->aad->mnt.type); -+ } -+ if (sa->aad->mnt.src_name) { -+ audit_log_format(ab, " srcname="); -+ audit_log_untrustedstring(ab, sa->aad->mnt.src_name); -+ } -+ if (sa->aad->mnt.trans) { -+ audit_log_format(ab, " trans="); -+ audit_log_untrustedstring(ab, sa->aad->mnt.trans); -+ } -+ if (sa->aad->mnt.flags || sa->aad->op == OP_MOUNT) { -+ audit_log_format(ab, " flags=\""); -+ audit_mnt_flags(ab, sa->aad->mnt.flags); -+ audit_log_format(ab, "\""); -+ } -+ if (sa->aad->mnt.data) { -+ audit_log_format(ab, " options="); -+ audit_log_untrustedstring(ab, sa->aad->mnt.data); -+ } -+} -+ -+/** -+ * audit_mount - handle the auditing of mount operations -+ * @profile: the profile being enforced (NOT NULL) -+ * @gfp: allocation flags -+ * @op: operation being mediated (NOT NULL) -+ * @name: name of object being mediated (MAYBE NULL) -+ * @src_name: src_name of object being mediated (MAYBE_NULL) -+ * @type: type of filesystem (MAYBE_NULL) -+ * @trans: name of trans (MAYBE NULL) -+ * @flags: filesystem idependent mount flags -+ * @data: filesystem mount flags -+ * @request: permissions requested -+ * @perms: the permissions computed for the request (NOT NULL) -+ * @info: extra information message (MAYBE NULL) -+ * @error: 0 if operation allowed else failure error code -+ * -+ * Returns: %0 or error on failure -+ */ -+static int audit_mount(struct aa_profile *profile, gfp_t gfp, int op, -+ const char *name, const char *src_name, -+ const char *type, const char *trans, -+ unsigned long flags, const void *data, u32 request, -+ struct file_perms *perms, const char *info, int error) -+{ -+ int audit_type = AUDIT_APPARMOR_AUTO; -+ struct common_audit_data sa; -+ struct apparmor_audit_data aad = { }; -+ -+ if (likely(!error)) { -+ u32 mask = perms->audit; -+ -+ if (unlikely(AUDIT_MODE(profile) == AUDIT_ALL)) -+ mask = 0xffff; -+ -+ /* mask off perms that are not being force audited */ -+ request &= mask; -+ -+ if (likely(!request)) -+ return 0; -+ audit_type = AUDIT_APPARMOR_AUDIT; -+ } else { -+ /* only report permissions that were denied */ -+ request = request & ~perms->allow; -+ -+ if (request & perms->kill) -+ audit_type = AUDIT_APPARMOR_KILL; -+ -+ /* quiet known rejects, assumes quiet and kill do not overlap */ -+ if ((request & perms->quiet) && -+ AUDIT_MODE(profile) != AUDIT_NOQUIET && -+ AUDIT_MODE(profile) != AUDIT_ALL) -+ request &= ~perms->quiet; -+ -+ if (!request) -+ return COMPLAIN_MODE(profile) ? -+ complain_error(error) : error; -+ } -+ -+ COMMON_AUDIT_DATA_INIT(&sa, NONE); -+ sa.aad = &aad; -+ sa.aad->op = op; -+ sa.aad->name = name; -+ sa.aad->mnt.src_name = src_name; -+ sa.aad->mnt.type = type; -+ sa.aad->mnt.trans = trans; -+ sa.aad->mnt.flags = flags; -+ if (data && (perms->audit & AA_AUDIT_DATA)) -+ sa.aad->mnt.data = data; -+ sa.aad->info = info; -+ sa.aad->error = error; -+ -+ return aa_audit(audit_type, profile, gfp, &sa, audit_cb); -+} -+ -+/** -+ * match_mnt_flags - Do an ordered match on mount flags -+ * @dfa: dfa to match against -+ * @state: state to start in -+ * @flags: mount flags to match against -+ * -+ * Mount flags are encoded as an ordered match. This is done instead of -+ * checking against a simple bitmask, to allow for logical operations -+ * on the flags. -+ * -+ * Returns: next state after flags match -+ */ -+static unsigned int match_mnt_flags(struct aa_dfa *dfa, unsigned int state, -+ unsigned long flags) -+{ -+ unsigned int i; -+ -+ for (i = 0; i <= 31 ; ++i) { -+ if ((1 << i) & flags) -+ state = aa_dfa_next(dfa, state, i + 1); -+ } -+ -+ return state; -+} -+ -+/** -+ * compute_mnt_perms - compute mount permission associated with @state -+ * @dfa: dfa to match against (NOT NULL) -+ * @state: state match finished in -+ * -+ * Returns: mount permissions -+ */ -+static struct file_perms compute_mnt_perms(struct aa_dfa *dfa, -+ unsigned int state) -+{ -+ struct file_perms perms; -+ -+ perms.kill = 0; -+ perms.allow = dfa_user_allow(dfa, state); -+ perms.audit = dfa_user_audit(dfa, state); -+ perms.quiet = dfa_user_quiet(dfa, state); -+ perms.xindex = dfa_user_xindex(dfa, state); -+ -+ return perms; -+} -+ -+static const char const *mnt_info_table[] = { -+ "match succeeded", -+ "failed mntpnt match", -+ "failed srcname match", -+ "failed type match", -+ "failed flags match", -+ "failed data match" -+}; -+ -+/* -+ * Returns 0 on success else element that match failed in, this is the -+ * index into the mnt_info_table above -+ */ -+static int do_match_mnt(struct aa_dfa *dfa, unsigned int start, -+ const char *mntpnt, const char *devname, -+ const char *type, unsigned long flags, -+ void *data, bool binary, struct file_perms *perms) -+{ -+ unsigned int state; -+ -+ state = aa_dfa_match(dfa, start, mntpnt); -+ state = aa_dfa_null_transition(dfa, state); -+ if (!state) -+ return 1; -+ -+ if (devname) -+ state = aa_dfa_match(dfa, state, devname); -+ state = aa_dfa_null_transition(dfa, state); -+ if (!state) -+ return 2; -+ -+ if (type) -+ state = aa_dfa_match(dfa, state, type); -+ state = aa_dfa_null_transition(dfa, state); -+ if (!state) -+ return 3; -+ -+ state = match_mnt_flags(dfa, state, flags); -+ if (!state) -+ return 4; -+ *perms = compute_mnt_perms(dfa, state); -+ if (perms->allow & AA_MAY_MOUNT) -+ return 0; -+ -+ /* only match data if not binary and the DFA flags data is expected */ -+ if (data && !binary && (perms->allow & AA_CONT_MATCH)) { -+ state = aa_dfa_null_transition(dfa, state); -+ if (!state) -+ return 4; -+ -+ state = aa_dfa_match(dfa, state, data); -+ if (!state) -+ return 5; -+ *perms = compute_mnt_perms(dfa, state); -+ if (perms->allow & AA_MAY_MOUNT) -+ return 0; -+ } -+ -+ /* failed at end of flags match */ -+ return 4; -+} -+ -+/** -+ * match_mnt - handle path matching for mount -+ * @profile: the confining profile -+ * @mntpnt: string for the mntpnt (NOT NULL) -+ * @devname: string for the devname/src_name (MAYBE NULL) -+ * @type: string for the dev type (MAYBE NULL) -+ * @flags: mount flags to match -+ * @data: fs mount data (MAYBE NULL) -+ * @binary: whether @data is binary -+ * @perms: Returns: permission found by the match -+ * @info: Returns: infomation string about the match for logging -+ * -+ * Returns: 0 on success else error -+ */ -+static int match_mnt(struct aa_profile *profile, const char *mntpnt, -+ const char *devname, const char *type, -+ unsigned long flags, void *data, bool binary, -+ struct file_perms *perms, const char **info) -+{ -+ int pos; -+ -+ if (!profile->policy.dfa) -+ return -EACCES; -+ -+ pos = do_match_mnt(profile->policy.dfa, -+ profile->policy.start[AA_CLASS_MOUNT], -+ mntpnt, devname, type, flags, data, binary, perms); -+ if (pos) { -+ *info = mnt_info_table[pos]; -+ return -EACCES; -+ } -+ -+ return 0; -+} -+ -+static int path_flags(struct aa_profile *profile, struct path *path) -+{ -+ return profile->path_flags | -+ S_ISDIR(path->dentry->d_inode->i_mode) ? PATH_IS_DIR : 0; -+} -+ -+int aa_remount(struct aa_profile *profile, struct path *path, -+ unsigned long flags, void *data) -+{ -+ struct file_perms perms = { }; -+ const char *name, *info = NULL; -+ char *buffer = NULL; -+ int binary, error; -+ -+ binary = path->dentry->d_sb->s_type->fs_flags & FS_BINARY_MOUNTDATA; -+ -+ error = aa_path_name(path, path_flags(profile, path), &buffer, &name, -+ &info); -+ if (error) -+ goto audit; -+ -+ error = match_mnt(profile, name, NULL, NULL, flags, data, binary, -+ &perms, &info); -+ -+audit: -+ error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name, NULL, NULL, -+ NULL, flags, data, AA_MAY_MOUNT, &perms, info, -+ error); -+ kfree(buffer); -+ -+ return error; -+} -+ -+int aa_bind_mount(struct aa_profile *profile, struct path *path, -+ const char *dev_name, unsigned long flags) -+{ -+ struct file_perms perms = { }; -+ char *buffer = NULL, *old_buffer = NULL; -+ const char *name, *old_name = NULL, *info = NULL; -+ struct path old_path; -+ int error; -+ -+ if (!dev_name || !*dev_name) -+ return -EINVAL; -+ -+ flags &= MS_REC | MS_BIND; -+ -+ error = aa_path_name(path, path_flags(profile, path), &buffer, &name, -+ &info); -+ if (error) -+ goto audit; -+ -+ error = kern_path(dev_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path); -+ if (error) -+ goto audit; -+ -+ error = aa_path_name(&old_path, path_flags(profile, &old_path), -+ &old_buffer, &old_name, &info); -+ path_put(&old_path); -+ if (error) -+ goto audit; -+ -+ error = match_mnt(profile, name, old_name, NULL, flags, NULL, 0, -+ &perms, &info); -+ -+audit: -+ error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name, old_name, -+ NULL, NULL, flags, NULL, AA_MAY_MOUNT, &perms, -+ info, error); -+ kfree(buffer); -+ kfree(old_buffer); -+ -+ return error; -+} -+ -+int aa_mount_change_type(struct aa_profile *profile, struct path *path, -+ unsigned long flags) -+{ -+ struct file_perms perms = { }; -+ char *buffer = NULL; -+ const char *name, *info = NULL; -+ int error; -+ -+ /* These are the flags allowed by do_change_type() */ -+ flags &= (MS_REC | MS_SILENT | MS_SHARED | MS_PRIVATE | MS_SLAVE | -+ MS_UNBINDABLE); -+ -+ error = aa_path_name(path, path_flags(profile, path), &buffer, &name, -+ &info); -+ if (error) -+ goto audit; -+ -+ error = match_mnt(profile, name, NULL, NULL, flags, NULL, 0, &perms, -+ &info); -+ -+audit: -+ error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name, NULL, NULL, -+ NULL, flags, NULL, AA_MAY_MOUNT, &perms, info, -+ error); -+ kfree(buffer); -+ -+ return error; -+} -+ -+int aa_move_mount(struct aa_profile *profile, struct path *path, -+ const char *orig_name) -+{ -+ struct file_perms perms = { }; -+ char *buffer = NULL, *old_buffer = NULL; -+ const char *name, *old_name = NULL, *info = NULL; -+ struct path old_path; -+ int error; -+ -+ if (!orig_name || !*orig_name) -+ return -EINVAL; -+ -+ error = aa_path_name(path, path_flags(profile, path), &buffer, &name, -+ &info); -+ if (error) -+ goto audit; -+ -+ error = kern_path(orig_name, LOOKUP_FOLLOW, &old_path); -+ if (error) -+ goto audit; -+ -+ error = aa_path_name(&old_path, path_flags(profile, &old_path), -+ &old_buffer, &old_name, &info); -+ path_put(&old_path); -+ if (error) -+ goto audit; -+ -+ error = match_mnt(profile, name, old_name, NULL, MS_MOVE, NULL, 0, -+ &perms, &info); -+ -+audit: -+ error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name, old_name, -+ NULL, NULL, MS_MOVE, NULL, AA_MAY_MOUNT, &perms, -+ info, error); -+ kfree(buffer); -+ kfree(old_buffer); -+ -+ return error; -+} -+ -+int aa_new_mount(struct aa_profile *profile, const char *orig_dev_name, -+ struct path *path, const char *type, unsigned long flags, -+ void *data) -+{ -+ struct file_perms perms = { }; -+ char *buffer = NULL, *dev_buffer = NULL; -+ const char *name = NULL, *dev_name = NULL, *info = NULL; -+ int binary = 1; -+ int error; -+ -+ dev_name = orig_dev_name; -+ if (type) { -+ int requires_dev; -+ struct file_system_type *fstype = get_fs_type(type); -+ if (!fstype) -+ return -ENODEV; -+ -+ binary = fstype->fs_flags & FS_BINARY_MOUNTDATA; -+ requires_dev = fstype->fs_flags & FS_REQUIRES_DEV; -+ put_filesystem(fstype); -+ -+ if (requires_dev) { -+ struct path dev_path; -+ -+ if (!dev_name || !*dev_name) { -+ error = -ENOENT; -+ goto out; -+ } -+ -+ error = kern_path(dev_name, LOOKUP_FOLLOW, &dev_path); -+ if (error) -+ goto audit; -+ -+ error = aa_path_name(&dev_path, -+ path_flags(profile, &dev_path), -+ &dev_buffer, &dev_name, &info); -+ path_put(&dev_path); -+ if (error) -+ goto audit; -+ } -+ } -+ -+ error = aa_path_name(path, path_flags(profile, path), &buffer, &name, -+ &info); -+ if (error) -+ goto audit; -+ -+ error = match_mnt(profile, name, dev_name, type, flags, data, binary, -+ &perms, &info); -+ -+audit: -+ error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name, dev_name, -+ type, NULL, flags, data, AA_MAY_MOUNT, &perms, info, -+ error); -+ kfree(buffer); -+ kfree(dev_buffer); -+ -+out: -+ return error; -+ -+} -+ -+int aa_umount(struct aa_profile *profile, struct vfsmount *mnt, int flags) -+{ -+ struct file_perms perms = { }; -+ char *buffer = NULL; -+ const char *name, *info = NULL; -+ int error; -+ -+ struct path path = { mnt, mnt->mnt_root }; -+ error = aa_path_name(&path, path_flags(profile, &path), &buffer, &name, -+ &info); -+ if (error) -+ goto audit; -+ -+ if (!error && profile->policy.dfa) { -+ unsigned int state; -+ state = aa_dfa_match(profile->policy.dfa, -+ profile->policy.start[AA_CLASS_MOUNT], -+ name); -+ perms = compute_mnt_perms(profile->policy.dfa, state); -+ } -+ -+ if (AA_MAY_UMOUNT & ~perms.allow) -+ error = -EACCES; -+ -+audit: -+ error = audit_mount(profile, GFP_KERNEL, OP_UMOUNT, name, NULL, NULL, -+ NULL, 0, NULL, AA_MAY_UMOUNT, &perms, info, error); -+ kfree(buffer); -+ -+ return error; -+} -+ -+int aa_pivotroot(struct aa_profile *profile, struct path *old_path, -+ struct path *new_path) -+{ -+ struct file_perms perms = { }; -+ struct aa_profile *target = NULL; -+ char *old_buffer = NULL, *new_buffer = NULL; -+ const char *old_name, *new_name = NULL, *info = NULL; -+ int error; -+ -+ error = aa_path_name(old_path, path_flags(profile, old_path), -+ &old_buffer, &old_name, &info); -+ if (error) -+ goto audit; -+ -+ error = aa_path_name(new_path, path_flags(profile, new_path), -+ &new_buffer, &new_name, &info); -+ if (error) -+ goto audit; -+ -+ if (profile->policy.dfa) { -+ unsigned int state; -+ state = aa_dfa_match(profile->policy.dfa, -+ profile->policy.start[AA_CLASS_MOUNT], -+ new_name); -+ state = aa_dfa_null_transition(profile->policy.dfa, state); -+ state = aa_dfa_match(profile->policy.dfa, state, old_name); -+ perms = compute_mnt_perms(profile->policy.dfa, state); -+ } -+ -+ if (AA_MAY_PIVOTROOT & perms.allow) { -+ if ((perms.xindex & AA_X_TYPE_MASK) == AA_X_TABLE) { -+ target = x_table_lookup(profile, perms.xindex); -+ if (!target) -+ error = -ENOENT; -+ else -+ error = aa_replace_current_profile(target); -+ } -+ } else -+ error = -EACCES; -+ -+audit: -+ error = audit_mount(profile, GFP_KERNEL, OP_PIVOTROOT, new_name, -+ old_name, NULL, target ? target->base.name : NULL, -+ 0, NULL, AA_MAY_PIVOTROOT, &perms, info, error); -+ aa_put_profile(target); -+ kfree(old_buffer); -+ kfree(new_buffer); -+ -+ return error; -+} --- -1.7.9.5 - diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch new file mode 100644 index 00000000000..7fdcafa62d9 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch @@ -0,0 +1,47 @@ +From de6299c1627d80ea6742a0bef15bdb6981e5cfd7 Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov +Date: Fri, 25 Dec 2015 17:11:40 +0300 +Subject: [PATCH 1/2] drivers_base: fix double Kconfig entry + +--- + drivers/base/Kconfig | 24 ------------------------ + 1 file changed, 24 deletions(-) + +diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig +index 946ced4..fc3405e1 100644 +--- a/drivers/base/Kconfig ++++ b/drivers/base/Kconfig +@@ -163,30 +163,6 @@ config FW_LOADER_USER_HELPER + no longer required unless you have a special firmware file that + resides in a non-standard path. + +-config WANT_DEV_COREDUMP +- bool +- help +- Drivers should "select" this option if they desire to use the +- device coredump mechanism. +- +-config ALLOW_DEV_COREDUMP +- bool "Allow device coredump" if EXPERT +- default y +- help +- This option controls if the device coredump mechanism is available or +- not; if disabled, the mechanism will be omitted even if drivers that +- can use it are enabled. +- Say 'N' for more sensitive systems or systems that don't want +- to ever access the information to not have the code, nor keep any +- data. +- +- If unsure, say Y. +- +-config DEV_COREDUMP +- bool +- default y if WANT_DEV_COREDUMP +- depends on ALLOW_DEV_COREDUMP +- + config DEBUG_DRIVER + bool "Driver Core verbose debug messages" + depends on DEBUG_KERNEL +-- +2.6.3 + diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.18.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.18.patch new file mode 100644 index 00000000000..2d8af8fa745 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.18.patch @@ -0,0 +1,48 @@ +diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig +index 48398b4..0e37f7d 100644 +--- a/drivers/base/Kconfig ++++ b/drivers/base/Kconfig +@@ -198,30 +198,6 @@ config DEV_COREDUMP + default y if WANT_DEV_COREDUMP + depends on ALLOW_DEV_COREDUMP + +-config WANT_DEV_COREDUMP +- bool +- help +- Drivers should "select" this option if they desire to use the +- device coredump mechanism. +- +-config ALLOW_DEV_COREDUMP +- bool "Allow device coredump" if EXPERT +- default y +- help +- This option controls if the device coredump mechanism is available or +- not; if disabled, the mechanism will be omitted even if drivers that +- can use it are enabled. +- Say 'N' for more sensitive systems or systems that don't want +- to ever access the information to not have the code, nor keep any +- data. +- +- If unsure, say Y. +- +-config DEV_COREDUMP +- bool +- default y if WANT_DEV_COREDUMP +- depends on ALLOW_DEV_COREDUMP +- + config DEBUG_DRIVER + bool "Driver Core verbose debug messages" + depends on DEBUG_KERNEL +diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig +index 58154a9..53a0d73 100644 +--- a/drivers/mfd/Kconfig ++++ b/drivers/mfd/Kconfig +@@ -81,7 +81,7 @@ config MFD_AXP20X + + config MFD_CROS_EC + tristate "Support ChromeOS Embedded Controller" +- depends on MFD_CORE ++ select MFD_CORE + help + If you say Y here you get support for the ChromeOS Embedded + Controller (EC) providing keyboard, battery and power services. diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch new file mode 100644 index 00000000000..f17ecce92d1 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch @@ -0,0 +1,25 @@ +From 65c5b603489d230b1f1775b01ba1529843cfeba6 Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov +Date: Fri, 25 Dec 2015 17:11:56 +0300 +Subject: [PATCH 2/2] mfd: fix dependency for MFD_CROS_EC + +--- + drivers/mfd/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig +index f425dce..a62a285 100644 +--- a/drivers/mfd/Kconfig ++++ b/drivers/mfd/Kconfig +@@ -61,7 +61,7 @@ config MFD_AAT2870_CORE + + config MFD_CROS_EC + tristate "Support ChromeOS Embedded Controller" +- depends on MFD_CORE ++ select MFD_CORE + help + If you say Y here you get support for the ChromeOS Embedded + Controller (EC) providing keyboard, battery and power services. +-- +2.6.3 + diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch new file mode 100644 index 00000000000..ce19dd5d169 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch @@ -0,0 +1,15 @@ +diff --git a/fs/namei.c b/fs/namei.c +index d999a86..eb6e530 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -703,8 +703,8 @@ static inline void put_link(struct nameidata *nd, struct path *link, void *cooki + path_put(link); + } + +-int sysctl_protected_symlinks __read_mostly = 1; +-int sysctl_protected_hardlinks __read_mostly = 1; ++int sysctl_protected_symlinks __read_mostly = 0; ++int sysctl_protected_hardlinks __read_mostly = 0; + + /** + * may_follow_link - Check symlink following for unsafe situations diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 8179211ba5c..90b4a6a4824 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -147,7 +147,7 @@ with stdenv.lib; # Video configuration. # Enable KMS for devices whose X.org driver supports it. - ${optionalString (versionOlder version "4.3") '' + ${optionalString (versionOlder version "4.3" && !(features.chromiumos or false)) '' DRM_I915_KMS y ''} # Allow specifying custom EDID on the kernel command line @@ -504,6 +504,67 @@ with stdenv.lib; # Disable the firmware helper fallback, udev doesn't implement it any more FW_LOADER_USER_HELPER_FALLBACK? n + # ChromiumOS support + ${optionalString (features.chromiumos or false) '' + CHROME_PLATFORMS y + VGA_SWITCHEROO n + MMC_SDHCI_PXAV2 n + NET_IPVTI n + IPV6_VTI n + REGULATOR_FIXED_VOLTAGE n + TPS6105X n + CPU_FREQ_STAT y + IPV6 y + MFD_CROS_EC y + MFD_CROS_EC_LPC y + MFD_CROS_EC_DEV y + CHARGER_CROS_USB_PD y + I2C y + MEDIA_SUBDRV_AUTOSELECT n + VIDEO_IR_I2C n + BLK_DEV_DM y + ANDROID_PARANOID_NETWORK n + DM_VERITY n + DRM_VGEM n + CPU_FREQ_GOV_INTERACTIVE n + INPUT_KEYRESET n + DM_BOOTCACHE n + UID_CPUTIME n + + ${optionalString (versionAtLeast version "3.18") '' + CPUFREQ_DT n + EXTCON_CROS_EC n + DRM_POWERVR_ROGUE n + CHROMEOS_OF_FIRMWARE y + TEST_RHASHTABLE n + BCMDHD n + TRUSTY n + ''} + + ${optionalString (versionOlder version "3.18") '' + MALI_MIDGARD n + DVB_USB_DIB0700 n + DVB_USB_DW2102 n + DVB_USB_PCTV452E n + DVB_USB_TTUSB2 n + DVB_USB_AF9015 n + DVB_USB_AF9035 n + DVB_USB_ANYSEE n + DVB_USB_AZ6007 n + DVB_USB_IT913X n + DVB_USB_LME2510 n + DVB_USB_RTL28XXU n + USB_S2255 n + VIDEO_EM28XX n + VIDEO_TM6000 n + USB_DWC2 n + USB_GSPCA n + SPEAKUP n + XO15_EBOOK n + USB_GADGET n + ''} + ''} + ${kernelPlatform.kernelExtraConfig or ""} ${extraConfig} '' diff --git a/pkgs/os-specific/linux/kernel/cve-2016-0728.patch b/pkgs/os-specific/linux/kernel/cve-2016-0728.patch new file mode 100644 index 00000000000..5eec95c6293 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/cve-2016-0728.patch @@ -0,0 +1,78 @@ +From 05fd13592b60c3e9873f56705f80ff934e98b046 Mon Sep 17 00:00:00 2001 +From: David Howells +Date: Mon, 18 Jan 2016 10:53:31 +0000 +Subject: [PATCH] KEYS: Fix keyring ref leak in join_session_keyring() + +This fixes CVE-2016-0728. + +If a thread is asked to join as a session keyring the keyring that's already +set as its session, we leak a keyring reference. + +This can be tested with the following program: + + #include + #include + #include + #include + + int main(int argc, const char *argv[]) + { + int i = 0; + key_serial_t serial; + + serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING, + "leaked-keyring"); + if (serial < 0) { + perror("keyctl"); + return -1; + } + + if (keyctl(KEYCTL_SETPERM, serial, + KEY_POS_ALL | KEY_USR_ALL) < 0) { + perror("keyctl"); + return -1; + } + + for (i = 0; i < 100; i++) { + serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING, + "leaked-keyring"); + if (serial < 0) { + perror("keyctl"); + return -1; + } + } + + return 0; + } + +If, after the program has run, there something like the following line in +/proc/keys: + +3f3d898f I--Q--- 100 perm 3f3f0000 0 0 keyring leaked-keyring: empty + +with a usage count of 100 * the number of times the program has been run, +then the kernel is malfunctioning. If leaked-keyring has zero usages or +has been garbage collected, then the problem is fixed. + +Reported-by: Yevgeny Pats +Signed-off-by: David Howells +RH-bugzilla: 1298036 +--- + security/keys/process_keys.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c +index 43b4cddbf2b3..7877e5cd4e23 100644 +--- a/security/keys/process_keys.c ++++ b/security/keys/process_keys.c +@@ -794,6 +794,7 @@ long join_session_keyring(const char *name) + ret = PTR_ERR(keyring); + goto error2; + } else if (keyring == new->session_keyring) { ++ key_put(keyring); + ret = 0; + goto error2; + } +-- +2.5.0 + diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index b42892f9f2d..59d3642e622 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -23,6 +23,7 @@ # symbolic name and `patch' is the actual patch. The patch may # optionally be compressed with gzip or bzip2. kernelPatches ? [] +, ignoreConfigErrors ? stdenv.platform.name != "pc" , extraMeta ? {} , ... }: @@ -41,14 +42,13 @@ let in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches); configfile = stdenv.mkDerivation { + inherit ignoreConfigErrors; name = "linux-config-${version}"; generateConfig = ./generate-config.pl; kernelConfig = kernelConfigFun config; - ignoreConfigErrors = stdenv.platform.name != "pc"; - nativeBuildInputs = [ perl ]; platformName = stdenv.platform.name; diff --git a/pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch b/pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch new file mode 100644 index 00000000000..47ae77a5a54 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch @@ -0,0 +1,19 @@ +diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c +index 88632df..ba6cfa9 100644 +--- a/scripts/genksyms/genksyms.c ++++ b/scripts/genksyms/genksyms.c +@@ -233,11 +233,11 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type, + free_list(last_enum_expr, NULL); + last_enum_expr = NULL; + enum_counter = 0; +- if (!name) +- /* Anonymous enum definition, nothing more to do */ +- return NULL; + } + ++ if (!name) ++ return NULL; ++ + h = crc32(name) % HASH_BUCKETS; + for (sym = symtab[h]; sym; sym = sym->hash_next) { + if (map_to_ns(sym->type) == map_to_ns(type) && diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index a231b551dc0..6a4531d9deb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -9,6 +9,8 @@ import ./generic.nix (args // rec { sha256 = "0z0jdix1mfpnnc8cxw7rzpnhxdayckpnrasvxi1qf0dwhcqgk92d"; }; + kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ]; + features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 7ed6cd142d1..1e58d4e5029 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -9,6 +9,8 @@ import ./generic.nix (args // rec { sha256 = "1bn07wsrcbg4qgqd4v2810c3qc0ifbcza0fyj8s54yd78g9qj4lj"; }; + kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ]; + features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 987452618f0..62f1be8b92b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -10,6 +10,8 @@ import ./generic.nix (args // rec { sha256 = "0jw1023cpn4bjmi0db86lrxri9xj75cj8p2iqs44jabvh35idl7l"; }; + kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ]; + features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 24a568f5feb..86258308c1e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -9,6 +9,8 @@ import ./generic.nix (args // rec { sha256 = "14pz8mvk48i2y1ffkhczjcm2icpb2g9xlpzyrvvis42n5178fjf6"; }; + kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ]; + features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index d9efce840fa..29d4870597a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -9,6 +9,8 @@ import ./generic.nix (args // rec { sha256 = "18sr0dl5ax6pcx6nqp9drb4l6a38g07vxihiqpbwb231jv68h8j7"; }; + kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ]; + features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix deleted file mode 100644 index 6d2deead3a2..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.2.6"; - # Remember to update grsecurity! - extraMeta.branch = "4.2"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0p7v6v3v9kn7w5iragi5hx0dylhis0jy6xmk77gka486q1ynpnqp"; - }; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.3.nix b/pkgs/os-specific/linux/kernel/linux-4.3.nix index 1a33f4828cd..c8a994ba0b3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.3.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.3.3"; + version = "4.3.4"; extraMeta.branch = "4.3"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "8cad4ce7d049c2ecc041b0844bd478bf85f0d3071c93e0c885a776d57cbca3cf"; + sha256 = "0vcsvnpxkpxiidlbw3cy1kl02hfml2jy3cbrvwj2nc4a9y5fb3hj"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 36a297b95e5..cf17e915f8b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -10,6 +10,8 @@ import ./generic.nix (args // rec { sha256 = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2"; }; + kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ]; + features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix new file mode 100644 index 00000000000..fb52b14c9ae --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchgit, perl, buildLinux, ncurses, openssh, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.14.0"; + extraMeta.branch = "3.14"; + + src = fetchgit { + url = "https://chromium.googlesource.com/chromiumos/third_party/kernel"; + rev = "63a768b40c91c6f3518ea1f20d0cb664ed4e6a57"; + sha256 = "613527a032699be32c18d3f5d8d4c215d7718279a1c372c9f371d4e6c0b9cc34"; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; + features.chromiumos = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix new file mode 100644 index 00000000000..9ab3f70c97f --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchgit, perl, buildLinux, ncurses, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.18.0"; + extraMeta.branch = "3.18"; + + src = fetchgit { + url = "https://chromium.googlesource.com/chromiumos/third_party/kernel"; + rev = "3179ec7e3f07fcc3ca35817174c5fc6584030ab3"; + sha256 = "0hfa97fs216x8q20fsmw02kvf6mw6c6zczfjk2bpym6v7zxdzj28"; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; + features.chromiumos = true; + + extraMeta.hydraPlatforms = []; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix new file mode 100644 index 00000000000..2b0e3017979 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + mptcpVersion = "0.90"; + modDirVersion = "3.18.20"; + version = "${modDirVersion}-mptcp_v${mptcpVersion}"; + + extraMeta = { + branch = "3.18"; + maintainer = stdenv.lib.maintainers.layus; + }; + + src = fetchurl { + url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; + sha256 = "1wzdvd1j1wqjkysj98g451y6mxr9a5hff5kn9inxwbzm9yg4icj5"; + }; + + extraConfig = '' + IPV6 y + MPTCP y + IP_MULTIPLE_TABLES y + + # Enable advanced path-managers... + MPTCP_PM_ADVANCED y + MPTCP_FULLMESH y + MPTCP_NDIFFPORTS y + # ... but use none by default. + # The default is safer if source policy routing is not setup. + DEFAULT_DUMMY y + DEFAULT_MPTCP_PM "default" + + # MPTCP scheduler selection. + # Disabled as the only non-default is the useless round-robin. + MPTCP_SCHED_ADVANCED n + DEFAULT_MPTCP_SCHED "default" + + # Smarter TCP congestion controllers + TCP_CONG_LIA m + TCP_CONG_OLIA m + TCP_CONG_WVEGAS m + TCP_CONG_BALIA m + ''; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index cd34819a848..7e95f1dedb1 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -87,10 +87,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "4.2.3"; - revision = "201510130858"; + { kversion = "4.3.4"; + revision = "201601231215"; branch = "test"; - sha256 = "0ndzcx9i94c065dlyvgykmin5bfkbydrv0kxxq52a4c9is6nlsrb"; + sha256 = "1dacld4zlp8mk6ykc0f1v5crppvq3znbdw9rwfrf6qi90984x0mr"; }; grsec_fix_path = @@ -103,4 +103,29 @@ rec { patch = ./crc-regression.patch; }; + genksyms_fix_segfault = + { name = "genksyms-fix-segfault"; + patch = ./genksyms-fix-segfault.patch; + }; + + + chromiumos_Kconfig_fix_entries_3_14 = + { name = "Kconfig_fix_entries_3_14"; + patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.14.patch; + }; + + chromiumos_Kconfig_fix_entries_3_18 = + { name = "Kconfig_fix_entries_3_18"; + patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.18.patch; + }; + + chromiumos_no_link_restrictions = + { name = "chromium-no-link-restrictions"; + patch = ./chromiumos-patches/no-link-restrictions.patch; + }; + + chromiumos_mfd_fix_dependency = + { name = "mfd_fix_dependency"; + patch = ./chromiumos-patches/mfd-fix-dependency.patch; + }; } diff --git a/pkgs/os-specific/linux/libselinux/fPIC.patch b/pkgs/os-specific/linux/libselinux/fPIC.patch deleted file mode 100644 index fdc1fa41a33..00000000000 --- a/pkgs/os-specific/linux/libselinux/fPIC.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index ac019df..00432b9 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -132,7 +132,7 @@ $(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR) - - %.o: %.c policy.h -- $(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(TLSFLAGS) -fPIC -c -o $@ $< - - %.lo: %.c policy.h - $(CC) $(CFLAGS) -fPIC -DSHARED -c -o $@ $< diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 0e6bf512aa2..351c2f60981 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }: let - version = "2.02.132"; + version = "2.02.140"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; - sha256 = "0ac8izssflj371zzar16965zlia6a6zd97i0n00jxfxssnfa0fj1"; + sha256 = "1jd46diyv7074fw8kxwq7imn4pl76g01d8y7z4scq0lkxf8jmpai"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index dc1697b9e9b..465dc58199e 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, groff }: +assert stdenv.isLinux; + stdenv.mkDerivation rec { name = "mdadm-3.3.4"; diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix new file mode 100644 index 00000000000..8f7881b13e8 --- /dev/null +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "mmc-utils-${version}"; + version = "2015-11-18"; + + src = fetchgit { + url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git"; + rev = "44f94b925894577f9ffcf2c418dd013a5e582648"; + sha256 = "1c1g9jpyhykhmidz7mjzrf63w3xlzqkijrqz1g6j4dz6p9pv1gax"; + }; + + installPhase = '' + make install prefix=$out + mkdir -p $out/share/man/man1 + cp man/mmc.1 $out/share/man/man1/ + ''; + + meta = with stdenv.lib; { + description = "Configure MMC storage devices from userspace"; + homepage = http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/; + license = licenses.gpl2; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 3da37a89923..ba69b421c3d 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,30 +1,32 @@ { stdenv, fetchurl, lvm2, libaio, gzip, readline, udev }: stdenv.mkDerivation rec { - name = "multipath-tools-0.4.9"; + name = "multipath-tools-0.5.0"; src = fetchurl { url = "http://christophe.varoqui.free.fr/multipath-tools/${name}.tar.bz2"; - sha256 = "04n7kazp1zrlqfza32phmqla0xkcq4zwn176qff5ida4a60whi4d"; + sha256 = "1yd6l1l1c62xjr1xnij2x49kr416anbgfs4y06r86kp9hkmz2g7i"; }; - sourceRoot = "."; + postPatch = '' + sed -i -re ' + s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", + ' libmultipath/defaults.h + sed -i -e 's,\$(DESTDIR)/\(usr/\)\?,$(prefix)/,g' \ + kpartx/Makefile libmpathpersist/Makefile + ''; - buildInputs = [ lvm2 libaio readline ]; + nativeBuildInputs = [ gzip ]; + buildInputs = [ udev lvm2 libaio readline ]; - preBuild = - '' - makeFlagsArray=(GZIP="${gzip}/bin/gzip -9n -c" prefix=$out mandir=$out/share/man/man8 man5dir=$out/share/man/man5 LIB=lib) - - substituteInPlace multipath/Makefile --replace /etc $out/etc - substituteInPlace kpartx/Makefile --replace /etc $out/etc - - substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx - substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup - - substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id - substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id - ''; + makeFlags = [ + "LIB=lib" + "prefix=$(out)" + "mandir=$(out)/share/man/man8" + "man5dir=$(out)/share/man/man5" + "man3dir=$(out)/share/man/man3" + "unitdir=$(out)/lib/systemd/system" + ]; meta = { description = "Tools for the Linux multipathing driver"; diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix new file mode 100644 index 00000000000..7c8e5eb70a1 --- /dev/null +++ b/pkgs/os-specific/linux/paxtest/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "paxtest-${version}"; + version = "0.9.14"; + + src = fetchurl { + url = "https://www.grsecurity.net/~spender/${name}.tar.gz"; + sha256 = "0j40h3x42k5mr5gc5np4wvr9cdf9szk2f46swf42zny8rlgxiskx"; + }; + + buildPhase = '' + make $makeFlags RUNDIR=$out/bin/ linux + ''; + + installPhase = '' + mkdir -p $out/bin + find . -executable -exec cp {} $out/bin \; + ''; + + meta = with stdenv.lib; { + description = "Test various memory protection measures"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainer = [ maintainers.copumpkin ]; + }; +} + diff --git a/pkgs/os-specific/linux/spl/const.patch b/pkgs/os-specific/linux/spl/const.patch index 3bfcaa22b13..932e8a9eb1c 100644 --- a/pkgs/os-specific/linux/spl/const.patch +++ b/pkgs/os-specific/linux/spl/const.patch @@ -1,10 +1,10 @@ diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c -index f25239a..b731123 100644 +index eb00505..6f38cef 100644 --- a/module/spl/spl-proc.c +++ b/module/spl/spl-proc.c -@@ -38,7 +38,7 @@ - - #define SS_DEBUG_SUBSYS SS_PROC +@@ -36,7 +36,7 @@ + #include + #include -#if defined(CONSTIFY_PLUGIN) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) +#if defined(CONSTIFY_PLUGIN) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index b8aad109c5a..959523ec597 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -17,13 +17,13 @@ assert buildKernel -> kernel != null; stdenv.mkDerivation rec { name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.6.5.3"; + version = "0.6.5.4"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "0lj57apwsy8cfwsvg9z62k71r3qms2p87lgcdk54g7352cwziqps"; + sha256 = "0k80xvl15ahbs0mylfl2bd5widxhngpf7dl6zq46s21wk0795jl4"; }; patches = [ ./const.patch ./install_prefix.patch ]; diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch index 0f12f531f7a..dc91392bd2f 100644 --- a/pkgs/os-specific/linux/spl/install_prefix.patch +++ b/pkgs/os-specific/linux/spl/install_prefix.patch @@ -1,5 +1,5 @@ diff --git a/Makefile.am b/Makefile.am -index 89af931..674420c 100644 +index 4977448..ac17217 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,10 +12,10 @@ endif @@ -40,10 +40,10 @@ index e0da4b3..d6d7af0 100644 kernel_HEADERS = $(KERNEL_H) endif diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index 1cca44a..e0d843b 100644 +index 712e94e..4af9fb7 100644 --- a/include/linux/Makefile.am +++ b/include/linux/Makefile.am -@@ -19,6 +19,6 @@ USER_H = +@@ -18,6 +18,6 @@ USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) if CONFIG_KERNEL @@ -76,10 +76,10 @@ index 10e7093..febecdf 100644 kernel_HEADERS = $(KERNEL_H) endif diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am -index 2d21c57..3958cfd 100644 +index 73c4a84..31a9f50 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am -@@ -104,7 +104,7 @@ USER_H = +@@ -107,7 +107,7 @@ USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) if CONFIG_KERNEL @@ -125,7 +125,7 @@ index 63d9af3..de1aa18 100644 kernel_HEADERS = $(KERNEL_H) endif diff --git a/include/util/Makefile.am b/include/util/Makefile.am -index b721b50..cbb9a05 100644 +index e2bf09f..3f5d6ce 100644 --- a/include/util/Makefile.am +++ b/include/util/Makefile.am @@ -9,6 +9,6 @@ USER_H = @@ -149,7 +149,7 @@ index 7faab0a..8148b3d 100644 kernel_HEADERS = $(KERNEL_H) endif diff --git a/module/Makefile.in b/module/Makefile.in -index 41c1010..3141397 100644 +index d4e62e1..73fa01c 100644 --- a/module/Makefile.in +++ b/module/Makefile.in @@ -21,15 +21,15 @@ clean: @@ -162,8 +162,9 @@ index 41c1010..3141397 100644 KERNELRELEASE=@LINUX_VERSION@ @# Remove extraneous build products when packaging - kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ +- if [ -n "$(DESTDIR)" ]; then \ + kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ - if [ -n $$kmoddir ]; then \ ++ if [ -n "@prefix@" ]; then \ find $$kmoddir -name 'modules.*' | xargs $(RM); \ fi - sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3cff6512fe4..d13417ad032 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux -, glib, kbd, libxslt, coreutils, libgcrypt +, glib, kbd, libxslt, coreutils, libgcrypt, libapparmor, audit, lz4 , kexectools, libmicrohttpd, linuxHeaders, libseccomp , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 , enableKDbus ? false @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl /* cryptsetup */ libuuid m4 glib libxslt libgcrypt - libmicrohttpd kexectools libseccomp + libmicrohttpd kexectools libseccomp audit lz4 libapparmor /* FIXME: we may be able to prevent the following dependencies by generating an autoconf'd tarball, but that's probably not worth it. */ @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { "--enable-compat-libs" # get rid of this eventually "--disable-tests" + "--enable-lz4" "--enable-hostnamed" "--enable-networkd" "--disable-sysusers" diff --git a/pkgs/os-specific/linux/udisks/cve-2014-0004.patch b/pkgs/os-specific/linux/udisks/cve-2014-0004.patch deleted file mode 100644 index ce907507538..00000000000 --- a/pkgs/os-specific/linux/udisks/cve-2014-0004.patch +++ /dev/null @@ -1,82 +0,0 @@ -commit ebf61ed8471a45cf8bce7231de00cb1bbc140708 -Author: Martin Pitt -Date: Wed Mar 5 14:07:44 2014 +0100 - - Fix buffer overflow in mount path parsing - - In the mount monitor we parse mount points from /proc/self/mountinfo. Ensure - that we don't overflow the buffers on platforms where mount paths could be - longer than PATH_MAX (unknown if that can actually happen), as at least the - mount paths for hotpluggable devices are somewhat user-controlled. - - Thanks to Florian Weimer for discovering this bug, and to David Zeuthen - for his initial patch! - - CVE-2014-0004 - -Index: udisks-1.0.4/src/mount-monitor.c -=================================================================== ---- udisks-1.0.4.orig/src/mount-monitor.c 2011-08-25 20:27:33.000000000 +0200 -+++ udisks-1.0.4/src/mount-monitor.c 2014-03-10 13:38:18.309406561 +0100 -@@ -39,6 +39,11 @@ - #include "mount.h" - #include "private.h" - -+/* build a %Ns format string macro with N == PATH_MAX */ -+#define xstr(s) str(s) -+#define str(s) #s -+#define PATH_MAX_FMT "%" xstr(PATH_MAX) "s" -+ - /*--------------------------------------------------------------------------------------------------------------*/ - - enum -@@ -320,8 +325,8 @@ mount_monitor_ensure (MountMonitor *moni - guint mount_id; - guint parent_id; - guint major, minor; -- gchar encoded_root[PATH_MAX]; -- gchar encoded_mount_point[PATH_MAX]; -+ gchar encoded_root[PATH_MAX + 1]; -+ gchar encoded_mount_point[PATH_MAX + 1]; - gchar *mount_point; - dev_t dev; - -@@ -329,7 +334,7 @@ mount_monitor_ensure (MountMonitor *moni - continue; - - if (sscanf (lines[n], -- "%d %d %d:%d %s %s", -+ "%d %d %d:%d " PATH_MAX_FMT " " PATH_MAX_FMT, - &mount_id, - &parent_id, - &major, -@@ -340,6 +345,8 @@ mount_monitor_ensure (MountMonitor *moni - g_warning ("Error parsing line '%s'", lines[n]); - continue; - } -+ encoded_root[sizeof encoded_root - 1] = '\0'; -+ encoded_mount_point[sizeof encoded_mount_point - 1] = '\0'; - - /* ignore mounts where only a subtree of a filesystem is mounted */ - if (g_strcmp0 (encoded_root, "/") != 0) -@@ -358,15 +365,17 @@ mount_monitor_ensure (MountMonitor *moni - sep = strstr (lines[n], " - "); - if (sep != NULL) - { -- gchar fstype[PATH_MAX]; -- gchar mount_source[PATH_MAX]; -+ gchar fstype[PATH_MAX + 1]; -+ gchar mount_source[PATH_MAX + 1]; - struct stat statbuf; - -- if (sscanf (sep + 3, "%s %s", fstype, mount_source) != 2) -+ if (sscanf (sep + 3, PATH_MAX_FMT " " PATH_MAX_FMT, fstype, mount_source) != 2) - { - g_warning ("Error parsing things past - for '%s'", lines[n]); - continue; - } -+ fstype[sizeof fstype - 1] = '\0'; -+ mount_source[sizeof mount_source - 1] = '\0'; - - if (g_strcmp0 (fstype, "btrfs") != 0) - continue; diff --git a/pkgs/os-specific/linux/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch b/pkgs/os-specific/linux/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch deleted file mode 100644 index de1964ca769..00000000000 --- a/pkgs/os-specific/linux/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9ed4eee345f85e3025c33c6e20aa25696e341ccd Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Tue, 7 Apr 2015 11:32:11 +0300 -Subject: [PATCH] P2P: Validate SSID element length before copying it - (CVE-2015-1863) - -This fixes a possible memcpy overflow for P2P dev->oper_ssid in -p2p_add_device(). The length provided by the peer device (0..255 bytes) -was used without proper bounds checking and that could have resulted in -arbitrary data of up to 223 bytes being written beyond the end of the -dev->oper_ssid[] array (of which about 150 bytes would be beyond the -heap allocation) when processing a corrupted management frame for P2P -peer discovery purposes. - -This could result in corrupted state in heap, unexpected program -behavior due to corrupted P2P peer device information, denial of service -due to process crash, exposure of memory contents during GO Negotiation, -and potentially arbitrary code execution. - -Thanks to Google security team for reporting this issue and smart -hardware research group of Alibaba security team for discovering it. - -Signed-off-by: Jouni Malinen ---- - src/p2p/p2p.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c -index f584fae..a45fe73 100644 ---- a/src/p2p/p2p.c -+++ b/src/p2p/p2p.c -@@ -778,6 +778,7 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq, - if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0) - os_memcpy(dev->interface_addr, addr, ETH_ALEN); - if (msg.ssid && -+ msg.ssid[1] <= sizeof(dev->oper_ssid) && - (msg.ssid[1] != P2P_WILDCARD_SSID_LEN || - os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN) - != 0)) { --- -1.9.1 - diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 28fc35efbd4..42da97a7a7b 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -20,13 +20,13 @@ assert buildKernel -> kernel != null && spl != null; stdenv.mkDerivation rec { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.6.5.3"; + version = "0.6.5.4"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; rev = "zfs-${version}"; - sha256 = "1hq65kq50hzhd1zqgyzqq2whg1fckigq8jmhhdsnbwrwmx5y76lh"; + sha256 = "10zf1kdgmdiaaa3zmz4sz5aj5ql6v24wcwixlxbwhwc51mr46k50"; }; patches = [ ./nix-build.patch ]; diff --git a/pkgs/os-specific/linux/zfs/nix-build.patch b/pkgs/os-specific/linux/zfs/nix-build.patch index ae8e82f703a..cc9e36838c7 100644 --- a/pkgs/os-specific/linux/zfs/nix-build.patch +++ b/pkgs/os-specific/linux/zfs/nix-build.patch @@ -1,8 +1,8 @@ diff --git a/Makefile.am b/Makefile.am -index 49b417a..f4af44d 100644 +index f8abb5f..82e8fb6 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -12,10 +12,10 @@ endif +@@ -11,10 +11,10 @@ endif if CONFIG_KERNEL SUBDIRS += module @@ -28,10 +28,10 @@ index a94cad5..a160fe2 100644 kernel_HEADERS = $(COMMON_H) $(KERNEL_H) endif diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index d00b1c8..3242d2e 100644 +index 595d1db..d41375d 100644 --- a/include/linux/Makefile.am +++ b/include/linux/Makefile.am -@@ -17,6 +17,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) +@@ -18,6 +18,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) endif if CONFIG_KERNEL @@ -40,10 +40,10 @@ index d00b1c8..3242d2e 100644 kernel_HEADERS = $(COMMON_H) $(KERNEL_H) endif diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am -index 7ddace0..8da3870 100644 +index 77ecfb2..52b3612 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am -@@ -102,6 +102,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) +@@ -114,6 +114,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) endif if CONFIG_KERNEL @@ -88,7 +88,7 @@ index 0859b9f..b0c6eec 100644 kernel_HEADERS = $(COMMON_H) $(KERNEL_H) endif diff --git a/module/Makefile.in b/module/Makefile.in -index 686402b..9cbf598 100644 +index d4ddee2..876c811 100644 --- a/module/Makefile.in +++ b/module/Makefile.in @@ -18,9 +18,9 @@ modules: @@ -107,7 +107,7 @@ index 686402b..9cbf598 100644 "*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \ exit 1; \ fi -+ @# when copying a file out of the nix store, we need to make it writable again. ++ @# when copying a file out of the nix store, we need to make it writable again. + chmod +w @SPL_SYMBOLS@ $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@ @@ -122,8 +122,9 @@ index 686402b..9cbf598 100644 KERNELRELEASE=@LINUX_VERSION@ @# Remove extraneous build products when packaging - kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ +- if [ -n "$(DESTDIR)" ]; then \ + kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ - if [ -n $$kmoddir ]; then \ ++ if [ -n "@prefix@" ]; then \ find $$kmoddir -name 'modules.*' | xargs $(RM); \ fi - sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ diff --git a/pkgs/servers/certificate-transparency/default.nix b/pkgs/servers/certificate-transparency/default.nix index ebfa7427fc0..80fae89c76d 100644 --- a/pkgs/servers/certificate-transparency/default.nix +++ b/pkgs/servers/certificate-transparency/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation rec { name = "certificate-transparency-${version}"; - version = "2015-11-27"; - rev = "dc5a51e55af989ff5871a6647166d00d0de478ab"; + version = "2016-01-14"; + rev = "250672b5aef3666edbdfc9a75b95a09e7a57ed08"; meta = with stdenv.lib; { homepage = https://www.certificate-transparency.org/; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "google"; repo = "certificate-transparency"; rev = rev; - sha256 = "14sgc2kcjjsnrykwcjin21h1f3v4kg83w6jqiq9qdm1ha165yhvx"; + sha256 = "1gn0bqzkf09jvc2aq3da8fwhl65y7q57msqsh6iczvd6fdmrpfdj"; }; # need to disable regex support in evhtp or building will fail diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 54412d2ab40..8b3edb27c17 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -41,10 +41,11 @@ stdenv.mkDerivation rec { --enable-js-trunk ''; - meta = { + meta = with stdenv.lib; { description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; homepage = "http://couchdb.apache.org"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ viric garbas ]; + license = licenses.asl20; + platform = platforms.all; + maintainers = with maintainers; [ garbas ]; }; } diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index d0d587eb041..efa84f0fa67 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -108,4 +108,13 @@ }; inputs = [ pkgs.pam ]; }; + + statsd = { + src = fetchFromGitHub { + owner = "zebrafishlabs"; + repo = "nginx-statsd"; + rev = "b756a12abf110b9e36399ab7ede346d4bb86d691"; + sha256 = "1psrb5v071idlplvbnaq904nlhqw1zrbw4aawfs278zcdmq67zn8"; + }; + }; } diff --git a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch index 3ba11d41b1b..a6edc8d83ee 100644 --- a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch +++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch @@ -6,7 +6,7 @@ diff -ur dovecot-2.2.12-orig/src/auth/main.c dovecot-2.2.12/src/auth/main.c mod_set.filter_callback = auth_module_filter; - modules = module_dir_load(AUTH_MODULE_DIR, NULL, &mod_set); -+ modules = module_dir_load("/var/lib/dovecot/modules/auth", NULL, &mod_set); ++ modules = module_dir_load("/etc/dovecot/modules/auth", NULL, &mod_set); module_dir_init(modules); if (!worker) @@ -15,7 +15,7 @@ diff -ur dovecot-2.2.12-orig/src/auth/main.c dovecot-2.2.12/src/auth/main.c mod_set.ignore_missing = TRUE; - modules = module_dir_load_missing(modules, AUTH_MODULE_DIR, names, -+ modules = module_dir_load_missing(modules, "/var/lib/dovecot/modules/auth", names, ++ modules = module_dir_load_missing(modules, "/etc/dovecot/modules/auth", names, &mod_set); module_dir_init(modules); } @@ -27,7 +27,7 @@ diff -ur dovecot-2.2.12-orig/src/config/all-settings.c dovecot-2.2.12/src/config .mail_plugins = "", - .mail_plugin_dir = MODULEDIR, -+ .mail_plugin_dir = "/var/lib/dovecot/modules", ++ .mail_plugin_dir = "/etc/dovecot/modules", .mail_log_prefix = "%s(%u): ", @@ -36,7 +36,7 @@ diff -ur dovecot-2.2.12-orig/src/config/all-settings.c dovecot-2.2.12/src/config .libexec_dir = PKG_LIBEXECDIR, .mail_plugins = "", - .mail_plugin_dir = MODULEDIR, -+ .mail_plugin_dir = "/var/lib/dovecot/modules", ++ .mail_plugin_dir = "/etc/dovecot/modules", .auth_socket_path = "auth-userdb", .doveadm_socket_path = "doveadm-server", .doveadm_worker_count = 0, @@ -49,7 +49,7 @@ diff -ur dovecot-2.2.12-orig/src/config/config-parser.c dovecot-2.2.12/src/confi memset(&mod_set, 0, sizeof(mod_set)); mod_set.abi_version = DOVECOT_ABI_VERSION; - modules = module_dir_load(CONFIG_MODULE_DIR, NULL, &mod_set); -+ modules = module_dir_load("/var/lib/dovecot/modules/settings", NULL, &mod_set); ++ modules = module_dir_load("/etc/dovecot/modules/settings", NULL, &mod_set); module_dir_init(modules); i_array_init(&new_roots, 64); @@ -61,7 +61,7 @@ diff -ur dovecot-2.2.12-orig/src/dict/main.c dovecot-2.2.12/src/dict/main.c mod_set.require_init_funcs = TRUE; - modules = module_dir_load(DICT_MODULE_DIR, NULL, &mod_set); -+ modules = module_dir_load("/var/lib/dovecot/modules/dict", NULL, &mod_set); ++ modules = module_dir_load("/etc/dovecot/modules/dict", NULL, &mod_set); module_dir_init(modules); /* Register only after loading modules. They may contain SQL drivers, @@ -73,7 +73,7 @@ diff -ur dovecot-2.2.12-orig/src/doveadm/doveadm-settings.c dovecot-2.2.12/src/d .libexec_dir = PKG_LIBEXECDIR, .mail_plugins = "", - .mail_plugin_dir = MODULEDIR, -+ .mail_plugin_dir = "/var/lib/dovecot/modules", ++ .mail_plugin_dir = "/etc/dovecot/modules", .auth_socket_path = "auth-userdb", .doveadm_socket_path = "doveadm-server", .doveadm_worker_count = 0, @@ -86,7 +86,7 @@ diff -ur dovecot-2.2.12-orig/src/lib-fs/fs-api.c dovecot-2.2.12/src/lib-fs/fs-ap mod_set.ignore_missing = TRUE; - fs_modules = module_dir_load_missing(fs_modules, MODULE_DIR, -+ fs_modules = module_dir_load_missing(fs_modules, "/var/lib/dovecot/modules", ++ fs_modules = module_dir_load_missing(fs_modules, "/etc/dovecot/modules", module_name, &mod_set); module_dir_init(fs_modules); @@ -99,7 +99,7 @@ diff -ur dovecot-2.2.12-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.12/ mod_set.abi_version = DOVECOT_ABI_VERSION; mod_set.setting_name = ""; - ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set); -+ ssl_module = module_dir_load("/var/lib/dovecot/modules", plugin_name, &mod_set); ++ ssl_module = module_dir_load("/etc/dovecot/modules", plugin_name, &mod_set); ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs"); if (ssl_vfuncs == NULL) { @@ -112,7 +112,7 @@ diff -ur dovecot-2.2.12-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2 .mail_plugins = "", - .mail_plugin_dir = MODULEDIR, -+ .mail_plugin_dir = "/var/lib/dovecot/modules", ++ .mail_plugin_dir = "/etc/dovecot/modules", .mail_log_prefix = "%s(%u): ", diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix index 2d38f3f5cef..ec4c5c935af 100644 --- a/pkgs/servers/mail/dovecot/2.2.x.nix +++ b/pkgs/servers/mail/dovecot/2.2.x.nix @@ -1,23 +1,38 @@ -{ stdenv, fetchurl, perl, systemd, openssl, pam, bzip2, zlib, openldap -, inotify-tools, clucene_core_2, sqlite }: +{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl +, bzip2, zlib, inotify-tools, pam, libcap +, clucene_core_2, icu, openldap +# Auth modules +, withMySQL ? false, libmysql +, withPgSQL ? false, postgresql +, withSQLite ? true, sqlite +}: stdenv.mkDerivation rec { - name = "dovecot-2.2.19"; + name = "dovecot-2.2.21"; - buildInputs = [ perl openssl bzip2 zlib openldap clucene_core_2 sqlite ] - ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotify-tools ]; + nativeBuildInputs = [ perl pkgconfig ]; + buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ] + ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] + ++ lib.optional withMySQL libmysql + ++ lib.optional withPgSQL postgresql + ++ lib.optional withSQLite sqlite; src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "17sf5aancad4pg1vx1606k99389wg76blpqzmnmxlz4hklzix7km"; + sha256 = "080bil83gr2dski4gk2bxykg2g497kqm2hn2z4xkbw71b6g17dvs"; }; preConfigure = '' - substituteInPlace src/config/settings-get.pl --replace \ - "/usr/bin/env perl" "${perl}/bin/perl" + patchShebangs src/config/settings-get.pl ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + # We need this for sysconfdir, see remark below. + installFlags = [ "DESTDIR=$(out)" ]; + + postInstall = '' + cp -r $out/$out/* $out + rm -rf $out/$(echo "$out" | cut -d "/" -f2) + '' + lib.optionalString stdenv.isDarwin '' install_name_tool -change libclucene-shared.1.dylib \ ${clucene_core_2}/lib/libclucene-shared.1.dylib \ $out/lib/dovecot/lib21_fts_lucene_plugin.so @@ -27,10 +42,9 @@ stdenv.mkDerivation rec { ''; patches = [ - # Make dovecot look for plugins in /var/lib/dovecot/modules - # so we can symlink plugins from several packages there - # The symlinking needs to be done in NixOS, as part of the - # dovecot service start-up + # Make dovecot look for plugins in /etc/dovecot/modules + # so we can symlink plugins from several packages there. + # The symlinking needs to be done in NixOS. ./2.2.x-module_dir.patch ]; @@ -38,15 +52,19 @@ stdenv.mkDerivation rec { # It will hardcode this for /var/lib/dovecot. # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211 "--localstatedir=/var" + # We need this so utilities default to reading /etc/dovecot/dovecot.conf file. + "--sysconfdir=/etc" "--with-ldap" - "--with-lucene" "--with-ssl=openssl" - "--with-sqlite" "--with-zlib" "--with-bzlib" - ] ++ stdenv.lib.optionals (stdenv.isLinux) [ - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - ]; + "--with-ldap" + "--with-lucene" + "--with-icu" + ] ++ lib.optional (stdenv.isLinux) "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + ++ lib.optional withMySQL "--with-mysql" + ++ lib.optional withPgSQL "--with-pgsql" + ++ lib.optional withSQLite "--with-sqlite"; meta = { homepage = "http://dovecot.org/"; diff --git a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix new file mode 100644 index 00000000000..1a1ba1ad448 --- /dev/null +++ b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchhg, autoconf, automake, dovecot, openssl }: + +stdenv.mkDerivation { + name = "dovecot-antispam-20130429"; + + src = fetchhg { + url = "http://hg.dovecot.org/dovecot-antispam-plugin/"; + rev = "5ebc6aae4d7c"; + sha256 = "181i79c9sf3a80mgmycfq1f77z7fpn3j2s0qiddrj16h3yklf4gv"; + }; + + buildInputs = [ dovecot openssl ]; + nativeBuildInputs = [ autoconf automake ]; + + preConfigure = '' + ./autogen.sh + # Ugly hack; any ideas? + sed "s,^dovecot_moduledir=.*,dovecot_moduledir=$out/lib/dovecot," ${dovecot}/lib/dovecot/dovecot-config > dovecot-config + ''; + + configureFlags = [ + "--with-dovecot=." + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://wiki2.dovecot.org/Plugins/Antispam; + description = "An antispam plugin for the Dovecot IMAP server"; + license = licenses.gpl2; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/mail/dovecot-pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix similarity index 73% rename from pkgs/servers/mail/dovecot-pigeonhole/default.nix rename to pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 3ee73520d7a..385cf7d35ba 100644 --- a/pkgs/servers/mail/dovecot-pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, dovecot22, openssl}: +{ stdenv, fetchurl, dovecot, openssl }: stdenv.mkDerivation rec { name = "dovecot-pigeonhole-${version}"; - version = "0.4.3"; + version = "0.4.10"; src = fetchurl { url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz"; - sha256 = "0mypnkc980s3kd1bmy4f93dliwg6n8jfsac8r51jrpvv0ymz94nn"; - }; + sha256 = "0vvjj1yjr189rn8f41z5rj8gfvk24a8j33q6spb6bd6k1wbfgpz9"; + }; - buildInputs = [ dovecot22 openssl ]; + buildInputs = [ dovecot openssl ]; preConfigure = '' substituteInPlace src/managesieve/managesieve-settings.c --replace \ @@ -18,18 +18,21 @@ stdenv.mkDerivation rec { substituteInPlace src/managesieve-login/managesieve-login-settings.c --replace \ ".executable = \"managesieve-login\"" \ ".executable = \"$out/libexec/dovecot/managesieve-login\"" - ''; + ''; - configureFlags = [ - "--with-dovecot=${dovecot22}/lib/dovecot" + configureFlags = [ + "--with-dovecot=${dovecot}/lib/dovecot" "--without-dovecot-install-dirs" "--with-moduledir=$(out)/lib/dovecot" - ]; + ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://pigeonhole.dovecot.org/; description = "A sieve plugin for the Dovecot IMAP server"; license = licenses.lgpl21; maintainers = [ maintainers.rickynils ]; - }; + platforms = platforms.linux; + }; } diff --git a/pkgs/servers/mail/postfix/3.0.nix b/pkgs/servers/mail/postfix/3.0.nix index 73ab8c8116f..9ea151e597b 100644 --- a/pkgs/servers/mail/postfix/3.0.nix +++ b/pkgs/servers/mail/postfix/3.0.nix @@ -35,10 +35,14 @@ in stdenv.mkDerivation rec { ++ lib.optional withMySQL libmysql ++ lib.optional withSQLite sqlite; - patches = [ ./postfix-script-shell.patch ./postfix-3.0-no-warnings.patch ]; + patches = [ ./postfix-script-shell.patch ./postfix-3.0-no-warnings.patch ./post-install-script.patch ]; preBuild = '' sed -e '/^PATH=/d' -i postfix-install + sed -e "s|@PACKAGE@|$out|" -i conf/post-install + + # post-install need skip permissions check/set on all symlinks following to /nix/store + sed -e "s|@NIX_STORE@|$NIX_STORE|" -i conf/post-install export command_directory=$out/sbin export config_directory=/etc/postfix @@ -63,7 +67,7 @@ in stdenv.mkDerivation rec { postInstall = '' mkdir -p $out mv -v installdir/$out/* $out/ - mv -v installdir/etc $out/etc + cp -rv installdir/etc $out sed -e '/^PATH=/d' -i $out/libexec/postfix/post-install wrapProgram $out/libexec/postfix/post-install \ --prefix PATH ":" ${coreutils}/bin:${findutils}/bin:${gnugrep}/bin diff --git a/pkgs/servers/mail/postfix/post-install-script.patch b/pkgs/servers/mail/postfix/post-install-script.patch new file mode 100644 index 00000000000..350fbf929b7 --- /dev/null +++ b/pkgs/servers/mail/postfix/post-install-script.patch @@ -0,0 +1,28 @@ +--- a/conf/post-install 1970-01-01 03:00:01.000000000 +0300 ++++ b/conf/post-install 2016-01-20 13:25:18.382233172 +0200 +@@ -254,6 +254,8 @@ + } + + # Bootstrapping problem. ++meta_directory="@PACKAGE@/etc/postfix" ++command_directory="@PACKAGE@/bin" + + if [ -n "$command_directory" ] + then +@@ -528,7 +530,16 @@ + # Skip uninstalled files. + case $path in + no|no/*) continue;; ++ # Skip immutable files from package, correct permissions provided by Nix. ++ @PACKAGE@/*) continue; + esac ++ # Also skip symlinks following to /nix/store ++ if test -L $path; then ++ case "$(readlink $path)" in ++ @NIX_STORE@/*) continue; ++ esac ++ fi ++ + # Pick up the flags. + case $flags in *u*) upgrade_flag=1;; *) upgrade_flag=;; esac + case $flags in *c*) create_flag=1;; *) create_flag=;; esac diff --git a/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch b/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch deleted file mode 100644 index ff297a8df96..00000000000 --- a/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch +++ /dev/null @@ -1,78 +0,0 @@ -From fff30cdea46616eb92f4dd9402ebd27fdb55e13b Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia -Date: Sun, 1 Jun 2014 04:29:19 -0700 -Subject: [PATCH 1/6] XQuartz: GLX: Use __glXEnableExtension to build - extensions list - -Signed-off-by: Jeremy Huddleston Sequoia -(cherry picked from commit 3790001ea29658872aebda00a03170e392b47878) ---- - hw/xquartz/GL/indirect.c | 37 +++++++++++++++++++++++++++++++------ - 1 file changed, 31 insertions(+), 6 deletions(-) - -diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c -index 19b7d86..4e6ab3d 100644 ---- a/hw/xquartz/GL/indirect.c -+++ b/hw/xquartz/GL/indirect.c -@@ -52,6 +52,7 @@ - - #include "visualConfigs.h" - #include "dri.h" -+#include "extension_string.h" - - #include "darwin.h" - #define GLAQUA_DEBUG_MSG(msg, args ...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", \ -@@ -111,6 +112,10 @@ typedef struct __GLXAquaDrawable __GLXAquaDrawable; - */ - struct __GLXAquaScreen { - __GLXscreen base; -+ -+ /* Supported GLX extensions */ -+ unsigned char glx_enable_bits[__GLX_EXT_BYTES]; -+ - int index; - int num_vis; - }; -@@ -541,13 +546,33 @@ __glXAquaScreenProbe(ScreenPtr pScreen) - - screen->base.GLXmajor = 1; - screen->base.GLXminor = 4; -- screen->base.GLXextensions = strdup("GLX_SGIX_fbconfig " -- "GLX_SGIS_multisample " -- "GLX_ARB_multisample " -- "GLX_EXT_visual_info " -- "GLX_EXT_import_context "); - -- /*We may be able to add more GLXextensions at a later time. */ -+ memset(screen->glx_enable_bits, 0, __GLX_EXT_BYTES); -+ -+ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_info"); -+ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_rating"); -+ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_import_context"); -+ __glXEnableExtension(screen->glx_enable_bits, "GLX_OML_swap_method"); -+ __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_fbconfig"); -+ -+ __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIS_multisample"); -+ __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_multisample"); -+ -+ //__glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context"); -+ //__glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context_profile"); -+ -+ // Generate the GLX extensions string (overrides that set by __glXScreenInit()) -+ { -+ unsigned int buffer_size = -+ __glXGetExtensionString(screen->glx_enable_bits, NULL); -+ if (buffer_size > 0) { -+ free(screen->base.GLXextensions); -+ -+ screen->base.GLXextensions = xnfalloc(buffer_size); -+ __glXGetExtensionString(screen->glx_enable_bits, -+ screen->base.GLXextensions); -+ } -+ } - - return &screen->base; - } --- -2.3.2 (Apple Git-55) - diff --git a/pkgs/servers/x11/xorg/darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch b/pkgs/servers/x11/xorg/darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch deleted file mode 100644 index 395853f940f..00000000000 --- a/pkgs/servers/x11/xorg/darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch +++ /dev/null @@ -1,165 +0,0 @@ -From fa5c83fe9129c9cd9cde1420a32112ca2f17566c Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston -Date: Fri, 30 Apr 2010 13:08:25 -0700 -Subject: [PATCH 3/6] Workaround the GC clipping problem in miPaintWindow and - add some debugging output. - -Signed-off-by: Jeremy Huddleston ---- - mi/miexpose.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 94 insertions(+), 10 deletions(-) - -diff --git a/mi/miexpose.c b/mi/miexpose.c -index fc4dbc0..5e31b83 100644 ---- a/mi/miexpose.c -+++ b/mi/miexpose.c -@@ -408,7 +408,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin); - void RootlessStartDrawing(WindowPtr pWin); - void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn); - Bool IsFramedWindow(WindowPtr pWin); --#endif -+#include "../fb/fb.h" -+#endif - - void - miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) -@@ -437,23 +438,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) - Bool solid = TRUE; - DrawablePtr drawable = &pWin->drawable; - -+#ifdef XQUARTZ_CLIP_DEBUG -+ ErrorF("START %d BS %d (pR = %ld)\n", what, pWin->backgroundState, ParentRelative); -+ ErrorF(" Rgn: %d %d %d %d\n", prgn->extents.x1, prgn->extents.y1, -+ prgn->extents.x2 - prgn->extents.x1, -+ prgn->extents.y2 - prgn->extents.y1); -+ ErrorF(" Win: %d %d (%d %d) %d %d\n", pWin->origin.x, pWin->origin.y, -+ pWin->winSize.extents.x1, pWin->winSize.extents.y1, -+ pWin->winSize.extents.x2 - pWin->winSize.extents.x1, -+ pWin->winSize.extents.y2 - pWin->winSize.extents.y1); -+ ErrorF(" Draw: %d %d %d %d\n", pWin->drawable.x, pWin->drawable.y, -+ pWin->drawable.width, pWin->drawable.height); -+#endif -+ - #ifdef ROOTLESS - if (!drawable || drawable->type == UNDRAWABLE_WINDOW) - return; -+#endif -+ -+ if (what == PW_BACKGROUND) -+ { -+#ifdef ROOTLESS -+ if(IsFramedWindow(pWin)) { -+ RootlessStartDrawing(pWin); -+ RootlessDamageRegion(pWin, prgn); - -- if (IsFramedWindow(pWin)) { -- RootlessStartDrawing(pWin); -- RootlessDamageRegion(pWin, prgn); -- -- if (pWin->backgroundState == ParentRelative) { -- if ((what == PW_BACKGROUND) || -- (what == PW_BORDER && !pWin->borderIsPixel)) -+ if(pWin->backgroundState == ParentRelative) { - RootlessSetPixmapOfAncestors(pWin); -+ } - } -- } - #endif - -- if (what == PW_BACKGROUND) { - while (pWin->backgroundState == ParentRelative) - pWin = pWin->parent; - -@@ -478,6 +493,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) - else { - PixmapPtr pixmap; - -+#ifdef ROOTLESS -+ if(IsFramedWindow(pWin)) { -+ RootlessStartDrawing(pWin); -+ RootlessDamageRegion(pWin, prgn); -+ -+ if(!pWin->borderIsPixel && -+ pWin->backgroundState == ParentRelative) { -+ RootlessSetPixmapOfAncestors(pWin); -+ } -+ } -+#endif -+ - tile_x_off = drawable->x; - tile_y_off = drawable->y; - -@@ -486,6 +513,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) - return; - pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable); - drawable = &pixmap->drawable; -+ -+#ifdef XQUARTZ_CLIP_DEBUG -+ ErrorF(" Draw: %d %d %d %d\n", -+ drawable->x, drawable->y, drawable->width, drawable->height); -+#endif -+ - #ifdef COMPOSITE - draw_x_off = pixmap->screen_x; - draw_y_off = pixmap->screen_y; -@@ -548,6 +581,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) - ChangeGC(NullClient, pGC, gcmask, gcval); - ValidateGC(drawable, pGC); - -+#ifdef XQUARTZ_CLIP_DEBUG -+ ErrorF(" GC: %d %d %d %d\n", -+ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1, -+ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1, -+ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1); -+#endif -+ -+#ifdef XQUARTZ -+ /* Looks like our clipping isn't set right for some reason: -+ * http://xquartz.macosforge.org/trac/ticket/290 -+ */ -+ if(what == PW_BORDER) { -+ -+#if 0 -+ if(solid) { -+#if 1 -+ fbFillRegionSolid(&pWin->drawable, -+ prgn, -+ 0, -+ fbReplicatePixel(fill.pixel, -+ pWin->drawable.bitsPerPixel)); -+#else -+ fbFillRegionSolid(drawable, -+ prgn, -+ 0, -+ fbReplicatePixel(fill.pixel, -+ drawable->bitsPerPixel)); -+#endif -+ return; -+ } -+#endif -+ -+ pGC->pCompositeClip->extents.x1 += prgn->extents.x1; -+ pGC->pCompositeClip->extents.y1 += prgn->extents.y1; -+ pGC->pCompositeClip->extents.x2 += prgn->extents.x1; -+ pGC->pCompositeClip->extents.y2 += prgn->extents.y1; -+ -+ if(pGC->pCompositeClip->extents.x2 > drawable->pScreen->width) -+ pGC->pCompositeClip->extents.x2 = drawable->pScreen->width; -+ if(pGC->pCompositeClip->extents.y2 > drawable->pScreen->height) -+ pGC->pCompositeClip->extents.y2 = drawable->pScreen->height; -+ } -+#endif -+ -+#ifdef XQUARTZ_CLIP_DEBUG -+ ErrorF(" GC: %d %d %d %d\n", -+ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1, -+ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1, -+ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1); -+#endif -+ - numRects = RegionNumRects(prgn); - pbox = RegionRects(prgn); - for (i = numRects; --i >= 0; pbox++, prect++) { --- -2.3.2 (Apple Git-55) - diff --git a/pkgs/servers/x11/xorg/darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch b/pkgs/servers/x11/xorg/darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch deleted file mode 100644 index b9d4b18cf82..00000000000 --- a/pkgs/servers/x11/xorg/darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch +++ /dev/null @@ -1,316 +0,0 @@ -From a635e397d5830f7f60e3690a1bb36f7a725b915a Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston -Date: Fri, 12 Feb 2010 19:48:52 -0800 -Subject: [PATCH 5/6] fb: Revert fb changes that broke XQuartz - -http://bugs.freedesktop.org/show_bug.cgi?id=26124 - -Revert "Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5." -Revert "fb: Adjust transform or composite coordinates for pixman operations" - -http://bugs.freedesktop.org/26124 - -This reverts commit a72c65e9176c51de95db2fdbf4c5d946a4911695. -This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1. - -Signed-off-by: Jeremy Huddleston ---- - fb/fb.h | 3 +-- - fb/fbpict.c | 82 ++++++++++++++++++------------------------------------------- - fb/fbtrap.c | 43 ++++++++++++++------------------ - 3 files changed, 43 insertions(+), 85 deletions(-) - -diff --git a/fb/fb.h b/fb/fb.h -index ab110f3..59eaac3 100644 ---- a/fb/fb.h -+++ b/fb/fb.h -@@ -1326,8 +1326,7 @@ fbFillRegionSolid(DrawablePtr pDrawable, - RegionPtr pRegion, FbBits and, FbBits xor); - - extern _X_EXPORT pixman_image_t *image_from_pict(PicturePtr pict, -- Bool has_clip, -- int *xoff, int *yoff); -+ Bool has_clip); - - extern _X_EXPORT void free_pixman_pict(PicturePtr, pixman_image_t *); - -diff --git a/fb/fbpict.c b/fb/fbpict.c -index cafb027..6ee63e9 100644 ---- a/fb/fbpict.c -+++ b/fb/fbpict.c -@@ -46,23 +46,18 @@ fbComposite(CARD8 op, - INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height) - { - pixman_image_t *src, *mask, *dest; -- int src_xoff, src_yoff; -- int msk_xoff, msk_yoff; -- int dst_xoff, dst_yoff; -- - miCompositeSourceValidate(pSrc); - if (pMask) - miCompositeSourceValidate(pMask); - -- src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff); -- mask = image_from_pict(pMask, FALSE, &msk_xoff, &msk_yoff); -- dest = image_from_pict(pDst, TRUE, &dst_xoff, &dst_yoff); -+ src = image_from_pict(pSrc, TRUE); -+ mask = image_from_pict(pMask, TRUE); -+ dest = image_from_pict(pDst, TRUE); - - if (src && dest && !(pMask && !mask)) { - pixman_image_composite(op, src, mask, dest, -- xSrc + src_xoff, ySrc + src_yoff, -- xMask + msk_xoff, yMask + msk_yoff, -- xDst + dst_xoff, yDst + dst_yoff, width, height); -+ xSrc, ySrc, xMask, yMask, xDst, yDst, -+ width, height); - } - - free_pixman_pict(pSrc, src); -@@ -289,20 +284,22 @@ create_conical_gradient_image(PictGradient * gradient) - } - - static pixman_image_t * --create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff) -+create_bits_picture(PicturePtr pict, Bool has_clip) - { -- PixmapPtr pixmap; - FbBits *bits; - FbStride stride; -- int bpp; -+ int bpp, xoff, yoff; - pixman_image_t *image; - -- fbGetDrawablePixmap(pict->pDrawable, pixmap, *xoff, *yoff); -- fbGetPixmapBitsData(pixmap, bits, stride, bpp); -+ fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff); -+ -+ bits = (FbBits*)((CARD8*)bits + -+ (pict->pDrawable->y + yoff) * stride * sizeof(FbBits) + -+ (pict->pDrawable->x + xoff) * (bpp / 8)); - - image = pixman_image_create_bits((pixman_format_code_t) pict->format, -- pixmap->drawable.width, -- pixmap->drawable.height, (uint32_t *) bits, -+ pict->pDrawable->width, -+ pict->pDrawable->height, (uint32_t *) bits, - stride * sizeof(FbStride)); - - if (!image) -@@ -321,57 +318,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff) - if (pict->clientClip) - pixman_image_set_has_client_clip(image, TRUE); - -- if (*xoff || *yoff) -- pixman_region_translate(pict->pCompositeClip, *xoff, *yoff); -+ pixman_region_translate (pict->pCompositeClip, - pict->pDrawable->x, - pict->pDrawable->y); - - pixman_image_set_clip_region(image, pict->pCompositeClip); - -- if (*xoff || *yoff) -- pixman_region_translate(pict->pCompositeClip, -*xoff, -*yoff); -+ pixman_region_translate (pict->pCompositeClip, pict->pDrawable->x, pict->pDrawable->y); - } - - /* Indexed table */ - if (pict->pFormat->index.devPrivate) - pixman_image_set_indexed(image, pict->pFormat->index.devPrivate); - -- /* Add in drawable origin to position within the image */ -- *xoff += pict->pDrawable->x; -- *yoff += pict->pDrawable->y; -- - return image; - } - - static pixman_image_t *image_from_pict_internal(PicturePtr pict, Bool has_clip, -- int *xoff, int *yoff, - Bool is_alpha_map); - - static void --set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip, -- int *xoff, int *yoff, Bool is_alpha_map) -+set_image_properties(pixman_image_t * image, PicturePtr pict, Bool is_alpha_map) - { - pixman_repeat_t repeat; - pixman_filter_t filter; - - if (pict->transform) { -- /* For source images, adjust the transform to account -- * for the drawable offset within the pixman image, -- * then set the offset to 0 as it will be used -- * to compute positions within the transformed image. -- */ -- if (!has_clip) { -- struct pixman_transform adjusted; -- -- adjusted = *pict->transform; -- pixman_transform_translate(&adjusted, -- NULL, -- pixman_int_to_fixed(*xoff), -- pixman_int_to_fixed(*yoff)); -- pixman_image_set_transform(image, &adjusted); -- *xoff = 0; -- *yoff = 0; -- } -- else -- pixman_image_set_transform(image, pict->transform); -+ pixman_image_set_transform(image, pict->transform); - } - - switch (pict->repeatType) { -@@ -399,10 +370,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip, - * as the alpha map for this operation - */ - if (pict->alphaMap && !is_alpha_map) { -- int alpha_xoff, alpha_yoff; - pixman_image_t *alpha_map = -- image_from_pict_internal(pict->alphaMap, FALSE, &alpha_xoff, -- &alpha_yoff, TRUE); -+ image_from_pict_internal(pict->alphaMap, TRUE, TRUE); - - pixman_image_set_alpha_map(image, alpha_map, pict->alphaOrigin.x, - pict->alphaOrigin.y); -@@ -436,8 +405,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip, - } - - static pixman_image_t * --image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff, -- Bool is_alpha_map) -+image_from_pict_internal(PicturePtr pict, Bool has_clip, Bool is_alpha_map) - { - pixman_image_t *image = NULL; - -@@ -445,7 +413,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff, - return NULL; - - if (pict->pDrawable) { -- image = create_bits_picture(pict, has_clip, xoff, yoff); -+ image = create_bits_picture(pict, has_clip); - } - else if (pict->pSourcePict) { - SourcePict *sp = pict->pSourcePict; -@@ -463,19 +431,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff, - else if (sp->type == SourcePictTypeConical) - image = create_conical_gradient_image(gradient); - } -- *xoff = *yoff = 0; - } - - if (image) -- set_image_properties(image, pict, has_clip, xoff, yoff, is_alpha_map); -- -+ set_image_properties (image, pict, is_alpha_map); - return image; - } - - pixman_image_t * --image_from_pict(PicturePtr pict, Bool has_clip, int *xoff, int *yoff) -+image_from_pict (PicturePtr pict, Bool has_clip) - { -- return image_from_pict_internal(pict, has_clip, xoff, yoff, FALSE); -+ return image_from_pict_internal (pict, has_clip, FALSE); - } - - void -diff --git a/fb/fbtrap.c b/fb/fbtrap.c -index bf82f8f..0145ce9 100644 ---- a/fb/fbtrap.c -+++ b/fb/fbtrap.c -@@ -36,13 +36,12 @@ fbAddTraps(PicturePtr pPicture, - INT16 x_off, INT16 y_off, int ntrap, xTrap * traps) - { - pixman_image_t *image; -- int dst_xoff, dst_yoff; - -- if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff))) -- return; -- -- pixman_add_traps(image, x_off + dst_xoff, y_off + dst_yoff, -- ntrap, (pixman_trap_t *) traps); -+ if (!(image = image_from_pict (pPicture, FALSE))) -+ return; -+ -+ pixman_add_traps(image, x_off, y_off, -+ ntrap, (pixman_trap_t *)traps); - - free_pixman_pict(pPicture, image); - } -@@ -52,13 +51,12 @@ fbRasterizeTrapezoid(PicturePtr pPicture, - xTrapezoid * trap, int x_off, int y_off) - { - pixman_image_t *image; -- int dst_xoff, dst_yoff; - -- if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff))) -+ if (!(image = image_from_pict (pPicture, FALSE))) - return; - -- pixman_rasterize_trapezoid(image, (pixman_trapezoid_t *) trap, -- x_off + dst_xoff, y_off + dst_yoff); -+ pixman_rasterize_trapezoid(image, (pixman_trapezoid_t *)trap, -+ x_off, y_off); - - free_pixman_pict(pPicture, image); - } -@@ -68,14 +66,12 @@ fbAddTriangles(PicturePtr pPicture, - INT16 x_off, INT16 y_off, int ntri, xTriangle * tris) - { - pixman_image_t *image; -- int dst_xoff, dst_yoff; - -- if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff))) -+ if (!(image = image_from_pict (pPicture, FALSE))) - return; -- -- pixman_add_triangles(image, -- dst_xoff + x_off, dst_yoff + y_off, -- ntri, (pixman_triangle_t *) tris); -+ -+ pixman_add_triangles(image, x_off, y_off, ntri, -+ (pixman_triangle_t *)tris); - - free_pixman_pict(pPicture, image); - } -@@ -98,13 +94,11 @@ fbShapes(CompositeShapesFunc composite, - int16_t ySrc, int nshapes, int shape_size, const uint8_t * shapes) - { - pixman_image_t *src, *dst; -- int src_xoff, src_yoff; -- int dst_xoff, dst_yoff; - - miCompositeSourceValidate(pSrc); - -- src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff); -- dst = image_from_pict(pDst, TRUE, &dst_xoff, &dst_yoff); -+ src = image_from_pict(pSrc, FALSE); -+ dst = image_from_pict(pDst, TRUE); - - if (src && dst) { - pixman_format_code_t format; -@@ -121,9 +115,8 @@ fbShapes(CompositeShapesFunc composite, - - for (i = 0; i < nshapes; ++i) { - composite(op, src, dst, format, -- xSrc + src_xoff, -- ySrc + src_yoff, -- dst_xoff, dst_yoff, 1, shapes + i * shape_size); -+ xSrc, ySrc, 0, 0, -+ 1, shapes + i * shape_size); - } - } - else { -@@ -143,8 +136,8 @@ fbShapes(CompositeShapesFunc composite, - } - - composite(op, src, dst, format, -- xSrc + src_xoff, -- ySrc + src_yoff, dst_xoff, dst_yoff, nshapes, shapes); -+ xSrc, ySrc, 0, 0, -+ nshapes, shapes); - } - - DamageRegionProcessPending(pDst->pDrawable); --- -2.3.2 (Apple Git-55) - diff --git a/pkgs/servers/x11/xorg/darwin/function-pointer-test.patch b/pkgs/servers/x11/xorg/darwin/function-pointer-test.patch deleted file mode 100644 index e521a12ba80..00000000000 --- a/pkgs/servers/x11/xorg/darwin/function-pointer-test.patch +++ /dev/null @@ -1,46 +0,0 @@ -These are functions, not function pointers, so they always evaluate to true. - -diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m -index 5445c6f..8574bf1 100644 ---- a/hw/xquartz/X11Controller.m -+++ b/hw/xquartz/X11Controller.m -@@ -364,7 +364,6 @@ extern char *bundle_id_prefix; - } - - #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -- if (asl_log_descriptor) { - char *asl_sender; - aslmsg amsg = asl_new(ASL_TYPE_MSG); - assert(amsg); -@@ -394,7 +393,6 @@ extern char *bundle_id_prefix; - asl_log_descriptor(aslc, amsg, ASL_LEVEL_NOTICE, stderr_pipe[0], ASL_LOG_DESCRIPTOR_READ); - - asl_free(amsg); -- } - #endif - - /* Do the fork-twice trick to avoid having to reap zombies */ -@@ -414,11 +412,9 @@ extern char *bundle_id_prefix; - - case 0: /* child2 */ - #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -- if (asl_log_descriptor) { - /* Replace our stdout/stderr */ - dup2(stdout_pipe[1], STDOUT_FILENO); - dup2(stderr_pipe[1], STDERR_FILENO); -- } - #endif - - /* close all open files except for standard streams */ -@@ -443,11 +439,9 @@ extern char *bundle_id_prefix; - } - - #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -- if (asl_log_descriptor) { - /* Close the write ends of the pipe */ - close(stdout_pipe[1]); - close(stderr_pipe[1]); -- } - #endif - } - diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index a68a5a7313e..1ea8095bd38 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,23 +1,40 @@ -{ stdenv, fetchurl, python3Packages, openssl, acl, lz4 }: +{ stdenv, fetchurl, python3Packages, acl, lz4, openssl }: python3Packages.buildPythonPackage rec { name = "borgbackup-${version}"; - version = "0.29.0"; + version = "0.30.0"; namePrefix = ""; src = fetchurl { url = "https://pypi.python.org/packages/source/b/borgbackup/borgbackup-${version}.tar.gz"; - sha256 = "1gvx036a7j16hd5rg8cr3ibiig7gwqhmddrilsakcw4wnfimjy5m"; + sha256 = "0n78c982kdfqbyi9jawcvzgdik4l36c2s7rpzkfr1ka6506k2rx4"; }; - propagatedBuildInputs = with python3Packages; - [ cython msgpack openssl acl llfuse tox detox lz4 setuptools_scm ]; + nativeBuildInputs = with python3Packages; [ + # For building documentation: + sphinx + ]; + propagatedBuildInputs = [ + acl lz4 openssl + ] ++ (with python3Packages; [ + cython msgpack llfuse tox detox setuptools_scm + ]); preConfigure = '' export BORG_OPENSSL_PREFIX="${openssl}" export BORG_LZ4_PREFIX="${lz4}" ''; + postInstall = '' + make -C docs singlehtml + mkdir -p $out/share/doc/borg + cp -R docs/_build/singlehtml $out/share/doc/borg/html + + make -C docs man + mkdir -p $out/share/man + cp -R docs/_build/man $out/share/man/man1 + ''; + meta = with stdenv.lib; { description = "A deduplicating backup program (attic fork)"; homepage = https://borgbackup.github.io/; diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index a861d4c8f77..1854071d6cc 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { name = "obnam-${version}"; - version = "1.18.2"; + version = "1.19"; namePrefix = ""; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz"; - sha256 = "185pjd77lnq99x2sskpl7n6h25z0v069575l4qz206npsywbypnb"; + sha256 = "1591f3mqhgda486wkpb8q4mq685sy6yn3ypbpzx77wii51licxar"; }; buildInputs = [ pythonPackages.sphinx attr ]; diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix new file mode 100644 index 00000000000..eac4af0ec5f --- /dev/null +++ b/pkgs/tools/compression/brotli/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub }: + +# ?TODO: there's also python lib in there + +stdenv.mkDerivation rec { + name = "brotli-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "brotli"; + rev = "v" + version; + sha256 = "1ijwr8fbrajp4gh8x6lrrpf8gymm0i6w06s97rv294q5dcszn299"; + }; + + preConfigure = "cd tools"; + + # Debian installs "brotli" instead of "bro" but let's keep upstream choice for now. + installPhase = '' + mkdir -p "$out/bin" + mv ./bro "$out/bin/" + ''; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + + description = "A generic-purpose lossless compression algorithm and tool"; + + longDescription = + '' Brotli is a generic-purpose lossless compression algorithm that + compresses data using a combination of a modern variant of the LZ77 + algorithm, Huffman coding and 2nd order context modeling, with a + compression ratio comparable to the best currently available + general-purpose compression methods. It is similar in speed with + deflate but offers more dense compression. + + The specification of the Brotli Compressed Data Format is defined + in the following internet draft: + http://www.ietf.org/id/draft-alakuijala-brotli + ''; + + license = licenses.mit; + maintainers = [ maintainers.vcunat ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 53da1607087..536cc26779b 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.3.1"; in +let version = "4.4"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0fpxi9pd297lrrynnsyggdwdcb4xvjvn2gvzlzsws0gdvqazzd8c"; + sha256 = "0jssv1ys4nw2jf7mkp58c19yspaa8ybf48fxsrhhp0683mzpr73p"; }; buildInputs = [ diff --git a/pkgs/tools/filesystems/ceph/0001-Cleanup-boost-optionals.patch b/pkgs/tools/filesystems/ceph/0001-Cleanup-boost-optionals.patch deleted file mode 100644 index a99e16ddc26..00000000000 --- a/pkgs/tools/filesystems/ceph/0001-Cleanup-boost-optionals.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2507ab33236f0da12899fbcdd36535f7c7b68a06 Mon Sep 17 00:00:00 2001 -From: "William A. Kennington III" -Date: Sat, 20 Sep 2014 22:52:31 -0700 -Subject: [PATCH] Cleanup boost optionals - ---- - src/osd/ECBackend.cc | 2 +- - src/osd/ReplicatedPG.cc | 5 ++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc -index a87b5b4..c386900 100644 ---- a/src/osd/ECBackend.cc -+++ b/src/osd/ECBackend.cc -@@ -81,7 +81,7 @@ ostream &operator<<(ostream &lhs, const ECBackend::read_result_t &rhs) - lhs << "read_result_t(r=" << rhs.r - << ", errors=" << rhs.errors; - if (rhs.attrs) { -- lhs << ", attrs=" << rhs.attrs; -+ lhs << ", attrs=" << rhs.attrs.get(); - } else { - lhs << ", noattrs"; - } -diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc -index 5e5510d..79e8616 100644 ---- a/src/osd/ReplicatedPG.cc -+++ b/src/osd/ReplicatedPG.cc -@@ -5259,7 +5259,10 @@ void ReplicatedPG::do_osd_op_effects(OpContext *ctx) - for (list::iterator p = ctx->notify_acks.begin(); - p != ctx->notify_acks.end(); - ++p) { -- dout(10) << "notify_ack " << make_pair(p->watch_cookie, p->notify_id) << dendl; -+ if (p->watch_cookie) -+ dout(10) << "notify_ack " << make_pair(p->watch_cookie.get(), p->notify_id) << dendl; -+ else -+ dout(10) << "notify_ack " << make_pair("NULL", p->notify_id) << dendl; - for (map, WatchRef>::iterator i = - ctx->obc->watchers.begin(); - i != ctx->obc->watchers.end(); --- -2.1.0 - diff --git a/pkgs/tools/filesystems/ceph/boost-158.patch b/pkgs/tools/filesystems/ceph/boost-158.patch deleted file mode 100644 index 11a1d55c494..00000000000 --- a/pkgs/tools/filesystems/ceph/boost-158.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e7b196a4a091c0ea258866559ba06e7ed0cc4247 Mon Sep 17 00:00:00 2001 -From: Kefu Chai -Date: Fri, 8 May 2015 15:21:20 +0800 -Subject: [PATCH] mon: remove unused variable - -* as a side effect, this change silences - http://tracker.ceph.com/issues/11576 - -Fixes: #11576 -Signed-off-by: Kefu Chai ---- - src/mon/OSDMonitor.cc | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc -index 73dcd5f..7caaa45 100644 ---- a/src/mon/OSDMonitor.cc -+++ b/src/mon/OSDMonitor.cc -@@ -3174,8 +3174,6 @@ bool OSDMonitor::preprocess_command(MMonCommand *m) - } else if (prefix == "osd crush get-tunable") { - string tunable; - cmd_getval(g_ceph_context, cmdmap, "tunable", tunable); -- int value; -- cmd_getval(g_ceph_context, cmdmap, "value", value); - ostringstream rss; - if (f) - f->open_object_section("tunable"); diff --git a/pkgs/tools/filesystems/ceph/fix-pgrefdebugging.patch b/pkgs/tools/filesystems/ceph/fix-pgrefdebugging.patch deleted file mode 100644 index 4d13a0572d8..00000000000 --- a/pkgs/tools/filesystems/ceph/fix-pgrefdebugging.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 38ab682..febb58e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -541,8 +541,10 @@ fi - #set pg ref debugging? - AC_ARG_ENABLE([pgrefdebugging], - [AS_HELP_STRING([--enable-pgrefdebugging], [enable pg ref debugging])], -- [AC_DEFINE([PG_DEBUG_REFS], [1], [Defined if you want pg ref debugging])], -- []) -+ [], [enable_pgrefdebugging=no]) -+AS_IF([test "x$enable_pgrefdebugging" = "xyes"], -+ [AC_DEFINE([PG_DEBUG_REFS], [1], [Defined if you want pg ref debugging])], -+ []) - - # - # Java is painful diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.patch b/pkgs/tools/filesystems/nixpart/0.4/blivet.patch index 1758d18442d..d53231a84fd 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.patch +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.patch @@ -37,3 +37,15 @@ index 705b93d..7268d71 100644 # load the udev library libudev = CDLL(libudev) +diff --git a/blivet/deviceaction.py b/blivet/deviceaction.py +index 705b93d..60f8f32 100644 +--- a/blivet/deviceaction.py ++++ b/blivet/deviceaction.py +@@ -467,6 +467,7 @@ def execute(self): + + self.device.disk.format.commitToDisk() + ++ self.device.setup() + self.device.format.create(device=self.device.path, + options=self.device.formatArgs) + diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix new file mode 100644 index 00000000000..b3fd986165a --- /dev/null +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, pkgconfig +, dbus, libconfuse, sane-backends, systemd }: + +stdenv.mkDerivation rec { + name = "scanbd-${version}"; + version = "1.4.4"; + + src = fetchurl { + sha256 = "07a59jk9b2hh49v5lcpckp64f5lny9sq8h0h2p2jcs9cqazf6q9s"; + url = "mirror://sourceforge/scanbd/${name}.tgz"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus libconfuse sane-backends systemd ]; + + configureFlags = [ + "--disable-Werror" + "--enable-udev" + "--with-scanbdconfdir=/etc/scanbd" + "--with-systemdsystemunitdir=$out/lib/systemd/system" + ]; + + enableParallelBuilding = true; + + installFlags = [ + "scanbdconfdir=$(out)/etc/scanbd" + "scannerconfdir=$(scanbdconfdir)/scanner.d" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Scanner button daemon"; + longDescription = '' + scanbd polls a scanner's buttons, looking for button presses, function + knob changes, or other scanner events such as paper inserts and removals, + while at the same time allowing scan-applications to access the scanner. + + Various actions can be submitted (scan, copy, email, ...) via action + scripts. The function knob values are passed to the action scripts as + well. Scan actions are also signaled via dbus. This can be useful for + foreign applications. Scans can also be triggered via dbus from foreign + applications. + + On platforms which support signaling of dynamic device insertion/removal + (libudev, dbus, hal), scanbd supports this as well. + + scanbd can use all sane-backends or some special backends from the (old) + scanbuttond project. + ''; + homepage = http://scanbd.sourceforge.net/; + downloadPage = http://sourceforge.net/projects/scanbd/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/tools/graphics/xcftools/default.nix new file mode 100644 index 00000000000..457f47f75d6 --- /dev/null +++ b/pkgs/tools/graphics/xcftools/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, libpng, perl, gettext }: + +stdenv.mkDerivation { + name = "xcftools-1.0.7"; + + src = fetchurl { + url = "http://henning.makholm.net/xcftools/xcftools-1.0.7.tar.gz"; + sha256 = "19i0x7yhlw6hd2gp013884zchg63yzjdj4hpany011il0n26vgqy"; + }; + + buildInputs = [ libpng perl gettext ]; + + patchPhase = '' + # Required if building with libpng-1.6, innocuous otherwise + substituteInPlace xcf2png.c \ + --replace png_voidp_NULL NULL \ + --replace png_error_ptr_NULL NULL + + # xcfview needs mailcap and isn't that useful anyway + sed -i -e '/BINARIES/s/xcfview//' Makefile.in + ''; + + meta = { + homepage = http://henning.makholm.net/software; + description = "Command-line tools for converting Gimp XCF files"; + longDescription = '' + A set of fast command-line tools for extracting information from + the Gimp's native file format XCF. + + The tools are designed to allow efficient use of layered XCF + files as sources in a build system that use 'make' and similar + tools to manage automatic processing of the graphics. + + These tools work independently of the Gimp engine and do not + require the Gimp to even be installed. + ''; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index b6158ab6445..9a4dcae7dd2 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.15.8"; + version = "2.15.10"; name = "debian-devscripts-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "1zw7phaigncblxb3jp4m8pk165hylk1f088k51nhj9d7z5iz6bbx"; + sha256 = "1yb26xpjxp9q5vsjzc9bv8vydpx2rs1v0i7phxhylfjn0fgpfnc6"; }; buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile diff --git a/pkgs/tools/misc/debootstrap/subst.patch b/pkgs/tools/misc/debootstrap/subst.patch deleted file mode 100644 index 6ead80d6a79..00000000000 --- a/pkgs/tools/misc/debootstrap/subst.patch +++ /dev/null @@ -1,190 +0,0 @@ -diff --git a/usr/sbin/debootstrap b/usr/sbin/debootstrap -index a0dacf3..6331b3d 100755 ---- a/usr/sbin/debootstrap -+++ b/usr/sbin/debootstrap -@@ -14,7 +14,7 @@ if [ "$DEBOOTSTRAP_DIR" = "" ]; then - fi - fi - --if [ -x "/usr/bin/gettext" ]; then -+if [ -x "@gettext@" ]; then - USE_GETTEXT_INTERACTION=yes - fi - -@@ -334,12 +334,12 @@ fi - - if [ "$ARCH" != "" ]; then - true --elif [ -x /usr/bin/dpkg ] && \ -- /usr/bin/dpkg --print-installation-architecture >/dev/null 2>&1; then -- ARCH=`/usr/bin/dpkg --print-installation-architecture` -+elif [ -x @dpkg@ ] && \ -+ @dpkg@ --print-installation-architecture >/dev/null 2>&1; then -+ ARCH=`@dpkg@ --print-installation-architecture` - elif type udpkg >/dev/null 2>&1 && \ - udpkg --print-architecture >/dev/null 2>&1; then -- ARCH=`/usr/bin/udpkg --print-architecture` -+ ARCH=`@udpkg@ --print-architecture` - elif [ -e $DEBOOTSTRAP_DIR/arch ]; then - ARCH=`cat $DEBOOTSTRAP_DIR/arch` - else -@@ -349,7 +349,7 @@ fi - export ARCH SUITE TARGET - - if am_doing_phase first_stage second_stage; then -- if [ -x /usr/bin/id ] && [ `id -u` -ne 0 ]; then -+ if [ -x @id@ ] && [ `id -u` -ne 0 ]; then - error 1 NEEDROOT "debootstrap can only run as root" - fi - # Ensure that we can create working devices and executables on the target. -diff --git a/usr/share/debootstrap/functions b/usr/share/debootstrap/functions -index b9180ba..33feac3 100755 ---- a/usr/share/debootstrap/functions -+++ b/usr/share/debootstrap/functions -@@ -914,7 +914,7 @@ setup_dselect_method () { - # For the debootstrap udeb, pkgdetails is provided by the bootstrap-base - # udeb, so the pkgdetails API needs to be kept in sync with that. - --if [ -x /usr/bin/perl ]; then -+if [ -x @perl@ ]; then - PKGDETAILS=pkgdetails_perl - - pkgdetails_field () { -@@ -1264,7 +1264,7 @@ close LD_SO_CONF; - - unshift @ld_library_path, split(/:/, $ENV{LD_LIBRARY_PATH}); - --$unamearch = `/bin/uname -m`; -+$unamearch = `@uname -m`; - chomp $unamearch; - - foreach my $file (@ARGV) { - - -diff --git a/usr/share/debootstrap/functions b/usr/share/debootstrap/functions -index 730df3a..197b2fb 100755 ---- a/usr/share/debootstrap/functions -+++ b/usr/share/debootstrap/functions -@@ -18,7 +18,7 @@ error () { - for x in "$@"; do echo "EA: $x"; done - echo "EF: $fmt") >&4 - elif [ "$USE_GETTEXT_INTERACTION" ]; then -- (printf "E: `LANG=$GETTEXT_LANG gettext debootstrap "$fmt"`\n" "$@") >&4 -+ (printf "E: `LANG=$GETTEXT_LANG @gettext@ debootstrap "$fmt"`\n" "$@") >&4 - else - (printf "E: $fmt\n" "$@") >&4 - fi -@@ -35,7 +35,7 @@ warning () { - for x in "$@"; do echo "WA: $x"; done - echo "WF: $fmt") >&4 - elif [ "$USE_GETTEXT_INTERACTION" ]; then -- printf "W: `LANG=$GETTEXT_LANG gettext debootstrap "$fmt"`\n" "$@" >&4 -+ printf "W: `LANG=$GETTEXT_LANG @gettext@ debootstrap "$fmt"`\n" "$@" >&4 - else - printf "W: $fmt\n" "$@" >&4 - fi -@@ -51,7 +51,7 @@ info () { - for x in "$@"; do echo "IA: $x"; done - echo "IF: $fmt") >&4 - elif [ "$USE_GETTEXT_INTERACTION" ]; then -- printf "I: `LANG=$GETTEXT_LANG gettext debootstrap "$fmt"`\n" "$@" >&4 -+ printf "I: `LANG=$GETTEXT_LANG @gettext@ debootstrap "$fmt"`\n" "$@" >&4 - else - printf "I: $fmt\n" "$@" >&4 - fi - - -diff --git a/usr/share/debootstrap/functions b/usr/share/debootstrap/functions -index 98d2056..c1d7430 100755 ---- a/usr/share/debootstrap/functions -+++ b/usr/share/debootstrap/functions -@@ -501,9 +501,9 @@ download_release_indices () { - local md= - if [ "$normmd" != "" ]; then - md="$normmd" -- elif [ -x /bin/bunzip2 ] && [ "$bz2md" != "" ]; then -+ elif [ -x @bunzip2@ ] && [ "$bz2md" != "" ]; then - md="$bz2md" -- elif [ -x /bin/gunzip ] && [ "$gzmd" != "" ]; then -+ elif [ -x @gunzip@ ] && [ "$gzmd" != "" ]; then - md="$gzmd" - fi - if [ "$md" != "" ]; then -@@ -529,11 +529,11 @@ download_release_indices () { - ext="$ext $normmd ." - md="$normmd" - fi -- if [ -x /bin/bunzip2 ] && [ "$bz2md" != "" ]; then -+ if [ -x @bunzip2@ ] && [ "$bz2md" != "" ]; then - ext="$ext $bz2md bz2" - md="${md:-$bz2md}" - fi -- if [ -x /bin/gunzip ] && [ "$gzmd" != "" ]; then -+ if [ -x @gunzip@ ] && [ "$gzmd" != "" ]; then - ext="$ext $gzmd gz" - md="${md:-$gzmd}" - fi -@@ -663,7 +663,7 @@ download_main_indices () { - for c in $COMPONENTS; do - local path="dists/$SUITE/$c/binary-$ARCH/Packages" - local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")" -- if [ -x /bin/gunzip ] && get "$m/${path}.gz" "${pkgdest}.gz"; then -+ if [ -x @gunzip@ ] && get "$m/${path}.gz" "${pkgdest}.gz"; then - rm -f "$pkgdest" - gunzip "$pkgdest.gz" - elif get "$m/$path" "$pkgdest"; then - - -diff --git a/usr/share/debootstrap/functions b/usr/share/debootstrap/functions -index 15051e8..a5de422 100755 ---- a/usr/share/debootstrap/functions -+++ b/usr/share/debootstrap/functions -@@ -70,13 +70,13 @@ wgetprogress () { - [ ! "$verbose" ] && QSWITCH="-q" - local ret=0 - if [ "$USE_DEBIANINSTALLER_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then -- wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END >&3 -+ @wget@ "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END >&3 - ret=$? - elif [ "$USE_BOOTFLOPPIES_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then -- wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END "$PROGRESS_WHAT" >&3 -+ @wget@ "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END "$PROGRESS_WHAT" >&3 - ret=$? - else -- wget $QSWITCH "$@" -+ @wget@ $QSWITCH "$@" - ret=$? - fi - return $ret - -diff --git a/usr/share/debootstrap/functions b/usr/share/debootstrap/functions -index 8d60d8e..e238644 100755 ---- a/usr/share/debootstrap/functions -+++ b/usr/share/debootstrap/functions -@@ -921,7 +921,7 @@ if [ -x ]; then - - pkgdetails_field () { - # uniq field mirror Packages values... -- perl -le ' -+ @perl@ -le ' - $unique = shift @ARGV; $field = lc(shift @ARGV); $mirror = shift @ARGV; - $cnt = length(@ARGV); - %fields = map { $_, 0 } @ARGV; -@@ -959,7 +959,7 @@ for $v (keys %fields) { - pkgdetails_perl () { - if [ "$1" = "WGET%" ]; then - shift; -- perl -e ' -+ @perl@ -e ' - $v = 0; - while (read STDIN, $x, 1) { - if ($x =~ m/\d/) { -@@ -974,7 +974,7 @@ while (read STDIN, $x, 1) { - }' "$@" - elif [ "$1" = "GETDEPS" ]; then - local pkgdest="$2"; shift; shift -- perl -e ' -+ @perl@ -e ' - while () { - chomp; - $in = 1 if (/^Package: (.*)$/ && grep {$_ eq $1} @ARGV); diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index be5eb0e6621..808fb2c841c 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gparted-0.24.0"; + name = "gparted-0.25.0"; src = fetchurl { - sha256 = "0q6d1s9f4qgdivj4vm9w87qmdfyq8s65jzkhv05rp9cl72rqlf82"; - url = "mirror://sourceforge/gparted/${name}.tar.bz2"; + sha256 = "1bllvj66rka8f9h9rfwvxaqrj4mbp2n2860ahnp9xm1195gnv69d"; + url = "mirror://sourceforge/gparted/${name}.tar.gz"; }; configureFlags = [ "--disable-doc" ]; diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index 17689a4848a..e82f61e69f5 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -1,54 +1,43 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libusb1, udev -, enableGUI ? true, qt4 ? null -}: +{ stdenv, fetchFromGitHub, zlib, libusb1, cmake, qt5 +, enableGUI ? false }: + +let version = "d0526a3"; in +let verName = "1.4.2pre"; in stdenv.mkDerivation rec { - version = "1.4.1"; - name = "heimdall-${version}"; + name = "heimdall-${verName}"; src = fetchFromGitHub { owner = "Benjamin-Dobell"; repo = "Heimdall"; - rev = "v${version}"; - sha256 = "1b7xpamwvw5r2d9yf73f0axv35vg8zaz1345xs3lmsr105phnnp4"; + rev = "${version}"; + sha256 = "1y8gvqprajlml1z6mjcrlj54m9xsr8691nqagakkkis7hs1lgzmp"; }; - buildInputs = - [ pkgconfig libusb1 udev ] - ++ stdenv.lib.optional enableGUI qt4 ; - - makeFlags = "udevrulesdir=$(out)/lib/udev/rules.d"; + buildInputs = [ zlib libusb1 cmake ]; + patchPhase = stdenv.lib.optional (!enableGUI) '' + sed -i '/heimdall-frontend/d' CMakeLists.txt + ''; + enableParallelBuilding = true; + cmakeFlags = ["-DQt5Widgets_DIR=${qt5.qtbase}/lib/cmake/Qt5Widgets" + "-DQt5Gui_DIR=${qt5.qtbase}/lib/cmake/Qt5Gui" + "-DQt5Core_DIR=${qt5.qtbase}/lib/cmake/Qt5Core" + "-DBUILD_TYPE=Release"]; preConfigure = '' - pushd libpit - ./configure - make - popd - - cd heimdall - substituteInPlace Makefile.in --replace sudo true - - # Give ownership of the Galaxy S USB device to the logged in - # user. - substituteInPlace 60-heimdall-galaxy-s.rules --replace 'MODE="0666"' 'TAG+="udev-acl"' + # Give ownership of the Galaxy S USB device to the logged in user. + substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"' ''; - postBuild = stdenv.lib.optionalString enableGUI + installPhase = '' - pushd ../heimdall-frontend - substituteInPlace Source/mainwindow.cpp --replace /usr/bin $out/bin - qmake heimdall-frontend.pro OUTPUTDIR=$out/bin - make - popd - ''; - - postInstall = - '' - mkdir -p $out/share/doc/heimdall - cp ../Linux/README $out/share/doc/heimdall/ + mkdir -p $out/bin $out/share/doc/heimdall $out/lib/udev/rules.d + cp bin/heimdall $out/bin + cp ../Linux/README $out/share/doc/heimdall + cp ../heimdall/60-heimdall.rules $out/lib/udev/rules.d '' + stdenv.lib.optionalString enableGUI '' - make -C ../heimdall-frontend install + cp bin/heimdall-frontend $out/bin ''; meta = { diff --git a/pkgs/tools/misc/homesick/Gemfile b/pkgs/tools/misc/homesick/Gemfile new file mode 100644 index 00000000000..fb1d6a5584f --- /dev/null +++ b/pkgs/tools/misc/homesick/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "homesick" diff --git a/pkgs/tools/misc/homesick/Gemfile.lock b/pkgs/tools/misc/homesick/Gemfile.lock new file mode 100644 index 00000000000..cac0e8d083e --- /dev/null +++ b/pkgs/tools/misc/homesick/Gemfile.lock @@ -0,0 +1,15 @@ +GEM + remote: https://rubygems.org/ + specs: + homesick (1.1.3) + thor (>= 0.14.0) + thor (0.19.1) + +PLATFORMS + ruby + +DEPENDENCIES + homesick + +BUNDLED WITH + 1.10.6 diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix new file mode 100644 index 00000000000..9ea54f1f0b3 --- /dev/null +++ b/pkgs/tools/misc/homesick/default.nix @@ -0,0 +1,28 @@ +{ lib, bundlerEnv, git}: +bundlerEnv { + name = "homesick-1.1.3"; + + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + # Cannot use `wrapProgram` because the the help is aware of the file name. + postInstall = '' + rm $out/bin/thor + sed 1a'ENV["PATH"] = "${git}/bin:#{ENV["PATH"] ? ":#{ENV["PATH"]}" : "" }"' -i $out/bin/homesick + ''; + + meta = with lib; { + description = "Your home directory is your castle. Don't leave your dotfiles behind."; + long_description = + '' + Homesick is sorta like rip, but for dotfiles. It uses git to clone a repository containing + dotfiles, and saves them in ~/.homesick. It then allows you to symlink all the dotfiles into + place with a single command. + ''; + homepage = https://github.com/technicalpickles/homesick; + license = licenses.mit; + maintainers = with maintainers; [ aaronschif ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/homesick/gemset.nix b/pkgs/tools/misc/homesick/gemset.nix new file mode 100644 index 00000000000..b4a3b608bcb --- /dev/null +++ b/pkgs/tools/misc/homesick/gemset.nix @@ -0,0 +1,16 @@ +{ + homesick = { + version = "1.1.3"; + source = { + type = "gem"; + sha256 = "1pqsnbykisc6qamkz1gcbgis4az95sggxfdkq9v5hjr1a46q0s91"; + }; + }; + thor = { + version = "0.19.1"; + source = { + type = "gem"; + sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + }; + }; +} diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index cf70b234b88..3d0d03f6c4a 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "progress-${version}"; - version = "0.9"; + version = "0.12.1"; src = fetchFromGitHub { owner = "Xfennec"; repo = "progress"; rev = "v${version}"; - sha256 = "07bl5fsr538nk4l8vwj1kf5bivlh3a8cy8jliqfadxmhf1knn2mw"; + sha256 = "0lwj0zdcdsl1wczk3yq7wfpyw3zi87h8x2z8yjp0wgnr45bbqibl"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 41a5a6797d1..933788f5785 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,52 +1,67 @@ -{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfs-progs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45, diffutils, pam, utillinux, attr, gettext }: +{ stdenv, fetchFromGitHub +, autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 +, acl, attr, boost, btrfs-progs, dbus_libs, diffutils, e2fsprogs, libxml2 +, lvm2, pam, python, utillinux }: stdenv.mkDerivation rec { - name = "snapper-0.2.4"; + name = "snapper-${version}"; + version = "0.2.8"; - src = fetchgit { - url = "https://github.com/openSUSE/snapper"; - rev = "24e18153f7a32d0185dcfb20f8b8a4709ba8fe4a"; - sha256 = "ec4b829430bd7181995e66a26ac86e8ac71c27e77faf8eb06db71d645c6f859b"; + src = fetchFromGitHub { + owner = "openSUSE"; + repo = "snapper"; + rev = "v${version}"; + sha256 = "1rj8vy6hq140pbnc7mjjb34mfqdgdah1dmlv2073izdgakh7p38j"; }; - buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfs-progs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ]; + nativeBuildInputs = [ + autoreconfHook pkgconfig + docbook_xsl libxslt docbook_xml_dtd_45 + ]; + buildInputs = [ + acl attr boost btrfs-progs dbus_libs diffutils e2fsprogs libxml2 + lvm2 pam python utillinux + ]; - patchPhase = '' - # work around missing btrfs/version.h; otherwise, use "-DHAVE_BTRFS_VERSION_H" - substituteInPlace snapper/Btrfs.cc --replace "define BTRFS_LIB_VERSION (100)" "define BTRFS_LIB_VERSION (200)"; - # fix strange SuSE boost naming - substituteInPlace snapper/Makefile.am --replace \ - "libsnapper_la_LIBADD = -lboost_thread-mt -lboost_system-mt -lxml2 -lacl -lz -lm" \ - "libsnapper_la_LIBADD = -lboost_thread -lboost_system -lxml2 -lacl -lz -lm"; - # general cleanup - sed -i 's/^INCLUDES/AM_CPPFLAGS/' $(grep -rl ^INCLUDES .|grep "\.am$") - ''; + postPatch = '' + # Hard-coded root paths, hard-coded root paths everywhere... + for file in {client,data,pam,scripts}/Makefile.am; do + substituteInPlace $file \ + --replace '$(DESTDIR)/usr' "$out" \ + --replace "DESTDIR" "out" \ + --replace "/usr" "$out" + done + substituteInPlace pam/Makefile.am \ + --replace '/`basename $(libdir)`' "$out/lib" + ''; - configurePhase = '' - aclocal - libtoolize --force --automake --copy - autoheader - automake --add-missing --copy - autoconf + configureFlags = [ + "--disable-ext4" # requires patched kernel & e2fsprogs + ]; - ./configure --disable-silent-rules --disable-ext4 --disable-btrfs-quota --prefix=$out - ''; + enableParallelBuilding = true; - makeFlags = "DESTDIR=$(out)"; + NIX_CFLAGS_COMPILE = [ + "-I${libxml2}/include/libxml2" + ]; - NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ]; - - # Probably a hack, but using DESTDIR and PREFIX makes everything work! postInstall = '' - cp -r $out/$out/* $out - rm -r $out/nix - ''; + rm -r $out/etc/cron.* + patchShebangs $out/lib/zypp/plugins/commit/* + for file in \ + $out/lib/pam_snapper/* \ + $out/lib/systemd/system/* \ + $out/share/dbus-1/system-services/* \ + ; do + substituteInPlace $file --replace "/usr" "$out" + done + ''; meta = with stdenv.lib; { description = "Tool for Linux filesystem snapshot management"; homepage = http://snapper.io; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.tstrobel ]; + maintainers = with maintainers; [ nckx tstrobel ]; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index dafc30bd647..97737bce783 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.11.29"; + version = "0.30.2016.01.10"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "10y0qxyyfw9kxiax3b0gdd38yz2y3lii75mgvlq6q6h77r3wham4"; + sha256 = "1npgjgbri7g27f9ayx39d3pbv7pa22860c0aipwwvayggs27g1sr"; }; pythonPaths = [ pycrypto requests2 ]; diff --git a/pkgs/tools/networking/isync/isync-recursice-imap.patch b/pkgs/tools/networking/isync/isync-recursice-imap.patch deleted file mode 100644 index db12069950f..00000000000 --- a/pkgs/tools/networking/isync/isync-recursice-imap.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -rupN ../isync-1.0.4_original/./src/drv_imap.c ./src/drv_imap.c ---- ../isync-1.0.4_original/./src/drv_imap.c 2007-09-22 01:44:12.000000000 -0700 -+++ ./src/drv_imap.c 2009-04-22 15:28:58.000000000 -0700 -@@ -1678,7 +1678,7 @@ imap_list( store_t *gctx, string_list_t - int ret; - - imap->boxes = 0; -- if ((ret = imap_exec_b( ctx, 0, "LIST \"\" \"%s%%\"", ctx->prefix )) != DRV_OK) -+ if ((ret = imap_exec_b( ctx, 0, "LIST \"\" \"%s*\"", ctx->prefix )) != DRV_OK) - return ret; - *retb = imap->boxes; - return DRV_OK; -diff -rupN ../isync-1.0.4_original/./src/drv_maildir.c ./src/drv_maildir.c ---- ../isync-1.0.4_original/./src/drv_maildir.c 2008-02-23 01:02:21.000000000 -0800 -+++ ./src/drv_maildir.c 2009-04-22 15:34:05.000000000 -0700 -@@ -24,6 +24,7 @@ - - #include "isync.h" - -+#include - #include - #include - #include -@@ -46,6 +47,56 @@ - #include - #endif /* USE_DB */ - -+static void encode_maildir_box(const char* in, char* out, size_t size) -+{ -+ const char* p; -+ char c; -+ size_t out_chars; -+ -+ for (p = in, out_chars = 0; (c = *p); ++p, ++out, ++out_chars) { -+ assert(out_chars < size); -+ if (c == '/') { -+ assert(out_chars < size - 1); -+ *(out++) = '~'; -+ *out = '-'; -+ ++out_chars; -+ } -+ else if (c == '~') { -+ assert(out_chars < size - 1); -+ *(out++) = '~'; -+ *out = '~'; -+ ++out_chars; -+ } -+ else { -+ *out = c; -+ } -+ } -+ assert(out_chars < size); -+ *out = 0; -+} -+ -+static void decode_maildir_box(const char* in, char* out, size_t size) -+{ -+ const char* p; -+ char c; -+ size_t out_chars; -+ -+ for (p = in, out_chars = 0; (c = *p); ++p, ++out, ++out_chars) { -+ assert(out_chars < size); -+ if (c == '~') { -+ assert(out_chars < size - 1); -+ c = *(++p); -+ *out = (c == '-' ? '/' : '~'); -+ ++out_chars; -+ } -+ else { -+ *out = c; -+ } -+ } -+ assert(out_chars < size); -+ *out = 0; -+} -+ - typedef struct maildir_store_conf { - store_conf_t gen; - char *inbox; -@@ -164,14 +215,17 @@ maildir_list( store_t *gctx, string_list - const char *inbox = ((maildir_store_conf_t *)gctx->conf)->inbox; - int bl; - struct stat st; -- char buf[PATH_MAX]; -+ char buf[PATH_MAX], box[PATH_MAX]; - - if (*de->d_name == '.') - continue; - bl = nfsnprintf( buf, sizeof(buf), "%s%s/cur", gctx->conf->path, de->d_name ); - if (stat( buf, &st ) || !S_ISDIR(st.st_mode)) - continue; -- add_string_list( retb, !memcmp( buf, inbox, bl - 4 ) && !inbox[bl - 4] ? "INBOX" : de->d_name ); -+ -+ decode_maildir_box(de->d_name, box, PATH_MAX); -+ add_string_list( retb, -+ !memcmp( buf, inbox, bl - 4 ) && !inbox[bl - 4] ? "INBOX" : box ); - } - closedir (dir); - -@@ -717,8 +771,11 @@ maildir_prepare( store_t *gctx, int opts - #endif /* USE_DB */ - if (!strcmp( gctx->name, "INBOX" )) - gctx->path = nfstrdup( ((maildir_store_conf_t *)gctx->conf)->inbox ); -- else -- nfasprintf( &gctx->path, "%s%s", gctx->conf->path, gctx->name ); -+ else { -+ char box[_POSIX_PATH_MAX]; -+ encode_maildir_box(gctx->name, box, _POSIX_PATH_MAX); -+ nfasprintf( &gctx->path, "%s%s", gctx->conf->path, box ); -+ } - if (opts & OPEN_SETFLAGS) - opts |= OPEN_OLD; - if (opts & OPEN_EXPUNGE) diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index b197d16abdb..92b6d9ff9b5 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libnfnetlink }: let - version = "1.5"; + version = "1.5.20160119"; name = "minissdpd-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { - sha256 = "03w9zg8i8bfjlr0haa08r823rfcff6lzm1ia875il7kkhnqkgmnz"; + sha256 = "0z0h2fqjlys9g08fbv0jg8l53h8cjlpdk45z4g71kwdk1m9ld8r2"; url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/mtr/edd425.patch b/pkgs/tools/networking/mtr/edd425.patch deleted file mode 100644 index b950cacd2e5..00000000000 --- a/pkgs/tools/networking/mtr/edd425.patch +++ /dev/null @@ -1,218 +0,0 @@ -diff --git a/asn.c b/asn.c -index eac8d5e..33622ca 100644 ---- a/asn.c -+++ b/asn.c -@@ -16,6 +16,8 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#include "config.h" -+ - #include - #include - #include -@@ -35,7 +37,6 @@ - #include - #include - --#include "config.h" - #include "mtr.h" - #include "asn.h" - -diff --git a/curses.c b/curses.c -index eacc40d..b96daee 100644 ---- a/curses.c -+++ b/curses.c -@@ -16,7 +16,8 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#include -+#include "config.h" -+ - #include - #include - -diff --git a/display.c b/display.c -index aa369ee..3545467 100644 ---- a/display.c -+++ b/display.c -@@ -16,7 +16,8 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#include -+#include "config.h" -+ - #include - #include - #include -diff --git a/dns.c b/dns.c -index e89fd4b..4076b71 100644 ---- a/dns.c -+++ b/dns.c -@@ -22,7 +22,8 @@ - Released under GPL, as above. - */ - --#include -+#include "config.h" -+ - #include - #include - #include -diff --git a/getopt.c b/getopt.c -index 3d43e26..e2f8758 100644 ---- a/getopt.c -+++ b/getopt.c -@@ -27,7 +27,7 @@ - #endif - - #ifdef HAVE_CONFIG_H --#include -+#include "config.h" - #endif - - #if !defined (__STDC__) || !__STDC__ -diff --git a/getopt1.c b/getopt1.c -index bccf8b2..0a2d405 100644 ---- a/getopt1.c -+++ b/getopt1.c -@@ -16,7 +16,7 @@ - Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ - - #ifdef HAVE_CONFIG_H --#include -+#include "config.h" - #endif - - #include "getopt.h" -diff --git a/gtk.c b/gtk.c -index 38ed507..7faa132 100644 ---- a/gtk.c -+++ b/gtk.c -@@ -17,7 +17,7 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#include -+#include "config.h" - - #include - #include -diff --git a/mtr.c b/mtr.c -index 50eb464..416b744 100644 ---- a/mtr.c -+++ b/mtr.c -@@ -16,19 +16,21 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#include "config.h" -+ - #include --#include --#include - #include - #include - #include --#include --#include - #include --#include --#include - #include - #include -+#include -+ -+#include -+#include -+#include -+#include - #include - #include - #include -diff --git a/net.c b/net.c -index 1c8d28f..d648804 100644 ---- a/net.c -+++ b/net.c -@@ -16,7 +16,7 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#include -+#include "config.h" - - #if defined(HAVE_SYS_XTI_H) - #include -@@ -1562,4 +1562,4 @@ void net_harvest_fds(void) - net_add_fds(&writefd, &maxfd); - select(maxfd, NULL, &writefd, NULL, &tv); - net_process_fds(&writefd); --} -\ No newline at end of file -+} -diff --git a/raw.c b/raw.c -index 8b0df47..0e1f4f4 100644 ---- a/raw.c -+++ b/raw.c -@@ -18,7 +18,8 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#include -+#include "config.h" -+ - #include - #include - #include -@@ -27,7 +28,6 @@ - #include - #include - -- - #include "mtr.h" - #include "raw.h" - #include "net.h" -diff --git a/report.c b/report.c -index 71040e4..39b2fb2 100644 ---- a/report.c -+++ b/report.c -@@ -16,7 +16,8 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#include -+#include "config.h" -+ - #include - #include - #include -diff --git a/select.c b/select.c -index 31bfd5f..7553675 100644 ---- a/select.c -+++ b/select.c -@@ -16,7 +16,8 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#include -+#include "config.h" -+ - #include - #include - #include -diff --git a/split.c b/split.c -index 642353e..5ead235 100644 ---- a/split.c -+++ b/split.c -@@ -20,7 +20,8 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#include -+#include "config.h" -+ - #include - #include - #include diff --git a/pkgs/tools/networking/ntp/no-openssl.patch b/pkgs/tools/networking/ntp/no-openssl.patch deleted file mode 100644 index 3a7784016ff..00000000000 --- a/pkgs/tools/networking/ntp/no-openssl.patch +++ /dev/null @@ -1,161 +0,0 @@ -Fix ntp-keygen build without OpenSSL - -http://bk1.ntp.org/ntp-stable/?PAGE=patch&REV=5497b345z5MNTuNvJWuqPSje25NQTg - -Index: ntp-4.2.8/Makefile.am -=================================================================== ---- ntp-4.2.8.orig/Makefile.am -+++ ntp-4.2.8/Makefile.am -@@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I sntp/m4 -I sntp/lib - - NULL = - -+# moved sntp first to get libtool and libevent built. -+ - SUBDIRS = \ -+ sntp \ - scripts \ - include \ - libntp \ -@@ -17,7 +20,6 @@ SUBDIRS = \ - clockstuff \ - kernel \ - util \ -- sntp \ - tests \ - $(NULL) - -@@ -64,7 +66,6 @@ BUILT_SOURCES = \ - .gcc-warning \ - libtool \ - html/.datecheck \ -- sntp/built-sources-only \ - $(srcdir)/COPYRIGHT \ - $(srcdir)/.checkChangeLog \ - $(NULL) -Index: ntp-4.2.8/configure.ac -=================================================================== ---- ntp-4.2.8.orig/configure.ac -+++ ntp-4.2.8/configure.ac -@@ -102,7 +102,7 @@ esac - enable_nls=no - LIBOPTS_CHECK_NOBUILD([sntp/libopts]) - --NTP_ENABLE_LOCAL_LIBEVENT -+NTP_LIBEVENT_CHECK_NOBUILD([2], [sntp/libevent]) - - NTP_LIBNTP - -@@ -771,6 +771,10 @@ esac - - #### - -+AC_CHECK_FUNCS([arc4random_buf]) -+ -+#### -+ - saved_LIBS="$LIBS" - LIBS="$LIBS $LDADD_LIBNTP" - AC_CHECK_FUNCS([daemon]) -Index: ntp-4.2.8/libntp/ntp_crypto_rnd.c -=================================================================== ---- ntp-4.2.8.orig/libntp/ntp_crypto_rnd.c -+++ ntp-4.2.8/libntp/ntp_crypto_rnd.c -@@ -24,6 +24,21 @@ - int crypto_rand_init = 0; - #endif - -+#ifndef HAVE_ARC4RANDOM_BUF -+static void -+arc4random_buf(void *buf, size_t nbytes); -+ -+void -+evutil_secure_rng_get_bytes(void *buf, size_t nbytes); -+ -+static void -+arc4random_buf(void *buf, size_t nbytes) -+{ -+ evutil_secure_rng_get_bytes(buf, nbytes); -+ return; -+} -+#endif -+ - /* - * As of late 2014, here's how we plan to provide cryptographic-quality - * random numbers: -Index: ntp-4.2.8/sntp/configure.ac -=================================================================== ---- ntp-4.2.8.orig/sntp/configure.ac -+++ ntp-4.2.8/sntp/configure.ac -@@ -97,11 +97,14 @@ esac - enable_nls=no - LIBOPTS_CHECK - --AM_COND_IF( -- [BUILD_SNTP], -- [NTP_LIBEVENT_CHECK], -- [NTP_LIBEVENT_CHECK_NOBUILD] --) -+# From when we only used libevent for sntp: -+#AM_COND_IF( -+# [BUILD_SNTP], -+# [NTP_LIBEVENT_CHECK], -+# [NTP_LIBEVENT_CHECK_NOBUILD] -+#) -+ -+NTP_LIBEVENT_CHECK([2]) - - # Checks for libraries. - -Index: ntp-4.2.8/sntp/m4/ntp_libevent.m4 -=================================================================== ---- ntp-4.2.8.orig/sntp/m4/ntp_libevent.m4 -+++ ntp-4.2.8/sntp/m4/ntp_libevent.m4 -@@ -1,4 +1,25 @@ --dnl NTP_ENABLE_LOCAL_LIBEVENT -*- Autoconf -*- -+# SYNOPSIS -*- Autoconf -*- -+# -+# NTP_ENABLE_LOCAL_LIBEVENT -+# NTP_LIBEVENT_CHECK([MINVERSION [, DIR]]) -+# NTP_LIBEVENT_CHECK_NOBUILD([MINVERSION [, DIR]]) -+# -+# DESCRIPTION -+# -+# AUTHOR -+# -+# Harlan Stenn -+# -+# LICENSE -+# -+# This file is Copyright (c) 2014 Network Time Foundation -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice, -+# author attribution and this notice are preserved. This file is offered -+# as-is, without any warranty. -+ -+dnl NTP_ENABLE_LOCAL_LIBEVENT - dnl - dnl Provide only the --enable-local-libevent command-line option. - dnl -@@ -29,7 +50,7 @@ dnl If NOBUILD is provided as the 3rd ar - dnl but DO NOT invoke DIR/configure if we are going to use our bundled - dnl version. This may be the case for nested packages. - dnl --dnl provide --enable-local-libevent . -+dnl provides --enable-local-libevent . - dnl - dnl Examples: - dnl -Index: ntp-4.2.8/util/Makefile.am -=================================================================== ---- ntp-4.2.8.orig/util/Makefile.am -+++ ntp-4.2.8/util/Makefile.am -@@ -19,6 +19,7 @@ AM_LDFLAGS = $(LDFLAGS_NTP) - LDADD= ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS) - tg2_LDADD= ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) - ntp_keygen_LDADD = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a -+ntp_keygen_LDADD += $(LDADD_LIBEVENT) - ntp_keygen_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LDADD_NTP) $(LIBM) - ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h - diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 680a8ef1bda..7b4486a8d86 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }: -let version = "1.18.2"; in +let version = "1.18.4"; in stdenv.mkDerivation { name = "dpkg-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "192pqjd0c7i91kiqzn3cq2sqp5vivf0079i0wybdc9yhfcm4yj0i"; + sha256 = "1nh6y6xvnq6f4qd6y3dx9m77sxjg4qk1z1j5pwayg348d0w292gy"; }; postPatch = '' diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 72524291441..ff062ab5094 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk3, nssTools, pcsclite , pkgconfig }: -let version = "4.1.12"; in +let version = "4.1.13"; in stdenv.mkDerivation { name = "eid-mw-${version}"; src = fetchFromGitHub { - sha256 = "12nnzh3idnl5bdjqmm8si5nj7yr42mkxhzq70s760bnfmvbqgbmc"; + sha256 = "1fkazhw6gs191w789fnp6mwnxrx9p38b3kh5bngb1ir0zhkgghkq"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index ccfd4ae044d..ca3e3aa1056 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv +{ stdenv, fetchurl, buildEnv, makeDesktopItem , xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib}: let @@ -16,13 +16,23 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "1ix05760l9j6bwbswd2fnk4b6nrrzxp3b8abvm4y4979pkkmasfw" else - "1q5mf91xxj1xs4ajj9i6mdhnzqycbdvprkzskx8pl6j9ll2hlsyh"; + "0igqh02bcdr0b4m6df46l1l1z38d4nh4pyfn6jqsvahacdl2qbsg" else + "1401j340348rqwd5c1m8hnxw7qkwpzqfa64q01cp08lz9cxxml4r"; + }; + + desktopItem = makeDesktopItem { + name = "torbrowser"; + exec = "tor-browser"; + icon = "torbrowser"; + desktopName = "Tor Browser"; + genericName = "Tor Browser"; + comment = meta.description; + categories = "Network;WebBrowser;Security;"; }; patchPhase = '' @@ -57,15 +67,20 @@ in stdenv.mkDerivation rec { $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@" EOF chmod +x $out/bin/tor-browser + + mkdir -p $out/share/applications + cp $desktopItem/share/applications"/"* $out/share/applications + + mkdir -p $out/share/pixmaps + cp Browser/browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png ''; buildInputs = [ stdenv ]; - meta = { + meta = with stdenv.lib; { description = "Tor Browser Bundle"; homepage = https://www.torproject.org/; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; - [ offline matejc doublec thoughtpolice ]; + platforms = platforms.linux; + maintainers = with maintainers; [ offline matejc doublec thoughtpolice ]; }; } diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix new file mode 100644 index 00000000000..9ff33b2fb69 --- /dev/null +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, buildPythonPackage, libreoffice, lpod, lxml, mistune, pillow +, pygments +}: + +buildPythonPackage rec { + + name = "odpdown-${version}"; + version = "0.4.1"; + + src = fetchurl { + url = "https://github.com/thorstenb/odpdown/archive/v${version}.tar.gz"; + sha256 = "005eecc73c65b9d4c09532547940718a7b308cd565f62a213dfa040827d4d565"; + }; + + propagatedBuildInputs = [ libreoffice lpod lxml mistune pillow pygments ]; + + meta = with stdenv.lib; { + homepage = https://github.com/thorstenb/odpdown; + repositories.git = https://github.com/thorstenb/odpdown.git; + description = "Create nice-looking slides from your favourite text editor"; + longDescription = '' + Have a tool like pandoc, latex beamer etc, that you can write (or + auto-generate) input for within your favourite hacker's editor, and + generate nice-looking slides from. Using your corporation's mandatory, + CI-compliant and lovely-artsy Impress template. Including + syntax-highlighted code snippets of your latest hack, auto-fitted into the + slides. + ''; + license = licenses.bsd3; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ vandenoever ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa53958d7aa..1b35d454d23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -525,6 +525,8 @@ let aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; + albert = qt5.callPackage ../applications/misc/albert {}; + analog = callPackage ../tools/admin/analog {}; apktool = callPackage ../development/tools/apktool { @@ -1140,6 +1142,8 @@ let ibus-table-others = callPackage ../tools/inputmethods/ibus-table-others { }; + brotli = callPackage ../tools/compression/brotli { }; + biosdevname = callPackage ../tools/networking/biosdevname { }; checkbashism = callPackage ../development/tools/misc/checkbashisms { }; @@ -1876,6 +1880,8 @@ let lua = lua5; }; + homesick = callPackage ../tools/misc/homesick { }; + honcho = callPackage ../tools/system/honcho { }; horst = callPackage ../tools/networking/horst { }; @@ -1964,6 +1970,8 @@ let ipmiutil = callPackage ../tools/system/ipmiutil {}; + ipmiview = callPackage ../applications/misc/ipmiview {}; + ipcalc = callPackage ../tools/networking/ipcalc {}; ipv6calc = callPackage ../tools/networking/ipv6calc {}; @@ -2518,6 +2526,10 @@ let obnam = callPackage ../tools/backup/obnam { }; + odpdown = callPackage ../tools/typesetting/odpdown { + inherit (pythonPackages) lpod lxml mistune pillow pygments; + }; + odt2txt = callPackage ../tools/text/odt2txt { }; offlineimap = callPackage ../tools/networking/offlineimap { @@ -3014,6 +3026,8 @@ let samplicator = callPackage ../tools/networking/samplicator { }; + scanbd = callPackage ../tools/graphics/scanbd { }; + screen = callPackage ../tools/misc/screen { inherit (darwin.apple_sdk.libs) utmp; }; @@ -3129,8 +3143,7 @@ let socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { }); - softether_4_18 = callPackage ../servers/softether/4.18.nix { }; - softether = softether_4_18; + solaar = callPackage ../applications/misc/solaar {}; sourceHighlight = callPackage ../tools/text/source-highlight { }; @@ -3885,7 +3898,7 @@ let eql = callPackage ../development/compilers/eql {}; - elmPackages = callPackage ../development/compilers/elm { }; + elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { }); adobe_flex_sdk = callPackage ../development/compilers/adobe-flex-sdk { }; @@ -4177,6 +4190,10 @@ let fsharp = callPackage ../development/compilers/fsharp {}; + fstar = callPackage ../development/compilers/fstar { + ocamlPackages = ocamlPackages_4_02; + }; + dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); go_1_4 = callPackage ../development/compilers/go/1.4.nix { @@ -5093,7 +5110,8 @@ let erlang_odbc_javac = erlangR18_odbc_javac; rebar = callPackage ../development/tools/build-managers/rebar { }; - rebar3 = callPackage ../development/tools/build-managers/rebar3 { }; + rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; }; + rebar3 = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = true; }; rebar3-nix-bootstrap = callPackage ../development/tools/erlang/rebar3-nix-bootstrap { }; fetchHex = callPackage ../development/tools/build-managers/rebar3/fetch-hex.nix { }; @@ -6094,6 +6112,8 @@ let yacc = bison; + ycmd = callPackage ../development/tools/misc/ycmd { }; + yodl = callPackage ../development/tools/misc/yodl { }; winpdb = callPackage ../development/tools/winpdb { }; @@ -7076,6 +7096,8 @@ let libcommuni = callPackage ../development/libraries/libcommuni { }; + libconfuse = callPackage ../development/libraries/libconfuse { }; + inherit (gnome3) libcroco; libcangjie = callPackage ../development/libraries/libcangjie { }; @@ -7680,6 +7702,8 @@ let libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; + libutempter = callPackage ../development/libraries/libutempter { }; + libunwind = if stdenv.isDarwin then darwin.libunwind else callPackage ../development/libraries/libunwind { }; @@ -8269,6 +8293,8 @@ let quesoglc = callPackage ../development/libraries/quesoglc { }; + quicksynergy = callPackage ../applications/misc/quicksynergy { }; + qwt = callPackage ../development/libraries/qwt {}; qxt = callPackage ../development/libraries/qxt {}; @@ -8675,6 +8701,8 @@ let webkit = webkitgtk; + wcslib = callPackage ../development/libraries/wcslib { }; + webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; @@ -9215,13 +9243,17 @@ let dnschain = callPackage ../servers/dnschain { }; - dovecot = dovecot21; + dovecot = dovecot22; dovecot21 = callPackage ../servers/mail/dovecot { }; dovecot22 = callPackage ../servers/mail/dovecot/2.2.x.nix { }; - dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { }; + dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { + dovecot = dovecot22; + }; + + dovecot_antispam = callPackage ../servers/mail/dovecot/plugins/antispam { }; dspam = callPackage ../servers/mail/dspam { inherit (perlPackages) NetSMTP; @@ -9459,6 +9491,9 @@ let oracleXE = callPackage ../servers/sql/oracle-xe { }; + softether_4_18 = callPackage ../servers/softether/4.18.nix { }; + softether = softether_4_18; + qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; }; @@ -10014,6 +10049,15 @@ let kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; + linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_rpi = callPackage ../os-specific/linux/kernel/linux-rpi.nix { kernelPatches = [ kernelPatches.bridge_stp_helper ]; }; @@ -10063,15 +10107,6 @@ let ]; }; - linux_4_2 = callPackage ../os-specific/linux/kernel/linux-4.2.nix { - kernelPatches = [ kernelPatches.bridge_stp_helper ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_3 = callPackage ../os-specific/linux/kernel/linux-4.3.nix { kernelPatches = [ kernelPatches.bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -10099,6 +10134,23 @@ let ]; }; + linux_chromiumos_3_14 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.14.nix { + kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_14 + kernelPatches.chromiumos_mfd_fix_dependency + kernelPatches.chromiumos_no_link_restrictions + kernelPatches.genksyms_fix_segfault + ]; + }; + + linux_chromiumos_3_18 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.18.nix { + kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18 + kernelPatches.chromiumos_no_link_restrictions + kernelPatches.genksyms_fix_segfault + ]; + }; + + linux_chromiumos_latest = linux_chromiumos_3_18; + /* grsec configuration We build several flavors of 'default' grsec kernels. These are @@ -10132,10 +10184,10 @@ let linux_grsec_stable_server_xen = throw "No longer supporteddue to https://grsecurity.net/announce.php. " + "Please use linux_grsec_testing_server_xen."; - # Testing kernels - linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop; - linux_grsec_testing_server = grKernel grFlavors.linux_grsec_testing_server; - linux_grsec_testing_server_xen = grKernel grFlavors.linux_grsec_testing_server_xen; + # Testing kernels: outdated ATM + #linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop; + #linux_grsec_testing_server = grKernel grFlavors.linux_grsec_testing_server; + #linux_grsec_testing_server_xen = grKernel grFlavors.linux_grsec_testing_server_xen; /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -10254,6 +10306,7 @@ let linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. + linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp linuxPackages_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi linuxPackages_rpi; linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; @@ -10261,7 +10314,6 @@ let linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); - linuxPackages_4_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_2 linuxPackages_4_2); linuxPackages_4_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_3 linuxPackages_4_3); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4 linuxPackages_4_4); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); @@ -10280,11 +10332,16 @@ let linuxPackages_grsec_stable_server = grPackage grFlavors.linux_grsec_stable_server; linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen; - # Testing kernels + # Testing kernels: outdated ATM linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop; linuxPackages_grsec_testing_server = grPackage grFlavors.linux_grsec_testing_server; linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen; + # ChromiumOS kernels + linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14); + linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18 linuxPackages_chromiumos_3_18); + linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest linuxPackages_chromiumos_latest); + # A function to build a manually-configured kernel linuxManualConfig = pkgs.buildLinux; buildLinux = callPackage ../os-specific/linux/kernel/manual-config.nix {}; @@ -10357,6 +10414,8 @@ let mkinitcpio-nfs-utils = callPackage ../os-specific/linux/mkinitcpio-nfs-utils { }; + mmc-utils = callPackage ../os-specific/linux/mmc-utils { }; + module_init_tools = callPackage ../os-specific/linux/module-init-tools { }; aggregateModules = modules: @@ -10364,7 +10423,7 @@ let inherit modules; }; - multipath_tools = callPackage ../os-specific/linux/multipath-tools { }; + multipath-tools = callPackage ../os-specific/linux/multipath-tools { }; musl = callPackage ../os-specific/linux/musl { }; @@ -10422,6 +10481,8 @@ let paxctl = callPackage ../os-specific/linux/paxctl { }; + paxtest = callPackage ../os-specific/linux/paxtest { }; + pax-utils = callPackage ../os-specific/linux/pax-utils { }; pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { @@ -10475,6 +10536,8 @@ let rtkit = callPackage ../os-specific/linux/rtkit { }; + rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { }; + s3ql = callPackage ../tools/backup/s3ql { }; sassc = callPackage ../development/tools/sassc { }; @@ -11861,11 +11924,18 @@ let firefox = wrapFirefox firefox-unwrapped { }; firefox-esr = wrapFirefox firefox-esr-unwrapped { }; - firefox-bin = callPackage ../applications/networking/browsers/firefox-bin { + firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { gconf = pkgs.gnome.GConf; inherit (pkgs.gnome) libgnome libgnomeui; }; + firefox-bin = wrapFirefox firefox-bin-unwrapped { + browserName = "firefox"; + name = "firefox-bin-" + + (builtins.parseDrvName firefox-bin-unwrapped.name).version; + desktopName = "Firefox"; + }; + firestr = qt5.callPackage ../applications/networking/p2p/firestr { boost = boost155; }; @@ -11911,8 +11981,6 @@ let boost = boost155; }; - fuze = callPackage ../applications/networking/instant-messengers/fuze {}; - game-music-emu = callPackage ../applications/audio/game-music-emu { }; gcolor2 = callPackage ../applications/graphics/gcolor2 { }; @@ -12088,6 +12156,11 @@ let inherit (gnome2) gtk; }; + guake = callPackage ../applications/misc/guake { + gconf = gnome.GConf; + vte = gnome.vte.override { pythonSupport = true; }; + }; + guitone = callPackage ../applications/version-management/guitone { graphviz = graphviz_2_32; }; @@ -13023,6 +13096,8 @@ let RhythmDelay = callPackage ../applications/audio/RhythmDelay { }; + ricochet = qt5.callPackage ../applications/networking/instant-messengers/ricochet { }; + rkt = callPackage ../applications/virtualization/rkt { }; rofi = callPackage ../applications/misc/rofi { }; @@ -13073,7 +13148,7 @@ let boost = boost155; }; - scim = callPackage ../applications/misc/scim { }; + sc-im = callPackage ../applications/misc/scim { }; scite = callPackage ../applications/editors/scite { }; @@ -13342,9 +13417,8 @@ let }; termite = callPackage ../applications/misc/termite { - gtk = gtk3; vte = gnome3.vte-select-text; - }; + }; tesseract = callPackage ../applications/graphics/tesseract { }; @@ -13848,6 +13922,8 @@ let GConf2 = gnome2.GConf; }; + xmpp-client = go15Packages.xmpp-client.bin // { outputs = [ "bin" ]; }; + libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; }; @@ -14076,6 +14152,8 @@ let exult = callPackage ../games/exult { }; + factorio = callPackage ../games/factorio {}; + fairymax = callPackage ../games/fairymax {}; fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; @@ -14231,6 +14309,8 @@ let pingus = callPackage ../games/pingus {}; + pioneer = callPackage ../games/pioneer { }; + pioneers = callPackage ../games/pioneers { }; planetary_annihilation = callPackage ../games/planetaryannihilation { }; @@ -14754,6 +14834,9 @@ let k9copy = callPackage ../applications/video/k9copy {}; + konversation = callPackage ../applications/networking/irc/konversation/1.6.nix { + }; + quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix { monolithic = true; daemon = false; @@ -15643,6 +15726,10 @@ let texLiveModerntimeline = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/moderntimeline.nix) {}; + ib-tws = callPackage ../applications/office/ib/tws { jdk=oraclejdk8; }; + + ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; + thermald = callPackage ../tools/system/thermald { }; thinkfan = callPackage ../tools/system/thinkfan { }; @@ -15716,6 +15803,8 @@ let xboxdrv = callPackage ../misc/drivers/xboxdrv { }; + xcftools = callPackage ../tools/graphics/xcftools { }; + xhyve = callPackage ../applications/virtualization/xhyve { }; xinput_calibrator = callPackage ../tools/X11/xinput_calibrator {}; @@ -15840,6 +15929,7 @@ aliases = with self; rec { lttngUst = lttng-ust; # added 2014-07-31 midoriWrapper = midori; # added 2015-01 mlt-qt5 = qt5.mlt; # added 2015-12-19 + multipath_tools = multipath-tools; # added 2016-01-21 nfsUtils = nfs-utils; # added 2014-12-06 phonon_qt5 = qt5.phonon; # added 2015-12-19 phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer; # added 2015-12-19 @@ -15879,6 +15969,7 @@ aliases = with self; rec { btrfsProgs = btrfs-progs; # added 2016-01-03 aircrackng = aircrack-ng; # added 2016-01-14 quake3game = ioquake3; # added 2016-01-14 + scim = sc-im; # added 2016-01-22 }; tweakAlias = _n: alias: with lib; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index b66a37c6935..a1c54074622 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -67,6 +67,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net45/*" ]; }; + FsLexYacc = fetchNuGet { + baseName = "FsLexYacc"; + version = "6.1.0"; + sha256 = "1v5myn62zqs431i046gscqw2v0c969fc7pdplx7z9cnpy0p2s4rv"; + outputFiles = [ "build/*" ]; + }; + FsPickler = fetchNuGet { baseName = "FsPickler"; version = "1.2.9"; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 57ec5821e5e..0bd7b0efad3 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -24,6 +24,9 @@ ## FOR CONTRIBUTORS # # When adding a new package here please note that +# * please use `elpaBuild` for pre-built package.el packages and +# `melpaBuild` or `trivialBuild` if the package must actually +# be built from the source. # * lib.licenses are `with`ed on top of the file here # * both trivialBuild and melpaBuild will automatically derive a # `meta` with `platforms` and `homepage` set to something you are @@ -235,23 +238,6 @@ let }; }; - auctex = melpaBuild rec { - pname = "auctex"; - version = "11.87.7"; - src = fetchurl { - url = "http://elpa.gnu.org/packages/${pname}-${version}.tar"; - sha256 = "07bhw8zc3d1f2basjy80njmxpsp4f70kg3ynkch9ghlai3mm2b7n"; - }; - buildPhase = '' - cp $src ${pname}-${version}.tar - ''; - meta = { - description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; - homepage = https://www.gnu.org/software/auctex/; - license = gpl3Plus; - }; - }; - autotetris = melpaBuild { pname = "autotetris-mode"; version = "20141114.846"; @@ -429,12 +415,12 @@ let diminish = melpaBuild rec { pname = "diminish"; - version = "0.44"; + version = "0.45"; src = fetchFromGitHub { - owner = "emacsmirror"; - repo = pname; - rev = version; - sha256 = "0hshw7z5f8pqxvgxw74kbj6nvprsgfvy45fl854xarnkvqcara09"; + owner = "myrjola"; + repo = "${pname}.el"; + rev = "v${version}"; + sha256 = "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6"; }; meta = { description = "Diminishes the amount of space taken on the mode-line by Emacs minor modes"; @@ -1172,23 +1158,6 @@ let }; }; - let-alist = melpaBuild rec { - pname = "let-alist"; - version = "1.0.4"; - src = fetchurl { - url = "http://elpa.gnu.org/packages/${pname}-${version}.el"; - sha256 = "07312bvvyz86lf64vdkxg2l1wgfjl25ljdjwlf1bdzj01c4hm88x"; - }; - unpackPhase = "true"; - buildPhase = '' - cp $src ${pname}-${version}.el - ''; - meta = { - description = "Easily let-bind values of an assoc-list by their names"; - license = gpl3Plus; - }; - }; - log4e = melpaBuild rec { pname = "log4e"; version = "0.3.0"; @@ -1381,16 +1350,13 @@ let }; }; - org-plus-contrib = melpaBuild rec { + org-plus-contrib = elpaBuild rec { pname = "org-plus-contrib"; version = "20150406"; src = fetchurl { url = "http://orgmode.org/elpa/${pname}-${version}.tar"; sha256 = "1ny2myg4rm75ab2gl5rqrwy7h53q0vv18df8gk3zv13kljj76c6i"; }; - buildPhase = '' - cp $src ${pname}-${version}.tar - ''; meta = { description = "Notes, TODO lists, projects, and authoring in plain-text with Emacs"; license = gpl3Plus; @@ -1926,7 +1892,7 @@ in lib.makeScope newScope (self: {} // melpaPackages self - // melpaStablePackages self // elpaPackages self + // melpaStablePackages self // packagesFun self ) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 3efbc526b62..a519233e3af 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -304,6 +304,17 @@ let ]; }; + bleve = buildFromGitHub { + rev = "fc34a97875840b2ae24517e7d746b69bdae9be90"; + date = "2016-01-19"; + owner = "blevesearch"; + repo = "bleve"; + sha256 = "0ny7nvilrxmmzcdvpivwyrjkynnhc22c5gdrxzs421jly35jw8jx"; + buildFlags = [ "-tags all" ]; + propagatedBuildInputs = [ protobuf goleveldb kagome gtreap bolt text + rcrowley.go-metrics bitset segment go-porterstemmer ]; + }; + binarydist = buildFromGitHub { rev = "9955b0ab8708602d411341e55fffd7e0700f86bd"; owner = "kr"; @@ -311,6 +322,14 @@ let sha256 = "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3"; }; + bitset = buildFromGitHub { + rev = "bb0da3785c4fe9d26f6029c77c8fce2aa4d0b291"; + date = "2016-01-13"; + owner = "willf"; + repo = "bitset"; + sha256 = "1d4z2hjjs9jk6aysi4mf50p8lbbzag4ir4y1f0z4sz8gkwagh7b7"; + }; + blackfriday = buildFromGitHub { rev = "d18b67ae0afd61dae240896eae1785f00709aa31"; owner = "russross"; @@ -1180,6 +1199,22 @@ let buildInputs = [ iochan ]; }; + gozim = buildFromGitHub { + rev = "ea9b7c39cb1d13bd8bf19ba4dc4e2a16bab52f14"; + date = "2016-01-15"; + owner = "akhenakh"; + repo = "gozim"; + sha256 = "1n50fdd56r3s1sgjbpa72nvdh50gfpf6fq55c077w2p3bxn6p8k6"; + propagatedBuildInputs = [ bleve go-liblzma groupcache go-rice goquery ]; + buildInputs = [ pkgs.zip ]; + postInstall = '' + pushd $NIX_BUILD_TOP/go/src/$goPackagePath/cmd/gozimhttpd + ${go-rice.bin}/bin/rice append --exec $bin/bin/gozimhttpd + popd + ''; + dontStrip = true; + }; + go-assert = buildGoPackage rec { rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3"; name = "assert-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1385,6 +1420,14 @@ let sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; }; + go-incremental = buildFromGitHub { + rev = "92fd0ce4a694213e8b3dfd2d39b16e51d26d0fbf"; + date = "2015-02-20"; + owner = "GeertJohan"; + repo = "go.incremental"; + sha256 = "160cspmq73bk6cvisa6kq1dwrrp1yqpkrpq8dl69wcnaf91cbnml"; + }; + go-isatty = buildFromGitHub { rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449"; owner = "mattn"; @@ -1392,6 +1435,15 @@ let sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"; }; + go-liblzma = buildFromGitHub { + rev = "e74be71c3c60411922b5424e875d7692ea638b78"; + date = "2016-01-01"; + owner = "remyoudompheng"; + repo = "go-liblzma"; + sha256 = "12lwjmdcv2l98097rhvjvd2yz8jl741hxcg29i1c18grwmwxa7nf"; + propagatedBuildInputs = [ pkgs.lzma ]; + }; + go-log = buildGoPackage rec { rev = "70d039bee4b0e389e5be560491d8291708506f59"; name = "go-log-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1489,6 +1541,14 @@ let sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"; }; + go-porterstemmer = buildFromGitHub { + rev = "23a2c8e5cf1f380f27722c6d2ae8896431dc7d0e"; + date = "2014-12-30"; + owner = "blevesearch"; + repo = "go-porterstemmer"; + sha256 = "0rcfbrad79xd114h3dhy5d3zs3b5bcgqwm3h5ih1lk69zr9wi91d"; + }; + go-querystring = buildFromGitHub { rev = "547ef5ac979778feb2f760cdb5f4eae1a2207b86"; owner = "google"; @@ -1543,6 +1603,16 @@ let buildInputs = [ tools ]; }; + go-rice = buildFromGitHub { + rev = "4f3c5af2322e393f305d9674845bc36cd1dea589"; + date = "2016-01-04"; + owner = "GeertJohan"; + repo = "go.rice"; + sha256 = "01q2d5iwibwdl68gn8sg6dm7byc42hax3zmiqgmdw63ir1fsv4ag"; + propagatedBuildInputs = [ osext go-spew go-flags go-zipexe rsrc + go-incremental ]; + }; + go-runit = buildFromGitHub { rev = "a9148323a615e2e1c93b7a9893914a360b4945c8"; owner = "soundcloud"; @@ -1566,6 +1636,14 @@ let sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; }; + go-spew = buildFromGitHub { + rev = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d"; + date = "2015-11-05"; + owner = "davecgh"; + repo = "go-spew"; + sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"; + }; + go-sqlite3 = buildFromGitHub { rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; date = "2015-07-29"; @@ -1629,6 +1707,14 @@ let sha256 = "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32"; }; + go-zipexe = buildFromGitHub { + rev = "a5fe2436ffcb3236e175e5149162b41cd28bd27d"; + date = "2015-03-29"; + owner = "daaku"; + repo = "go.zipexe"; + sha256 = "0vi5pskhifb6zw78w2j97qbhs09zmrlk4b48mybgk5b3sswp6510"; + }; + go-zookeeper = buildFromGitHub { rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4"; date = "2015-06-02"; @@ -1682,6 +1768,15 @@ let excludedPackages = "\\(test\\|benchmark\\)"; }; + gtreap = buildFromGitHub { + rev = "0abe01ef9be25c4aedc174758ec2d917314d6d70"; + date = "2015-08-07"; + owner = "steveyen"; + repo = "gtreap"; + sha256 = "03z5j8myrpmd0jk834l318xnyfm0n4rg15yq0d35y7j1aqx26gvk"; + goPackagePath = "github.com/steveyen/gtreap"; + }; + gucumber = buildGoPackage rec { rev = "e8116c9c66e641e9f81fc0a79fac923dfc646378"; name = "gucumber-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1850,6 +1945,21 @@ let sha256 = "0m8867afsvka5gp2idrmlarpjg7kxx7qacpwrz1wl8y3zxyn3945"; }; + kagome = buildFromGitHub { + rev = "1bbdbdd590e13a8c2f4508c67a079113cd7b9f51"; + date = "2016-01-19"; + owner = "ikawaha"; + repo = "kagome"; + sha256 = "1isnjdkn9hnrkp5g37p2k5bbsrx0ma32v3icwlmwwyc5mppa4blb"; + + # I disable the parallel building, because otherwise each + # spawned compile takes over 1.5GB of RAM. + buildFlags = "-p 1"; + enableParallelBuilding = false; + + goPackagePath = "github.com/ikawaha/kagome"; + }; + ldap = buildGoPackage rec { rev = "83e65426fd1c06626e88aa8a085e5bfed0208e29"; name = "ldap-${stdenv.lib.strings.substring 0 7 rev}"; @@ -2954,6 +3064,16 @@ let ]; }; + restic = buildFromGitHub { + rev = "4d7e802c44369b40177cd52938bc5b0930bd2be1"; + date = "2016-01-17"; + owner = "restic"; + repo = "restic"; + sha256 = "0lf40539dy2xa5l1xy1kyn1vk3w0fmapa1h65ciksrdhn89ilrxv"; + # Using its delivered dependencies. Easier. + preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/$goPackagePath/Godeps/_workspace"; + }; + rgbterm = buildFromGitHub { rev = "c07e2f009ed2311e9c35bca12ec00b38ccd48283"; owner = "aybabtme"; @@ -2968,6 +3088,14 @@ let sha256 = "010jsclnmkaywdlyfqdmq372q7kh3qbz2zra0c4wn91qnkmkrnw1"; }; + rsrc = buildFromGitHub { + rev = "ba14da1f827188454a4591717fff29999010887f"; + date = "2015-11-03"; + owner = "akavel"; + repo = "rsrc"; + sha256 = "0g9fj10xnxcv034c8hpcgbhswv6as0d8l176c5nfgh1lh6klmmzc"; + }; + sandblast = buildGoPackage rec { rev = "694d24817b9b7b8bacb6d458b7989b30d7fe3555"; name = "sandblast-${stdenv.lib.strings.substring 0 7 rev}"; @@ -3015,6 +3143,14 @@ let sha256 = "1f0rwgqlffv1a7b05736a4gf4l9dn80wsfyqcnz6qd2skhwnzv29"; }; + segment = buildFromGitHub { + rev = "db70c57796cc8c310613541dfade3dce627d09c7"; + date = "2016-01-05"; + owner = "blevesearch"; + repo = "segment"; + sha256 = "09xfdlcc6bsrr5grxp6fgnw9p4cf6jc0wwa9049fd1l0zmhj2m1g"; + }; + semver = buildFromGitHub { rev = "31b736133b98f26d5e078ec9eb591666edfd091f"; date = "2015-07-20"; @@ -3361,6 +3497,23 @@ let sha256 = "0gljdfxqc94yb1kpqqrm5p94ph9dsxrzcixhdj6m92cwwa7z7p99"; }; + xmpp-client = buildFromGitHub { + rev = "525bd26cf5f56ec5aee99464714fd1d019c119ff"; + date = "2016-01-10"; + owner = "agl"; + repo = "xmpp-client"; + sha256 = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253"; + disabled = isGo14; + buildInputs = [ crypto net ]; + + meta = with stdenv.lib; { + description = "An XMPP client with OTR support"; + homepage = https://github.com/agl/xmpp-client; + license = licenses.bsd3; + maintainers = with maintainers; [ codsl ]; + }; + }; + yaml-v1 = buildGoPackage rec { name = "yaml-v1-${version}"; version = "git-2015-05-01"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 130a4e7006e..e6986a5b549 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -330,6 +330,9 @@ rec { lts-4_1 = packages.ghc7103.override { packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-4.1.nix { }; }; + lts-4_2 = packages.ghc7103.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-4.2.nix { }; + }; }; } diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index c14f94d95fd..ebf19af943f 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -2,7 +2,11 @@ also builds the documentation and tests whether the Nix expressions evaluate correctly. */ -{ pkgs, nixpkgs, officialRelease }: +{ nixpkgs +, officialRelease +, pkgs ? import nixpkgs.outPath {} +, nix ? pkgs.nix +}: with pkgs; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88b0eda1a07..b373c72b3a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1110,6 +1110,7 @@ in modules // { rsa pyasn1 pkgs.groff + pkgs.less ]; postInstall = '' @@ -2684,6 +2685,21 @@ in modules // { }; }; + cerberus = buildPythonPackage rec { + name = "Cerberus-${version}"; + version = "0.9.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/C/Cerberus/${name}.tar.gz"; + sha256 = "1km7hvns1snrmcwz58bssi4wv3gwd34zm1z1hwjylmpqrfrcf8mi"; + }; + + meta = { + homepage = http://python-cerberus.org/; + description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; + license = licenses.mit; + }; + }; certifi = buildPythonPackage rec { name = "certifi-${version}"; @@ -4824,6 +4840,39 @@ in modules // { }; }; + eve = buildPythonPackage rec { + version = "0.6.1"; + name = "Eve-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/E/Eve/${name}.tar.gz"; + sha256 = "0wf1x8qixkld6liz5syqi8i9nrfrhq4lpmh0p9cy3jbkhk34km69"; + }; + + propagatedBuildInputs = with self; [ + cerberus + events + flask-pymongo + flask + itsdangerous + jinja2 + markupsafe + pymongo_2_9_1 + simplejson + werkzeug + + ]; + + # tests call a running mongodb instance + doCheck = false; + + meta = { + homepage = "http://python-eve.org/"; + description = "open source Python REST API framework designed for human beings"; + license = licenses.bsd3; + }; + }; + eventlib = buildPythonPackage rec { name = "python-eventlib-${version}"; @@ -4844,6 +4893,22 @@ in modules // { }; }; + events = buildPythonPackage rec { + name = "Events-${version}"; + version = "0.2.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/E/Events/${name}.tar.gz"; + sha256 = "0rymyfvarjdi2fdhfz2iqmp4wgd2n2sm0p2mx44c3spm7ylnqzqa"; + }; + + meta = { + homepage = "http://events.readthedocs.org"; + description = "Bringing the elegance of C# EventHanlder to Python"; + license = licenses.bsd3; + }; + }; + eyeD3 = buildPythonPackage rec { version = "0.7.8"; @@ -4988,6 +5053,21 @@ in modules // { propagatedBuildInputs = with self; [ rpkg offtrac urlgrabber fedora_cert ]; }); + frozendict = buildPythonPackage rec { + name = "frozendict-0.5"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/f/frozendict/${name}.tar.gz"; + sha256 = "0m4kg6hbadvf99if78nx01q7qnbyhdw3x4znl5dasgciyi54432n"; + }; + + meta = { + homepage = https://github.com/slezica/python-frozendict; + description = "An immutable dictionary"; + license = stdenv.lib.licenses.mit; + }; + }; + fudge = buildPythonPackage rec { name = "fudge-0.9.6"; src = pkgs.fetchurl { @@ -5853,7 +5933,7 @@ in modules // { }; lpod = buildPythonPackage rec { - version = "1.1.5"; + version = "1.1.7"; name = "python-lpod-${version}"; # lpod library currently does not support Python 3.x disabled = isPy3k; @@ -5863,8 +5943,8 @@ in modules // { src = pkgs.fetchFromGitHub { owner = "lpod"; repo = "lpod-python"; - rev = "v${version}"; - sha256 = "1g909li511jkpcl26j1dzg8gn1ipkc374sh8vv54dx30sl0xfqxf"; + rev = "dee32120ee582ff337b0c52a95a9a87cca71fd67"; + sha256 = "1mikvzp27wxkzpr2lii4wg1hhx8h610agckqynvsrdc8v3nw9ciw"; }; meta = { @@ -8266,6 +8346,24 @@ in modules // { }; }; + flask-pymongo = buildPythonPackage rec { + name = "Flask-PyMongo-${version}"; + version = "0.3.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/F/Flask-PyMongo/${name}.tar.gz"; + sha256 = "0305qngvjrjyyabf8gxqgqvd9ffh00gr5yfrjf4nncr2my9svbyd"; + }; + + propagatedBuildInputs = with self; [ flask pymongo_2_9_1 ]; + + meta = { + homepage = "http://flask-pymongo.readthedocs.org/"; + description = "PyMongo support for Flask applications"; + license = licenses.bsd2; + }; + }; + wtforms = buildPythonPackage rec { version = "2.0.2"; name = "wtforms-${version}"; @@ -13773,6 +13871,25 @@ in modules // { propagatedBuildInputs = [self.numpy]; }; + paho-mqtt = buildPythonPackage rec { + name = "paho-mqtt-${version}"; + version = "1.1"; + + disabled = isPyPy || isPy26; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/paho-mqtt/${name}.tar.gz"; + sha256 = "07i6k9mw66kgbvjgsrcsd2sjji9ckym50dcxnmhjqfkfzsg64yhg"; + }; + + meta = { + homepage = "https://eclipse.org/paho/"; + description = "mqtt library for machine to machine and internet of things"; + license = licenses.epl10; + maintainers = with maintainers; [ mog ]; + }; + }; + parsedatetime = buildPythonPackage rec { name = "parsedatetime-${version}"; version = "1.4"; @@ -14001,6 +14118,8 @@ in modules // { sha256 = "1k572anw39rws67mvxl2w6y93y8w8q5smnwc0dd2gnnr16cc2vsh"; }; + patches = [ ../development/python-modules/pelican-fix-tests-with-pygments-2.1.patch ]; + buildInputs = with self; [ pkgs.glibcLocales pkgs.pandoc @@ -15521,12 +15640,12 @@ in modules // { }; pygments = buildPythonPackage rec { - version = "2.0.2"; + version = "2.1"; name = "Pygments-${version}"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz"; - sha256 = "0lagrwifsgn0s8bzqahpr87p7gd38xja8f06akscinp6hj89283k"; + sha256 = "0yx4p3w9lw1kw24zr87xnaqxm007mdxgwa5wjpwnrcfpmxgyz80k"; }; propagatedBuildInputs = with self; [ docutils ]; @@ -16428,6 +16547,25 @@ in modules // { }; }; + pymongo_2_9_1 = buildPythonPackage rec { + name = "pymongo-2.9.1"; + version = "2.9.1"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/p/pymongo/${name}.tar.gz"; + sha256 = "1nrr1fxyrlxd69bgxl7bvaj2j4z7v3zaciij5sbhxg0vqiz6ny50"; + }; + + # Tests call a running mongodb instance + doCheck = false; + + meta = { + homepage = "http://github.com/mongodb/mongo-python-driver"; + license = licenses.asl20; + description = "Python driver for MongoDB "; + }; + }; + pyperclip = buildPythonPackage rec { version = "1.5.11"; name = "pyperclip-${version}"; @@ -18281,17 +18419,21 @@ in modules // { }; sopel = buildPythonPackage rec { - name = "sopel-6.1.1"; + name = "sopel-6.2.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sopel/${name}.tar.gz"; - sha256 = "0nr2a88bkxg2593dd947qkh96g8j32q7pl7x9zvx4158h4bgx99y"; + sha256 = "06m5clmg9x0bsnhvl5d75mskwqnxvkdd00p0dqnpwip9vmq6n8cz"; }; + buildInputs = with self; [ pytest ]; propagatedBuildInputs = with self; [ praw xmltodict pytz pyenchant pygeoip ]; disabled = isPyPy || isPy26 || isPy27; + checkPhase = '' + ${python.interpreter} test/*.py + ''; meta = { description = "Simple and extensible IRC bot"; homepage = "http://sopel.chat"; @@ -18768,14 +18910,14 @@ in modules // { sphinx = buildPythonPackage (rec { - name = "Sphinx-1.3.1"; + name = "Sphinx-1.3.4"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz"; - sha256 = "052i5c7cgvs5iv011dkq3r8d6jycg2gjjg3907ijsbdlq8q52vhs"; + sha256 = "0mw06q7bzzjylgwh0wnnaxmwc95hx8w95as4vcgpan579brw7b4a"; }; - patches = [ ../development/python-modules/sphinx-1.3.1-pr-1946.patch ]; + patches = [ ../development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch ]; LC_ALL = "en_US.UTF-8"; checkPhase = '' PYTHON=${python.executable} make test @@ -18803,6 +18945,8 @@ in modules // { }; patches = []; disabled = isPy35; + # Tests requires Pygments >=2.0.2 which isn't worth keeping around for this: + doCheck = false; }; sphinx_rtd_theme = buildPythonPackage (rec { @@ -19897,18 +20041,30 @@ in modules // { turses = buildPythonPackage (rec { - name = "turses-0.2.23"; + name = "turses-0.3.1"; + disabled = isPyPy || isPy3k; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz"; - md5 = "71b9e3ab12d9186798e739b5273d1438"; + sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6"; }; - propagatedBuildInputs = with self; [ oauth2 urwid tweepy ] ++ optional isPy26 argparse; + buildInputs = with self; [ mock pytest coverage tox ]; + propagatedBuildInputs = with self; [ urwid tweepy future ] ++ optional isPy26 argparse; - #buildInputs = [ tox ]; - # needs tox - doCheck = false; + checkPhase = '' + TMP_TURSES=`echo turses-$RANDOM` + mkdir $TMP_TURSES + HOME=$TMP_TURSES py.test tests/ + rm -rf $TMP_TURSES + ''; + + patchPhase = '' + sed -i -e "s|future==0.14.3|future==${pkgs.lib.getVersion self.future}|" setup.py + sed -i -e "s|tweepy==3.3.0|tweepy==${pkgs.lib.getVersion self.tweepy}|" setup.py + sed -i -e "s|config.generate_config_file.assert_called_once()|assert config.generate_config_file.call_count == 1|" tests/test_config.py + sed -i -e "s|self.observer.update.assert_called_once()|assert self.observer.update.call_count == 1|" tests/test_meta.py + ''; meta = { homepage = https://github.com/alejandrogomez/turses; @@ -19920,14 +20076,15 @@ in modules // { }); tweepy = buildPythonPackage (rec { - name = "tweepy-2.3.0"; - disabled = isPy3k; + name = "tweepy-3.5.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz"; - md5 = "065c80d244360988c61d64b5dfb7e229"; + sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h"; }; + propagatedBuildInputs = with self; [ requests2 six requests_oauthlib ]; + meta = { homepage = "https://github.com/tweepy/tweepy"; description = "Twitter library for python"; @@ -22916,16 +23073,6 @@ in modules // { }; }; - frozendict = buildPythonPackage rec { - name = "frozendict-${version}"; - version = "0.5"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/f/frozendict/frozendict-0.5.tar.gz"; - sha256 = "0m4kg6hbadvf99if78nx01q7qnbyhdw3x4znl5dasgciyi54432n"; - }; - }; - pydenticon = buildPythonPackage rec { name = "pydenticon-${version}"; version = "0.2"; @@ -23368,6 +23515,23 @@ in modules // { }; }; + setproctitle = buildPythonPackage rec { + name = "python-setproctitle-${version}"; + version = "1.1.9"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/setproctitle/setproctitle-${version}.tar.gz"; + sha256 = "1mqadassxcm0m9r1l02m5vr4bbandn48xz8gifvxmb4wiz8i8d0w"; + }; + + meta = { + description = "Allows a process to change its title (as displayed by system tools such as ps and top)"; + homepage = https://github.com/dvarrazzo/py-setproctitle; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ exi ]; + }; + }; + thrift = buildPythonPackage rec { name = "thrift-${version}"; version = "0.9.2"; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 2be6201ab06..f9aa4dbc076 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -40,11 +40,15 @@ let jobs.stdenv.x86_64-darwin jobs.linux.x86_64-linux jobs.linux.i686-linux + jobs.python.x86_64-linux + jobs.python.i686-linux + jobs.python.x86_64-darwin + jobs.python3.x86_64-linux + jobs.python3.i686-linux + jobs.python3.x86_64-darwin # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux jobs.thunderbird.i686-linux - jobs.glib-tested.x86_64-linux # standard glib doesn't do checks - jobs.glib-tested.i686-linux # Ensure that basic stuff works on darwin jobs.git.x86_64-darwin jobs.mysql.x86_64-darwin