diff --git a/doc/functions.xml b/doc/functions.xml index 3e4ac3f3c6b..7fd30cabf16 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -248,7 +248,7 @@ c = lib.makeOverridable f { a = 1; b = 2; } targetPkgs = pkgs: (with pkgs; [ udev alsaLib - ]) ++ (with pkgs.xlibs; + ]) ++ (with pkgs.xorg; [ libX11 libXcursor libXrandr diff --git a/doc/meta.xml b/doc/meta.xml index b36f3915ec1..98031612523 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -61,7 +61,7 @@ $ nix-env -qa hello --meta --json "i686-openbsd", "x86_64-openbsd" ], - "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/ex-2/default.nix:14" + "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/default.nix:14" }, "name": "hello-2.9", "system": "x86_64-linux" diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 8d51f4c30e6..5ed959abace 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -56,7 +56,7 @@ $ git add pkgs/development/libraries/libfoo/default.nix GNU Hello: pkgs/applications/misc/hello/ex-2/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/default.nix">pkgs/applications/misc/hello/default.nix. Trivial package, which specifies some meta attributes which is good practice. diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 78de8ca2c44..121fca95164 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -19,6 +19,7 @@ akc = "Anders Claesson "; algorith = "Dries Van Daele "; all = "Nix Committers "; + ambrop72 = "Ambroz Bizjak "; amiddelk = "Arie Middelkoop "; amorsillo = "Andrew Morsillo "; AndersonTorres = "Anderson Torres "; @@ -70,6 +71,7 @@ cstrahan = "Charles Strahan "; cwoac = "Oliver Matthews "; DamienCassou = "Damien Cassou "; + davidak = "David Kleuker "; davidrusu = "David Rusu "; dbohdan = "Danyil Bohdan "; DerGuteMoritz = "Moritz Heidkamp "; diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 419df915e6a..15bd185ccec 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -146,12 +146,9 @@ in rec { inherit sources; - buildInputs = [ libxml2 libxslt dblatex tetex ]; + buildInputs = [ libxml2 libxslt dblatex dblatex.tex ]; buildCommand = '' - # TeX needs a writable font cache. - export VARTEXFONTS=$TMPDIR/texfonts - ${copySources} dst=$out/share/doc/nixos @@ -162,7 +159,7 @@ in rec { mkdir -p $out/nix-support echo "doc-pdf manual $dst/manual.pdf" >> $out/nix-support/hydra-build-products - ''; # */ + ''; }; # Generate the NixOS manpages. diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index d7d3d1a7fb1..098613f9685 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -6,35 +6,48 @@ Release 15.09 (“Dingo”, 2015/09/??) -In addition to numerous new and upgraded packages, this release has the following highlights: +In addition to numerous new and upgraded packages, this release +has the following highlights: - - - - The Haskell packages infrastructure has been re-designed from the ground up. - NixOS now distributes the latest version of every single package registered on - Hackage, i.e. well over - 8000 Haskell packages. Further information and usage instructions for the - improved infrastructure are available at https://nixos.org/wiki/Haskell. - Users migrating from an earlier release will find also find helpful information - below, in the list of backwards-incompatible changes. - - + - - - Users running an SSH server who worry about the quality of their - /etc/ssh/moduli file with respect to the vulnerabilities - discovered in the Diffie-Hellman key exchange can now replace OpenSSH's - default version with one they generated themselves using the new - services.openssh.moduliFile option. - - - + + The Haskell packages infrastructure has been re-designed + from the ground up. NixOS now distributes the latest version of + every single package registered on Hackage, i.e. well + over 8000 Haskell packages. Further information and usage + instructions for the improved infrastructure are available at + https://nixos.org/wiki/Haskell. + Users migrating from an earlier release will also find helpful + information below, in the list of backwards-incompatible changes. + - + + Nix has been updated to version 1.10, which among other + improvements enables cryptographic signatures on binary caches for + improved security. + + + + You can now keep your NixOS system up to date automatically + by setting + + +system.autoUpgrade.enable = true; + + + This will cause the system to periodically check for updates in + your current channel and run nixos-rebuild. + + + + This release is based on Glibc 2.21, GCC 4.9 and Linux + 3.18. + + + When upgrading from a previous release, please be aware of the @@ -50,10 +63,11 @@ and want to continue to use them, please set system.stateVersion = "14.12"; -(The new option ensures that +The new option ensures that certain configuration changes that could break existing systems (such as the sshd host key setting) will maintain -compatibility with the specified NixOS release.) +compatibility with the specified NixOS release. NixOps sets the state +version of existing deployments automatically. cron is no longer enabled by default, unless you have a non-empty @@ -72,9 +86,9 @@ false. and old steam package -- to steamOriginal. -CMPlayer has been renamed to bomi upstream. Package cmplayer -was accordingly renamed to bomi - +CMPlayer has been renamed to bomi upstream. Package +cmplayer was accordingly renamed to +bomi Atom Shell has been renamed to Electron upstream. Package atom-shell was accordingly renamed to electron @@ -84,21 +98,20 @@ was accordingly renamed to electron which contains the latest Elm platform. - - The CUPS printing service has been updated to version 2.0.2. - Furthermore its systemd service has been renamed to cups.service. - - - Local printers are no longer shared or advertised by default. This behavior - can be changed by enabling services.printing.defaultShared - or services.printing.browsing respectively. - + The CUPS printing service has been updated to version + 2.0.2. Furthermore its systemd service has been + renamed to cups.service. + + Local printers are no longer shared or advertised by + default. This behavior can be changed by enabling + services.printing.defaultShared or + services.printing.browsing respectively. - The VirtualBox host and guest options have been moved/renamed more - consistently and less confusing to be now found in + The VirtualBox host and guest options have been named more + consistently. They can now found in virtualisation.virtualbox.host.* instead of services.virtualboxHost.* and virtualisation.virtualbox.guest.* instead of @@ -207,25 +220,31 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install -The following new services were added since the last release: - - -brltty -marathon -tvheadend - - - - Other notable improvements: + The nixos and nixpkgs channels were unified, so one can use nix-env -iA nixos.bash instead of nix-env -iA nixos.pkgs.bash. See the commit for details. + + + + Users running an SSH server who worry about the quality of their + /etc/ssh/moduli file with respect to the + vulnerabilities + discovered in the Diffie-Hellman key exchange can now + replace OpenSSH's default version with one they generated + themselves using the new + services.openssh.moduliFile option. + + + + diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index c5e341d2e3f..2745fb2cbe4 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -7,34 +7,39 @@ Unstable When upgrading from a previous release, please be aware of the - following incompatible changes: +following incompatible changes: - - - wmiiSnap has been replaced with - wmii_hg, but - services.xserver.windowManager.wmii.enable - has been updated respectively so this only affects you if you - have explicitly installed wmiiSnap. - - - wmiimenu is removed, as it has been removed by - the developers upstream. Use wimenu from the - wmii-hg package. - + + + wmiiSnap has been replaced with + wmii_hg, but + services.xserver.windowManager.wmii.enable has + been updated respectively so this only affects you if you have + explicitly installed wmiiSnap. + + + + + wmiimenu is removed, as it has been + removed by the developers upstream. Use wimenu + from the wmii-hg package. + + + + Gitit is no longer automatically added to the module list in + NixOS and as such there will not be any manual entries for it. You + will need to add an import statement to your NixOS configuration + in order to use it, e.g. + + ]; +} +]]> + + will include the Gitit service configuration options. + + + - Gitit! Is no longer automatically added to the module list in - NixOS and as such there will not be any manual entries for it. You will need to - add an import statement to your nixos configuration in order to use it. As - an example adding: - ]; - } - ]]> - - Will include the gitit service configuration options. - - - diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index b0e9ceea10b..0d2700a126f 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -233,6 +233,7 @@ dnschain = 209; #lxd = 210; # unused kibana = 211; + xtreemfs = 212; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -444,6 +445,7 @@ #dnschain = 209; #unused lxd = 210; # unused #kibana = 211; + xtreemfs = 212; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b03f4494522..c890eac4991 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -257,6 +257,7 @@ ./services/network-filesystems/diod.nix ./services/network-filesystems/u9fs.nix ./services/network-filesystems/yandex-disk.nix + ./services/network-filesystems/xtreemfs.nix ./services/networking/aiccu.nix ./services/networking/amuled.nix ./services/networking/asterisk.nix @@ -472,6 +473,7 @@ ./tasks/filesystems/ntfs.nix ./tasks/filesystems/reiserfs.nix ./tasks/filesystems/unionfs-fuse.nix + ./tasks/filesystems/vboxsf.nix ./tasks/filesystems/vfat.nix ./tasks/filesystems/xfs.nix ./tasks/filesystems/zfs.nix diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 29e0cf7a882..e8beba4b358 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -77,7 +77,8 @@ let smtpd_tls_key_file = ${cfg.sslKey} smtpd_use_tls = yes - + '' + + optionalString (cfg.recipientDelimiter != "") '' recipient_delimiter = ${cfg.recipientDelimiter} '' + optionalString (cfg.virtual != "") '' diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix new file mode 100644 index 00000000000..b051214e1d0 --- /dev/null +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -0,0 +1,469 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.xtreemfs; + + xtreemfs = pkgs.xtreemfs; + + home = cfg.homeDir; + + startupScript = class: configPath: pkgs.writeScript "xtreemfs-osd.sh" '' + #! ${pkgs.stdenv.shell} + JAVA_HOME="${pkgs.jdk}" + JAVADIR="${xtreemfs}/share/java" + JAVA_CALL="$JAVA_HOME/bin/java -ea -cp $JAVADIR/XtreemFS.jar:$JAVADIR/BabuDB.jar:$JAVADIR/Flease.jar:$JAVADIR/protobuf-java-2.5.0.jar:$JAVADIR/Foundation.jar:$JAVADIR/jdmkrt.jar:$JAVADIR/jdmktk.jar:$JAVADIR/commons-codec-1.3.jar" + $JAVA_CALL ${class} ${configPath} + ''; + + dirReplicationConfig = pkgs.writeText "xtreemfs-dir-replication-plugin.properties" '' + babudb.repl.backupDir = ${home}/server-repl-dir + plugin.jar = ${xtreemfs}/share/java/BabuDB_replication_plugin.jar + babudb.repl.dependency.0 = ${xtreemfs}/share/java/Flease.jar + + ${cfg.dir.replication.extraConfig} + ''; + + dirConfig = pkgs.writeText "xtreemfs-dir-config.properties" '' + uuid = ${cfg.dir.uuid} + listen.port = ${toString cfg.dir.port} + ${optionalString (cfg.dir.address != "") "listen.address = ${cfg.dir.address}"} + http_port = ${toString cfg.dir.httpPort} + babudb.baseDir = ${home}/dir/database + babudb.logDir = ${home}/dir/db-log + babudb.sync = ${if cfg.dir.replication.enable then "FDATASYNC" else cfg.dir.syncMode} + + ${optionalString cfg.dir.replication.enable "babudb.plugin.0 = ${dirReplicationConfig}"} + + ${cfg.dir.extraConfig} + ''; + + mrcReplicationConfig = pkgs.writeText "xtreemfs-mrc-replication-plugin.properties" '' + babudb.repl.backupDir = ${home}/server-repl-mrc + plugin.jar = ${xtreemfs}/share/java/BabuDB_replication_plugin.jar + babudb.repl.dependency.0 = ${xtreemfs}/share/java/Flease.jar + + ${cfg.mrc.replication.extraConfig} + ''; + + mrcConfig = pkgs.writeText "xtreemfs-mrc-config.properties" '' + uuid = ${cfg.mrc.uuid} + listen.port = ${toString cfg.mrc.port} + ${optionalString (cfg.mrc.address != "") "listen.address = ${cfg.mrc.address}"} + http_port = ${toString cfg.mrc.httpPort} + babudb.baseDir = ${home}/mrc/database + babudb.logDir = ${home}/mrc/db-log + babudb.sync = ${if cfg.mrc.replication.enable then "FDATASYNC" else cfg.mrc.syncMode} + + ${optionalString cfg.mrc.replication.enable "babudb.plugin.0 = ${mrcReplicationConfig}"} + + ${cfg.mrc.extraConfig} + ''; + + osdConfig = pkgs.writeText "xtreemfs-osd-config.properties" '' + uuid = ${cfg.osd.uuid} + listen.port = ${toString cfg.osd.port} + ${optionalString (cfg.osd.address != "") "listen.address = ${cfg.osd.address}"} + http_port = ${toString cfg.osd.httpPort} + object_dir = ${home}/osd/ + + ${cfg.osd.extraConfig} + ''; + + optionalDir = optionals cfg.dir.enable ["xtreemfs-dir.service"]; + + systemdOptionalDependencies = { + after = [ "network.target" ] ++ optionalDir; + wantedBy = [ "multi-user.target" ] ++ optionalDir; + }; + +in + +{ + + ###### interface + + options = { + + services.xtreemfs = { + + enable = mkEnableOption "XtreemFS"; + + homeDir = mkOption { + default = "/var/lib/xtreemfs"; + description = '' + XtreemFS home dir for the xtreemfs user. + ''; + }; + + dir = { + enable = mkOption { + default = true; + description = '' + Whether to enable XtreemFS DIR service. + ''; + }; + uuid = mkOption { + example = "eacb6bab-f444-4ebf-a06a-3f72d7465e40"; + description = '' + Must be set to a unique identifier, preferably a UUID according to + RFC 4122. UUIDs can be generated with `uuidgen` command, found in + the `utillinux` package. + ''; + }; + port = mkOption { + default = 32638; + description = '' + The port to listen on for incoming connections (TCP). + ''; + }; + address = mkOption { + example = "127.0.0.1"; + default = ""; + description = '' + If specified, it defines the interface to listen on. If not + specified, the service will listen on all interfaces (any). + ''; + }; + httpPort = mkOption { + default = 30638; + description = '' + Specifies the listen port for the HTTP service that returns the + status page. + ''; + }; + syncMode = mkOption { + default = "FSYNC"; + example = "FDATASYNC"; + description = '' + The sync mode influences how operations are committed to the disk + log before the operation is acknowledged to the caller. + + -ASYNC mode the writes to the disk log are buffered in memory by the operating system. This is the fastest mode but will lead to data loss in case of a crash, kernel panic or power failure. + -SYNC_WRITE_METADATA opens the file with O_SYNC, the system will not buffer any writes. The operation will be acknowledged when data has been safely written to disk. This mode is slow but offers maximum data safety. However, BabuDB cannot influence the disk drive caches, this depends on the OS and hard disk model. + -SYNC_WRITE similar to SYNC_WRITE_METADATA but opens file with O_DSYNC which means that only the data is commit to disk. This can lead to some data loss depending on the implementation of the underlying file system. Linux does not implement this mode. + -FDATASYNC is similar to SYNC_WRITE but opens the file in asynchronous mode and calls fdatasync() after writing the data to disk. + -FSYNC is similar to SYNC_WRITE_METADATA but opens the file in asynchronous mode and calls fsync() after writing the data to disk. + + For best throughput use ASYNC, for maximum data safety use FSYNC. + + (If xtreemfs.dir.replication.enable is true then FDATASYNC is forced) + ''; + }; + extraConfig = mkOption { + default = ""; + example = '' + # specify whether SSL is required + ssl.enabled = true + ssl.service_creds.pw = passphrase + ssl.service_creds.container = pkcs12 + ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/dir.p12 + ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks + ssl.trusted_certs.pw = jks_passphrase + ssl.trusted_certs.container = jks + ''; + description = '' + Configuration of XtreemFS DIR service. + WARNING: configuration is saved as plaintext inside nix store. + For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + ''; + }; + replication = { + enable = mkEnableOption "XtreemFS DIR replication plugin"; + extraConfig = mkOption { + example = '' + # participants of the replication including this replica + babudb.repl.participant.0 = 192.168.0.10 + babudb.repl.participant.0.port = 35676 + babudb.repl.participant.1 = 192.168.0.11 + babudb.repl.participant.1.port = 35676 + babudb.repl.participant.2 = 192.168.0.12 + babudb.repl.participant.2.port = 35676 + + # number of servers that at least have to be up to date + # To have a fault-tolerant system, this value has to be set to the + # majority of nodes i.e., if you have three replicas, set this to 2 + # Please note that a setup with two nodes provides no fault-tolerance. + babudb.repl.sync.n = 2 + + # specify whether SSL is required + babudb.ssl.enabled = true + + babudb.ssl.protocol = tlsv12 + + # server credentials for SSL handshakes + babudb.ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/osd.p12 + babudb.ssl.service_creds.pw = passphrase + babudb.ssl.service_creds.container = pkcs12 + + # trusted certificates for SSL handshakes + babudb.ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks + babudb.ssl.trusted_certs.pw = jks_passphrase + babudb.ssl.trusted_certs.container = jks + + babudb.ssl.authenticationWithoutEncryption = false + ''; + description = '' + Configuration of XtreemFS DIR replication plugin. + WARNING: configuration is saved as plaintext inside nix store. + For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + ''; + }; + }; + }; + + mrc = { + enable = mkOption { + default = true; + description = '' + Whether to enable XtreemFS MRC service. + ''; + }; + uuid = mkOption { + example = "eacb6bab-f444-4ebf-a06a-3f72d7465e41"; + description = '' + Must be set to a unique identifier, preferably a UUID according to + RFC 4122. UUIDs can be generated with `uuidgen` command, found in + the `utillinux` package. + ''; + }; + port = mkOption { + default = 32636; + description = '' + The port to listen on for incoming connections (TCP). + ''; + }; + address = mkOption { + example = "127.0.0.1"; + default = ""; + description = '' + If specified, it defines the interface to listen on. If not + specified, the service will listen on all interfaces (any). + ''; + }; + httpPort = mkOption { + default = 30636; + description = '' + Specifies the listen port for the HTTP service that returns the + status page. + ''; + }; + syncMode = mkOption { + default = "FSYNC"; + example = "FDATASYNC"; + description = '' + The sync mode influences how operations are committed to the disk + log before the operation is acknowledged to the caller. + + -ASYNC mode the writes to the disk log are buffered in memory by the operating system. This is the fastest mode but will lead to data loss in case of a crash, kernel panic or power failure. + -SYNC_WRITE_METADATA opens the file with O_SYNC, the system will not buffer any writes. The operation will be acknowledged when data has been safely written to disk. This mode is slow but offers maximum data safety. However, BabuDB cannot influence the disk drive caches, this depends on the OS and hard disk model. + -SYNC_WRITE similar to SYNC_WRITE_METADATA but opens file with O_DSYNC which means that only the data is commit to disk. This can lead to some data loss depending on the implementation of the underlying file system. Linux does not implement this mode. + -FDATASYNC is similar to SYNC_WRITE but opens the file in asynchronous mode and calls fdatasync() after writing the data to disk. + -FSYNC is similar to SYNC_WRITE_METADATA but opens the file in asynchronous mode and calls fsync() after writing the data to disk. + + For best throughput use ASYNC, for maximum data safety use FSYNC. + + (If xtreemfs.mrc.replication.enable is true then FDATASYNC is forced) + ''; + }; + extraConfig = mkOption { + example = '' + osd_check_interval = 300 + no_atime = true + local_clock_renewal = 0 + remote_time_sync = 30000 + authentication_provider = org.xtreemfs.common.auth.NullAuthProvider + + # shared secret between the MRC and all OSDs + capability_secret = iNG8UuQJrJ6XVDTe + + dir_service.host = 192.168.0.10 + dir_service.port = 32638 + + # if replication is enabled + dir_service.1.host = 192.168.0.11 + dir_service.1.port = 32638 + dir_service.2.host = 192.168.0.12 + dir_service.2.port = 32638 + + # specify whether SSL is required + ssl.enabled = true + ssl.protocol = tlsv12 + ssl.service_creds.pw = passphrase + ssl.service_creds.container = pkcs12 + ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/mrc.p12 + ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks + ssl.trusted_certs.pw = jks_passphrase + ssl.trusted_certs.container = jks + ''; + description = '' + Configuration of XtreemFS MRC service. + WARNING: configuration is saved as plaintext inside nix store. + For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + ''; + }; + replication = { + enable = mkEnableOption "XtreemFS MRC replication plugin"; + extraConfig = mkOption { + example = '' + # participants of the replication including this replica + babudb.repl.participant.0 = 192.168.0.10 + babudb.repl.participant.0.port = 35678 + babudb.repl.participant.1 = 192.168.0.11 + babudb.repl.participant.1.port = 35678 + babudb.repl.participant.2 = 192.168.0.12 + babudb.repl.participant.2.port = 35678 + + # number of servers that at least have to be up to date + # To have a fault-tolerant system, this value has to be set to the + # majority of nodes i.e., if you have three replicas, set this to 2 + # Please note that a setup with two nodes provides no fault-tolerance. + babudb.repl.sync.n = 2 + + # specify whether SSL is required + babudb.ssl.enabled = true + + babudb.ssl.protocol = tlsv12 + + # server credentials for SSL handshakes + babudb.ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/osd.p12 + babudb.ssl.service_creds.pw = passphrase + babudb.ssl.service_creds.container = pkcs12 + + # trusted certificates for SSL handshakes + babudb.ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks + babudb.ssl.trusted_certs.pw = jks_passphrase + babudb.ssl.trusted_certs.container = jks + + babudb.ssl.authenticationWithoutEncryption = false + ''; + description = '' + Configuration of XtreemFS MRC replication plugin. + WARNING: configuration is saved as plaintext inside nix store. + For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + ''; + }; + }; + }; + + osd = { + enable = mkOption { + default = true; + description = '' + Whether to enable XtreemFS OSD service. + ''; + }; + uuid = mkOption { + example = "eacb6bab-f444-4ebf-a06a-3f72d7465e42"; + description = '' + Must be set to a unique identifier, preferably a UUID according to + RFC 4122. UUIDs can be generated with `uuidgen` command, found in + the `utillinux` package. + ''; + }; + port = mkOption { + default = 32640; + description = '' + The port to listen on for incoming connections (TCP and UDP). + ''; + }; + address = mkOption { + example = "127.0.0.1"; + default = ""; + description = '' + If specified, it defines the interface to listen on. If not + specified, the service will listen on all interfaces (any). + ''; + }; + httpPort = mkOption { + default = 30640; + description = '' + Specifies the listen port for the HTTP service that returns the + status page. + ''; + }; + extraConfig = mkOption { + example = '' + local_clock_renewal = 0 + remote_time_sync = 30000 + report_free_space = true + capability_secret = iNG8UuQJrJ6XVDTe + + dir_service.host = 192.168.0.10 + dir_service.port = 32638 + + # if replication is used + dir_service.1.host = 192.168.0.11 + dir_service.1.port = 32638 + dir_service.2.host = 192.168.0.12 + dir_service.2.port = 32638 + + # specify whether SSL is required + ssl.enabled = true + ssl.service_creds.pw = passphrase + ssl.service_creds.container = pkcs12 + ssl.service_creds = /etc/xos/xtreemfs/truststore/certs/osd.p12 + ssl.trusted_certs = /etc/xos/xtreemfs/truststore/certs/trusted.jks + ssl.trusted_certs.pw = jks_passphrase + ssl.trusted_certs.container = jks + ''; + description = '' + Configuration of XtreemFS OSD service. + WARNING: configuration is saved as plaintext inside nix store. + For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html + ''; + }; + }; + }; + + }; + + + ###### implementation + + config = lib.mkIf cfg.enable { + + environment.systemPackages = [ xtreemfs ]; + + users.extraUsers.xtreemfs = + { uid = config.ids.uids.xtreemfs; + description = "XtreemFS user"; + createHome = true; + home = home; + }; + + users.extraGroups.xtreemfs = + { gid = config.ids.gids.xtreemfs; + }; + + systemd.services.xtreemfs-dir = mkIf cfg.dir.enable { + description = "XtreemFS-DIR Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "xtreemfs"; + ExecStart = "${startupScript "org.xtreemfs.dir.DIR" dirConfig}"; + }; + }; + + systemd.services.xtreemfs-mrc = mkIf cfg.mrc.enable ({ + description = "XtreemFS-MRC Server"; + serviceConfig = { + User = "xtreemfs"; + ExecStart = "${startupScript "org.xtreemfs.mrc.MRC" mrcConfig}"; + }; + } // systemdOptionalDependencies); + + systemd.services.xtreemfs-osd = mkIf cfg.osd.enable ({ + description = "XtreemFS-OSD Server"; + serviceConfig = { + User = "xtreemfs"; + ExecStart = "${startupScript "org.xtreemfs.osd.OSD" osdConfig}"; + }; + } // systemdOptionalDependencies); + + }; + +} diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 887b6f88a74..c9a56376832 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -106,7 +106,7 @@ in systemd.services.display-manager.wants = [ "systemd-machined.service" ]; systemd.services.display-manager.after = [ "systemd-machined.service" ]; - systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xlibs.xhost pkgs.dbus_tools ]; + systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xorg.xhost pkgs.dbus_tools ]; services.dbus.packages = [ gdm ]; diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix index d0b69c5452c..558f5e8cfc7 100644 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ b/nixos/modules/services/x11/display-managers/kdm.nix @@ -19,7 +19,7 @@ let ''} [X-*-Core] - Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb + Xrdb=${pkgs.xorg.xrdb}/bin/xrdb SessionsDirs=${dmcfg.session.desktops} Session=${dmcfg.session.script} FailsafeClient=${pkgs.xterm}/bin/xterm diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index e967dc91141..e50ed08a218 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -18,6 +18,8 @@ let cfg = config.services.xserver.synaptics; Option "TapButton2" "0" Option "TapButton3" "0" ''; + pkg = pkgs.xorg.xf86inputsynaptics; + etcFile = "X11/xorg.conf.d/50-synaptics.conf"; in { options = { @@ -146,9 +148,12 @@ in { config = mkIf cfg.enable { - services.xserver.modules = [ pkgs.xorg.xf86inputsynaptics ]; + services.xserver.modules = [ pkg ]; - environment.systemPackages = [ pkgs.xorg.xf86inputsynaptics ]; + environment.etc."${etcFile}".source = + "${pkg}/share/X11/xorg.conf.d/50-synaptics.conf"; + + environment.systemPackages = [ pkg ]; services.xserver.config = '' diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index ce9e3555b6c..4409bd4cc8c 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -69,6 +69,8 @@ let config = { mountPoint = mkDefault name; device = mkIf (config.fsType == "tmpfs") (mkDefault config.fsType); + # The vboxsf filesystem doesn't support the relatime option: + options = mkIf (config.fsType == "vboxsf") (mkDefault "defaults"); }; }; @@ -141,7 +143,7 @@ in environment.etc.fstab.text = let - fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" ]; + fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" ]; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck; in '' # This is a generated file. Do not edit! diff --git a/nixos/modules/tasks/filesystems/vboxsf.nix b/nixos/modules/tasks/filesystems/vboxsf.nix new file mode 100644 index 00000000000..87f1984f084 --- /dev/null +++ b/nixos/modules/tasks/filesystems/vboxsf.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + inInitrd = any (fs: fs == "vboxsf") config.boot.initrd.supportedFilesystems; + + package = pkgs.runCommand "mount.vboxsf" {} '' + mkdir -p $out/bin + cp ${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/mount.vboxsf $out/bin + ''; +in + +{ + config = mkIf (any (fs: fs == "vboxsf") config.boot.supportedFilesystems) { + + system.fsPackages = [ package ]; + + boot.initrd.kernelModules = mkIf inInitrd [ "vboxsf" ]; + + }; +} diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 44a582ba766..0b0fdda4988 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -9,7 +9,7 @@ with lib; { config = { - systemd.services."fetch-ec2-data" = + systemd.services.fetch-ec2-data = { description = "Fetch EC2 Data"; wantedBy = [ "multi-user.target" "sshd.service" ]; @@ -48,13 +48,22 @@ with lib; # the supplied user data, if available. Otherwise sshd will # generate one normally. $wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true + + mkdir -m 0755 -p /etc/ssh + key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)" key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)" if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then - mkdir -m 0755 -p /etc/ssh (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key) echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub fi + + key="$(sed 's/|/\n/g; s/SSH_HOST_ED25519_KEY://; t; d' /root/user-data)" + key_pub="$(sed 's/SSH_HOST_ED25519_KEY_PUB://; t; d' /root/user-data)" + if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_ed25519_key ]; then + (umask 077; echo "$key" > /etc/ssh/ssh_host_ed25519_key) + echo "$key_pub" > /etc/ssh/ssh_host_ed25519_key.pub + fi ''; serviceConfig.Type = "oneshot"; @@ -72,6 +81,7 @@ with lib; # ec2-get-console-output. echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console ${config.programs.ssh.package}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console + ${config.programs.ssh.package}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_ed25519_key.pub > /dev/console echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console ''; serviceConfig.Type = "oneshot"; diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index 642ea3154b1..a025aee7cfe 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -32,7 +32,8 @@ in boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ]; - boot.kernelModules = [ "vboxsf" ]; + boot.supportedFilesystems = [ "vboxsf" ]; + boot.initrd.supportedFilesystems = [ "vboxsf" ]; users.extraGroups.vboxsf.gid = config.ids.gids.vboxsf; diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 1a5a6f7b5bb..728d46d446e 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -389,6 +389,21 @@ in { destroyVM_simple; + sub removeUUIDs { + return join("\n", grep { $_ !~ /^UUID:/ } split(/\n/, $_[0]))."\n"; + } + + subtest "host-usb-permissions", sub { + my $userUSB = removeUUIDs vbm("list usbhost"); + print STDERR $userUSB; + my $rootUSB = removeUUIDs $machine->succeed("VBoxManage list usbhost"); + print STDERR $rootUSB; + + die "USB host devices differ for root and normal user" + if $userUSB ne $rootUSB; + die "No USB host devices found" if $userUSB =~ //; + }; + subtest "systemd-detect-virt", sub { createVM_detectvirt; vbm("startvm detectvirt"); diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 3ab113c92e8..9476fbaf335 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs -, gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg +, gettext, dbus_glib, libxml2, libmad, xorg, alsaLib, libogg , libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper , mpg123, neon, faad2 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib - libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio + libmad xorg.libXcomposite libogg libvorbis flac alsaLib libcdio libcddb ffmpeg makeWrapper mpg123 neon faad2 ]; diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index db1f7895f4b..e19acab36b5 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xlibs }: +{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }: stdenv.mkDerivation rec { name = "bristol-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib libjack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext - xlibs.xproto + alsaLib libjack2 pkgconfig libpulseaudio xorg.libX11 xorg.libXext + xorg.xproto ]; preInstall = '' diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix new file mode 100644 index 00000000000..db6843f4535 --- /dev/null +++ b/pkgs/applications/audio/bs1770gain/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, ffmpeg, sox }: + +stdenv.mkDerivation rec { + name = "bs1770gain-${version}"; + version = "0.4.7"; + + src = fetchurl { + url = "mirror://sourceforge/bs1770gain/${name}.tar.gz"; + sha256 = "0dnypm7k4axc693g0z73n2mvycbzgc4lnj2am64xjzyg37my4qzz"; + }; + + buildInputs = [ ffmpeg sox ]; + + meta = { + description = "A audio/video loudness scanner implementing ITU-R BS.1770"; + license = stdenv.lib.licenses.gpl2Plus; + homepage = "http://bs1770gain.sourceforge.net/"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index a590716537b..72893dfb19a 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2 -, libxslt, lv2, pkgconfig, premake3, xlibs, ladspa-sdk }: +, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { name = "distrho-ports-git-2015-07-18"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3 - xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext - xlibs.libXinerama xlibs.libXrender ladspa-sdk + xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext + xorg.libXinerama xorg.libXrender ladspa-sdk ]; buildPhase = '' diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 61c97953422..5d5b70a5898 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xlibs }: +{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xorg }: stdenv.mkDerivation rec { name = "eq10q-2-${version}"; version = "beta7.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi"; }; - buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence ]; + buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; installFlags = '' DESTDIR=$(out) diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 2edc1c00ce6..7c69a25eb04 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, readline, patchelf, ncurses, qt48, libidn, expat, flac , libvorbis }: -assert stdenv.system == "x86_64-linux" || stdenv.system == "1686-linux"; +assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; let archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb"; in stdenv.mkDerivation rec { - version = "beta_1.0.182.3607-r0"; # friendly to nix-env version sorting algo + version = "beta_1.0.221.5230-r0"; # friendly to nix-env version sorting algo product = "google-musicmanager"; name = "${product}-${version}"; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { url = archUrl name "amd64"; - sha256 = "141x986haxg3r72ggh8prz0qg298jkad1ys8sdvsac92p4adcqx4"; + sha256 = "1h0ssbz6y9xi2szalgb5wcxi8m1ylg4qf2za6zgvi908hpan7q37"; } else fetchurl { url = archUrl name "i386"; - sha256 = "076iaa7pxhj8b1hlg5ah9jfm4qgzgjc9ivvg2l18wp045gnycv1l"; + sha256 = "0q8cnzx7s25bpqlbp40d43mwd6m8kvhvdifkqlgc9phpydnqpd1i"; }; unpackPhase = '' diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index 0427283d54d..b0fbced2211 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xlibs, zita-alsa-pcmi }: +{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xorg, zita-alsa-pcmi }: stdenv.mkDerivation rec { name = "jaaa-${version}"; diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index afd411089cd..e316df4a8c1 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.6.5"; + version = "0.6.7"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "1zfidkskmiqx1wfykinmr639lhd90s7b0rks6vaci4n56ml8y4ji"; + sha256 = "0yr1ib14qkgbsv839anpzkfbwkm6gg8wv4bf98ar7q5l2p2pv008"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 1b9323c1a7b..5bec7aa6dd0 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, x11 +{ stdenv, fetchurl, cmake, qt4, pkgconfig, xlibsWrapper # transports , curl, libmms # input plugins @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ # basic requirements - cmake qt4 pkgconfig x11 + cmake qt4 pkgconfig xlibsWrapper # transports curl libmms # input plugins diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 9c41c88b012..084d187c347 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgs, fetchFromGitHub, -automake, pkgconfig, lv2, fftw, cmake, xlibs, libjack2, libsamplerate, libsndfile +automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8"; }; - buildInputs = with xlibs; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; + buildInputs = with xorg; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; meta = { description = "Rakarrak effects ported to LV2"; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 005b3e1b60d..2868d760973 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype +{ fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf , libgcrypt, chromium, udev, fontconfig , dbus, expat }: @@ -28,16 +28,16 @@ let qt4 stdenv.cc.cc udev - xlibs.libX11 - xlibs.libXcomposite - xlibs.libXdamage - xlibs.libXext - xlibs.libXfixes - xlibs.libXi - xlibs.libXrandr - xlibs.libXrender - xlibs.libXrender - xlibs.libXScrnSaver + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXrender + xorg.libXScrnSaver ]; in diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index a107dd9794b..d450cce7b86 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper , expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient -, libsndfile, libxcb, xlibs +, libsndfile, libxcb, xorg }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat libjack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype - libxcb xlibs.libX11 xlibs.libXau xlibs.libXdmcp xlibs.libXft xlibs.libXrender + libxcb xorg.libX11 xorg.libXau xorg.libXdmcp xorg.libXft xorg.libXrender ]; makeFlags = [ diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 6e03bcb27fc..32d5f1aa13e 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -15,11 +15,11 @@ let quazipQt4 = quazip.override { qt = qt4; }; in stdenv.mkDerivation rec { name = "tomahawk-${version}"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { url = "http://download.tomahawk-player.org/${name}.tar.bz2"; - sha256 = "0kjzkq21g3jl1lvadsm7gf0zvpbsv208kqf76wg2hnbm4k1a02wj"; + sha256 = "0j84h36wkjfjbsd7ybyji7rcc9wpjdbl0f1xdcc1g7h0nz34pc0g"; }; cmakeFlags = [ diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 9aafae7a5f4..cd334c4254f 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.3.5.1"; + version = "1.3.5.2"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "1c7049pnvadxndk1rbja77kyr0rwnqca2546pxjnxksg923s5l8n"; + sha256 = "001xvwknsm1sv5lvwz7f6dgf57b8djbpwbyk2gfxjy9rzl5q53qr"; }; buildInputs = [ diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 457d8c4b0ca..fb323537020 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 -, intltool, x11, libxklavier, libgcrypt, libaudit +, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit , qt4 ? null, qt5 ? null }: diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 4de862b0254..9bcad5b7649 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, systemd +, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd }: let @@ -9,9 +9,9 @@ let paths = [ stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss - xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst - xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr - xlibs.libXcursor libcap systemd + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor libcap systemd ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 9d85c05206a..b80d63f69d3 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -317,11 +317,11 @@ rec { scala = buildEclipseUpdateSite rec { name = "scala-${version}"; - version = "4.1.1"; + version = "4.1.1.20150911"; src = fetchzip { url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip"; - sha256 = "0x5cdcm7p2ynz5ryw041gb150sripf9i4m1yrfqklnn581yqm6y8"; + sha256 = "03g24sjivm7kzy64wwjs4ihf9vrb6703lb7bx3jafxzcwqm0pj1i"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 957ec33a5f4..e0d74afabcd 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d +{ stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , alsaLib, cairo, acl, gpm, AppKit, Foundation, libobjc @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext ] ++ stdenv.lib.optional stdenv.isLinux dbus ++ stdenv.lib.optionals withX - [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft + [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] ++ stdenv.lib.optional (withX && withGTK2) gtk2 ++ stdenv.lib.optional (withX && withGTK3) gtk3 diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 6db7130896f..6dbeff55063 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xlibs, udev +, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, udev }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf - xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst - xlibs.libXcomposite xlibs.libXi xlibs.libXfixes + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes ]; in assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index a4dfc4719dc..56a8ac62025 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, motif, libXpm }: +{ stdenv, fetchurl, xlibsWrapper, motif, libXpm }: assert stdenv.isLinux; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna"; }; - buildInputs = [ x11 motif libXpm ]; + buildInputs = [ xlibsWrapper motif libXpm ]; buildFlags = if stdenv.isLinux then "linux" else ""; diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix index ffa1c4eed34..c7b0f9864c9 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, glib, xlibs, cairo, gtk}: +{ fetchurl, stdenv, glib, xorg, cairo, gtk}: let - libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo]; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo]; in assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 1764c85ca7d..b26d27a8bc5 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -1,10 +1,10 @@ -{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango, makeWrapper, openssl, bzip2 }: +{ fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2 }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let build = "3083"; - libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango]; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango]; in let # package with just the binaries sublime = stdenv.mkDerivation { diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 98663a946ae..8d9771c9134 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl, +{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }: stdenv.mkDerivation rec { name = "qgis-2.10.1"; - buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl qwt qscintilla + buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql ] ++ (with pythonPackages; [ numpy psycopg2 ]) ++ [ pythonPackages.qscintilla ]; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index ac0a2ec0d4c..266f70e3008 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng +{ stdenv, makeWrapper, fetchurl, xlibsWrapper, imlib2, libjpeg, libpng , libXinerama, curl, libexif }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1059mflgw8hl398lwy55fj50a98xryvdf23wkpbn4s0z9388hl46"; }; - buildInputs = [ makeWrapper x11 imlib2 libjpeg libpng libXinerama curl libexif ]; + buildInputs = [ makeWrapper xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ]; preBuild = '' makeFlags="PREFIX=$out exif=1" diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 83f409457fb..7c394ae11c6 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper -, python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }: +, python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }: stdenv.mkDerivation rec { name = "gimp-2.8.14"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo freetype fontconfig lcms libpng libjpeg poppler libtiff webkit libmng librsvg libwmf zlib libzip ghostscript aalib jasper - python pygtk libart_lgpl libexif gettext xlibs.libXpm + python pygtk libart_lgpl libexif gettext xorg.libXpm wrapPython ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { #configureFlags = [ "--disable-print" ]; # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib" + NIX_LDFLAGS = "-rpath ${xorg.libX11}/lib" + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; meta = { diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index ba95445a50a..c5d1b936233 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb , libxml2, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }: -let version = "3.17.92"; in +let version = "3.18.0"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; src = fetchurl { - sha256 = "0ax4rqqpwcz65nvw8l89npjc5v0g1ik1mb5w3025xlipm7djgybp"; - url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz"; + sha256 = "09qki4h1px65fxwpr7jppzqsi5cfcb8168p13blp3wcfizjgb9gl"; + url = "https://launchpad.net/simple-scan/3.18/${version}/+download/${name}.tar.xz"; }; buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 packagekit diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 88183c5e5a3..9e53fe3efe2 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, imake -, x11, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}: +, xlibsWrapper, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}: let version = "3.2.5b"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { builder = ./builder.sh; - buildInputs = [x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg]; + buildInputs = [xlibsWrapper libXpm libXmu libXi libXp Xaw3d libpng libjpeg]; nativeBuildInputs = [ imake makeWrapper ]; diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix index 0d61d5635a5..a0e2796a302 100644 --- a/pkgs/applications/inferno/default.nix +++ b/pkgs/applications/inferno/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchhg, stdenv, xlibs, gcc46, makeWrapper }: +{ fetchurl, fetchhg, stdenv, xorg, gcc46, makeWrapper }: stdenv.mkDerivation rec { # Inferno is a rolling release from a mercurial repository. For the verison number @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; # Fails with gcc48 due to inferno triggering an optimisation issue with floating point. - buildInputs = [ gcc46 xlibs.libX11 xlibs.libXpm xlibs.libXext xlibs.xextproto makeWrapper ]; + buildInputs = [ gcc46 xorg.libX11 xorg.libXpm xorg.libXext xorg.xextproto makeWrapper ]; infernoWrapper = ./inferno; diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 92967fc3bda..6f05e855759 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -174,7 +174,7 @@ let libvncserver libical networkmanager openal opencv openexr perl phonon pkgconfig polkit_qt4 prison python qca2 qimageblitz qjson qt4 samba saneBackends soprano speechd - strigi taglib udev xlibs xplanet xscreensaver xz; + strigi taglib udev xorg xplanet xscreensaver xz; alsa = alsaLib; assuan = libassuan; boost = boost155; @@ -289,7 +289,7 @@ let kde-wallpapers = kde4Package super.kde-wallpapers; kde-workspace = extendDerivation (kde4Package super.kde-workspace) { - buildInputs = with scope.xlibs; [ + buildInputs = with scope.xorg; [ libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil ]; nativeBuildInputs = [ scope.pkgconfig ]; @@ -385,7 +385,7 @@ let }; kmousetool = extendDerivation (kde4Package super.kmousetool) { - buildInputs = with scope.xlibs; [ libXtst libXt ]; + buildInputs = with scope.xorg; [ libXtst libXt ]; }; kmouth = kde4Package super.kmouth; @@ -407,13 +407,13 @@ let krdc = kde4Package super.krdc; kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) { - buildInputs = [ scope.xlibs.libXtst ]; + buildInputs = [ scope.xorg.libXtst ]; }; kreversi = kde4Package super.kreversi; krfb = extendDerivation (kde4Package super.krfb) { - buildInputs = with scope; [ xlibs.libXtst ktp-common-internals ]; + buildInputs = with scope; [ xorg.libXtst ktp-common-internals ]; }; ksaneplugin = kde4Package super.ksaneplugin; diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 9a30e4669ee..b4f01bc642b 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -6,6 +6,9 @@ , enableLibogg ? true, libogg ? null, libvorbis ? null , enableFLAC ? true, flac ? null , enablePNG ? true, libpng ? null +, enableLibsndfile ? true, libsndfile ? null +# amrnb and amrwb are unfree, disabled by default +, enableAMR ? false, amrnb ? null, amrwb ? null }: with stdenv.lib; @@ -25,13 +28,15 @@ stdenv.mkDerivation rec { optional enableLibmad libmad ++ optionals enableLibogg [ libogg libvorbis ] ++ optional enableFLAC flac ++ - optional enablePNG libpng; + optional enablePNG libpng ++ + optional enableLibsndfile libsndfile ++ + optionals enableAMR [ amrnb amrwb ]; meta = { description = "Sample Rate Converter for audio"; homepage = http://sox.sourceforge.net/; maintainers = [ lib.maintainers.marcweber ]; - license = lib.licenses.gpl2Plus; + license = if enableAMR then lib.licenses.unfree else lib.licenses.gpl2Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index 5921cc308b5..f7a8fe4eafc 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, makeWrapper, pkgconfig, - gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xlibs, + gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg, configH }: @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xlibs.libX11 - xlibs.xproto xlibs.kbproto xlibs.libXext xlibs.xextproto makeWrapper pkgconfig + gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xorg.libX11 + xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig ]; buildPhase = '' diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index bdd1a9e8e28..c8e8bb01e5d 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchgit, makeWrapper , pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc , keybinder3, clutter_gtk, libnotify -, libxkbcommon, xlibs, udev +, libxkbcommon, xorg, udev , bashInteractive }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig cmake vala intltool gtk3 gnome3.gnome_common gnome3.libgee gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper - xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence + xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence libxkbcommon ] ++ lib.optionals stdenv.isLinux [ udev diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/default.nix similarity index 95% rename from pkgs/applications/misc/hello/ex-2/default.nix rename to pkgs/applications/misc/hello/default.nix index bb91c90e2fc..bf63df4d154 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { doCheck = false; - separateDebugInfo = true; - meta = { description = "A program that produces a familiar, friendly greeting"; longDescription = '' diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index 6a5ce9fd604..acdd91aaf68 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }: +{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }: stdenv.mkDerivation { name = "keepassx2-2.0beta2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q"; }; - buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ]; + buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ]; meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index e626f3998f9..f1e2467362c 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgs, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "0k3pix4zdr5jc323w63kwrfhkvmn5ijnznzfhf6rvqp05lrkyh9x"; + sha256 = "1ag6p416iibwgvijjc8bwyrssxw3s3j559700xfgp10vj0nqk1hb"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 88512deb982..454bc48afe9 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "rofi-${version}"; - version = "0.15.7"; + version = "0.15.8"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz"; - sha256 = "0alygwc82shkg9lmy8r5vmgd84imx1f9pndrisjpisl8h28dw5dq"; + sha256 = "1qhj8xrxfnzy16g577w0zxg1cy885rbqydlbbxgfk0dpjvq70lq6"; }; buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index c010047845f..ac60d928587 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, x11, libX11, libXi, libXtst, libXrandr +{ stdenv, fetchFromGitHub, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr , xinput, curl, openssl, unzip }: with stdenv.lib; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - cmake x11 libX11 libXi libXtst libXrandr xinput curl openssl + cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl ]; installPhase = '' diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index c70436e68f9..b244e9c1bfc 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tcl, tk, x11, makeWrapper}: +{stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}: let version = "3.0"; in stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc"; }; - buildInputs = [tcl tk x11 makeWrapper]; + buildInputs = [tcl tk xlibsWrapper makeWrapper]; patchPhase = '' sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index 15202a1e90c..f580c41c0a4 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gccmakedep, xlibs }: +{ stdenv, fetchurl, gccmakedep, xorg }: stdenv.mkDerivation { name = "xcruiser-0.30"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; }; - buildInputs = with xlibs; [ gccmakedep imake libXt libXaw libXpm libXext ]; + buildInputs = with xorg; [ gccmakedep imake libXt libXaw libXpm libXext ]; configurePhase = "xmkmf -a"; diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 5055ac50089..0ea1159208f 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fox, pkgconfig, gettext, x11, gcc, intltool, file, libpng }: +{ stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }: stdenv.mkDerivation rec { name = "xfe-1.37"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd"; }; - buildInputs = [ fox pkgconfig gettext x11 gcc intltool file libpng ]; + buildInputs = [ fox pkgconfig gettext xlibsWrapper gcc intltool file libpng ]; preConfigure = '' sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 2e690dcce09..e677164ecf4 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,9 +1,9 @@ { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false -, stdenv, fetchurl, zlib, libpng, x11 ? null, motif ? null, freetype ? null, t1lib ? null +, stdenv, fetchurl, zlib, libpng, xlibsWrapper ? null, motif ? null, freetype ? null, t1lib ? null , base14Fonts ? null }: -assert enableGUI -> x11 != null && motif != null && freetype != null; +assert enableGUI -> xlibsWrapper != null && motif != null && freetype != null; assert enablePDFtoPPM -> freetype != null; assert useT1Lib -> t1lib != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation { }; buildInputs = [ zlib libpng ] ++ - stdenv.lib.optionals enableGUI [x11 motif] ++ + stdenv.lib.optionals enableGUI [xlibsWrapper motif] ++ stdenv.lib.optional useT1Lib t1lib ++ stdenv.lib.optional enablePDFtoPPM freetype; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 62a5fd80a58..86eb4169874 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,10 +1,10 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "47.0.2508.0"; - sha256 = "1jmcvbimj3x91czvclnqbp8w2nfqhk2bd7bw9yd37c576md1wnw2"; - sha256bin32 = "10spq63yfyzw419bz22r2g5rmnaxy5861715mkrcbpfm8cylzmzh"; - sha256bin64 = "1ycdp37ikdc9w4hp9qgpzjp47zh37g01ax8x4ack202vrv0dxhsh"; + version = "47.0.2516.0"; + sha256 = "05caz427lis89rrh1885mp84q4lsavkn7d1x519drmjvyz3djal8"; + sha256bin32 = "0fylv375j7wypwbjpccsjiyzzijkj6v96nvmal2x6fqyzz1qcx2s"; + sha256bin64 = "1n4vyibv9jvm12cxpj3grvafc0x7izw71hz83dr9q5r73q43bkkk"; }; beta = { version = "46.0.2490.33"; @@ -13,9 +13,9 @@ sha256bin64 = "1kn0k8gpjnm1xsdiby76phwr0i8yb1w9mzmnf7ppj5cddikc5n3v"; }; stable = { - version = "45.0.2454.93"; - sha256 = "1iraimblbzp9q16s5q7rbbb7079v095kr8dzqq1wwdb1bvcsllh6"; - sha256bin32 = "1gndmychajm4qb623k57zirp72w4y1vfxp17gyrbjpg4kzbi1qcg"; - sha256bin64 = "107l7f7crhcsv4xa219lmnsg2i7jqi5zly71cix54qg2bb7wgfwn"; + version = "45.0.2454.99"; + sha256 = "0h53gvgrs7f9sjw9vq21fr890f4qja0m2ja2c5ys1z5cs0gs7l8m"; + sha256bin32 = "18cc3vqvcfv1x11w1briis57fz53cdnmlxzzkrgs3585kw1q3m1d"; + sha256bin64 = "16pj25zvjiinc2wgvj2fwai6s2y5g8nx7j1p2s8bjix3hfnp26df"; }; } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 0e4fd4db1ba..1a698b0effd 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl +{ stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl , spidermonkey, gpm , enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2 , enablePython ? false, python ? null @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ ./gc-init.patch ]; - buildInputs = [ perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ] + buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ] ++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enablePython python; diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index b29cdec27e9..3dcf855d062 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "40.0.3"; + version = "41.0"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "68adee53b26075e18d0ef4d43da4260ec274d861"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "8e2cc81fc414fb71e5a83c40b4a4197f6648af78"; } - { locale = "af"; arch = "linux-i686"; sha1 = "f36ae5a72738cfa70c6824a5929cb14faa60be1b"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "4b7a01e76db920d4aa1cbeb556cbe91b37070304"; } - { locale = "an"; arch = "linux-i686"; sha1 = "a71cc4c7f988f1b5470dec60a73643f53104a1b2"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "1c47a2b37a88d405a819c7bdbe84489a31e838dd"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "d25ec2c169ea9a953636e0cbd4049095834c808d"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "5f588ffb8e21ea15fb78dca128a33be734575e3e"; } - { locale = "as"; arch = "linux-i686"; sha1 = "aadbbc147c65d2436916e81bb43ca342f5c19a9d"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "9e04c39967e0a667b5a33f7436d555ac25ea4240"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "9062edea598e4ec354259268be1fa2f85b8ba6d0"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "98e6cac1de95a571ea6f88b18970c11b8056b8cb"; } - { locale = "az"; arch = "linux-i686"; sha1 = "4c23a1fb7e8ecdd1e20f9d398c387fbd766fa51e"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "5b4bb2a9906c7475c718ad0abd299606718c3880"; } - { locale = "be"; arch = "linux-i686"; sha1 = "e10d45e9c2de22d9af5db6750f5466d0fddce6d8"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "ce70351af3ce9f27051ae14e9a529cba9876aeb8"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "e9546468eb2ddf67ea93563bd1a1c69736effa6b"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "fb734bc851775335e4dbd795fb7a56ca30a2a7ae"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "36aeba40a75a80ab186bab0024607a263c92a8b5"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e6f3833728864120906a7409561c09ace56713bb"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c641603161439f8c982952db76a9a947a5e68f5f"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "97f560a79f9dffd208cc572875c9bd683ce7e0f7"; } - { locale = "br"; arch = "linux-i686"; sha1 = "08e490ecf22f1e6e2646ddb1bba508835593b6ae"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "e0b84df55b0ae2e216196037f62004d11074c618"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "8f2f9e0870b27f4d184ee98052a78eff64192981"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "8fbf417d8e2fe33d926bafc0fe4a4b433bd4ac93"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "db308680eda482ebe59bd7807e433a3761b69160"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "888fe735b223b2d233900c1f356de187a92eca02"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "c3a185149605ec5818de19047c3a9be4cc8800b6"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "6e6477d578bec18d7e67d35012c5d019f4055c65"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "7990f07ca2fc0f28bdd2e96d5fe227b29f6eebaf"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "11457870a82224739a5b02e7645703613b7c207b"; } - { locale = "da"; arch = "linux-i686"; sha1 = "9d96c67f5b22e6f8c114dd39230c666778d872b6"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "bff7b7716f2195fbb8e746b8e65498283c872710"; } - { locale = "de"; arch = "linux-i686"; sha1 = "7de018d1749c18a37da19db55a3070ef84e62ce4"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "44fe11de7503409417ad9c7ae0bf39c425c2dc90"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "2f9a019ff89e8b20d22d2e22cf58002a4d627228"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "f708084b81a3a98ac64e0e2ea4b6f97fe48a7209"; } - { locale = "el"; arch = "linux-i686"; sha1 = "77ddde8a32e0d81d5d7e136324117a4e07aaf7f0"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "dce4f745d77da895075b10f921b445e0df349edd"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "7de8827e2929114f869af44e90dbac306b0ce9e7"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "ead42059b82f9ab565a34fa3d6b3bc0f5a211a50"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "765f0120c223d07e84bc3ebf00eeef2e2907640e"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "0a317d7a0926e29e6dc8c563cf09fe667141da7d"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "52629a4afcc9f3224e3a8fdd12f2385ffd21cf00"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d2fa0d6970a88de5125d89ae8263517a9bbc2346"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "fbd01eae326465a8f4efeb08ff44d27f04e2ed66"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "08b0f4d181ce1f0db0a799a7876315c6752c76af"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "1a6d77533438619715e37b43c97f131ac7066ac0"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "fae63a4b373d2074775dfa67ba7d4320cad59e61"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "6068e7326eddf2d36afdd20dee1dd433abb0e3d0"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "010544ad413acf7210c10aa3dc99ef0cdab6b475"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "0378eb7346f686a8a25c71febfd933f3080e7e29"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "01647b2981d62e2171f9e7b6e8286c542a00583a"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "0f6194bce1a065d7b41fd8a46c52ea38874e9e56"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "04f6cb55cb4f9171adf14c7a11ec0271d6c2cf3e"; } - { locale = "et"; arch = "linux-i686"; sha1 = "1da33a7e75efca19810ab7e739f2b81e0d48c379"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "44d8f989b04b16eff2bcf4945d3fa4387279dfc7"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "60306283826c048acb1ad0232e9c1461f49f2a95"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "16de3bde630a31c9330fd87ed7d994443371d84e"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "728780b2668bb107db51f3804a53923d1a7c8298"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "b31affd14286e7462e6c3bca472d88025c2b917b"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "52d009168db00b167df1890dee39580ccca36ab6"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "d65def2945ea4222965fa16e653cd0db8eec9454"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "f62e88efed3d68b1ad88dfe9e8111d213b2c713b"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "708ffd36d036b4c652ac1f20bf0cba2140035bc9"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "310076f077abdd7834f341091a9541a27ce1f6ce"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "5b2e56cf8173b5c4ab0949d9f5d099dbca8f27cb"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "de33f286bf9c6461335dc7cc9b997c6f52de34f6"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "b53848124a0d3d1d71a4e802d99a4344edd91e03"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "f3bdd90591fbaa6a15b1ae671e8633af3a2765ea"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c8594b0932650c5850a84a35953b7116c432d0a9"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "546818b38dc2e21afa2a51a29c2148bfe39ce33b"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "a70e63927324099122edc032bb699e058c1ef36c"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "75d6dc5dc3adc964be970dddc128e13baaac23dd"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "2eba733d65e7582a23d84392288d10336e978009"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "97285fae817794cc05e9a121c33aafeff77442cb"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "063536c1cbc29c430a8e01674f3bb62ed94e18d9"; } - { locale = "he"; arch = "linux-i686"; sha1 = "a4be53b79cd1027f517562a0723233643b6e2020"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "4fcaf3a6347beaac041f9095609a92c03700e911"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "80d5db7c9a65de398663b3dc659723b12cdbe502"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "920bd570abce26d713f11666852fcf5d37d00331"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "5de961d08a5bba30245b714271ab4ed5d24a3bc4"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "fb30c3ab5b224a38416eb783ee30c3aa8b4a743b"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "31113c1b61217820f9a9e3dcace821aef612edd7"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "381bce247ea65fee04ee94d56e70cd30cc6959bd"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "90515b7c36553cdf6b88b44146766c52d1a7acd5"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "be0542fc76fedf82b46031dbeb9f4173be2a5313"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "4389ed68236bdc4697f3c8e5c53fe986ccb5f277"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "0bb311890b604d1300ffa887984b4217cfb3b925"; } - { locale = "id"; arch = "linux-i686"; sha1 = "8415b519f19a3c52a5d8418046a7a67d118a38e1"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "e492caab12e6dace9dc763209a8b0803e8216d2f"; } - { locale = "is"; arch = "linux-i686"; sha1 = "663d406a587449f33561173d6e6d275964b9172d"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "0f649b13c2dad302b0cf449915f5c1a5ab7e198c"; } - { locale = "it"; arch = "linux-i686"; sha1 = "490aeed8cd9878d0f22ea99df674d1dbe134a6f3"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "2fbe0baed7379d717174be8dee4b879e6e4afd81"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "64144069a001bce53651aa5b8ec835c8c61bce1b"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "66563588c41fed8e542c89756dc235773c6d201b"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "c7e4a6544d4062958d48be26df3738b15871edcd"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "5a0c5b2dd2dfe83ea9551fd63c249bc6b41c8afc"; } - { locale = "km"; arch = "linux-i686"; sha1 = "5f8bbbd2b77447660022464d19b3bb316eeb6b53"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "8211373a9ab45f43f2a895049f49c2b9b7af3670"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "48b72a568ea55462d0d80194292ada525d24ee10"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "27fbe84930417244c900ae864589fd063358e741"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "f185c79195b7018edc97bd698d2f2f4f0f619968"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "bcb4ceb162ae954a6c79ac6e83655b981eb0c168"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "037516a147c18d03a74243ea680ec2da7b893b2f"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "1a2efb6b3253da2e525b25b1e5cf794da203a112"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "0200e608a4339158bafdafe32f39581d11ca4fea"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "b5dd68b8d170b577f49508db110a7e3ef9aa1504"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "5d9a22b515130e8c351fbbc71c5ee9c2586a98ca"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "2b49dc4f3e43c4812239798b9096f4e89c5dc101"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "530dfc4740f6c9c45163d51a49d4f6da8a1442c2"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "927c9ca797e463336a8a7c66fef59fa585a0e985"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "71984f44931f8c6e21a0e5a78d33301e9efd0c56"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "14df4792bebc70fb27aba0e8fa9fa570b3c66cd2"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "8301bc4d6919b849e1e0529d79fd56dfd7941e96"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "5f7f352c4c6a316bfd8aa825771178be5e15def0"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "2da181729cd1b9816d9530bfe2da47324595ceae"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "4665e54e425d3b783c2ef045c7d4908862a604db"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "48c57c3952cd918b4547f3aa17e52f856cb441d6"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "769b7e80547be03bc81153c56da69b0660672a5b"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c5123a9df2463883c38d748c360476ec16afafbd"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "50899fd2ddeeaa0011aa68f80ea23af808a2b13d"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "8d2fa9624fe78538ac3be7afef67b5f077ea9087"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "1ce05cc5d619ad8056720ee0a3aa1c142d323577"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "fc1e15e364b4b35ee097cb8a8e58f193cfab07fe"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "750189f10439b7d0592b5b1e5478571778a7b80c"; } - { locale = "or"; arch = "linux-i686"; sha1 = "562b5113560d43ab0332f12eb5b77f700adc3cac"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "7eea2b63095baaaf4077d21aec79a0262014231f"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "a474b711304003f7872f4d89482e460d6a5c6809"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b44b52752754082dafa7cc2fe3ab820c15ad9dee"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "5b4b8acd59a82feed1015e96efef60693bebc670"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "be13540ad54f006884e5b15c80e60c24739a3afd"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "289f94519a382e07e9ea85c09c50ee0c1e4c78f8"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "ee789e0347ae16caeb803db227f917c2dec7402f"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "fdef92aba85eb308f77d5d218eab13ce1869720d"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "dac1e72db319e193b014d53ec2a937939bfda4ee"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "8bdee17c004721832b978028c8249151522d1a53"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "876ea6b07a58dcab72cc431bd4a956f6631616a4"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "4de224d9b431e802274878b1ded2831a7976772d"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "a620baccf62ead31da80d384ea65db816240180f"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "979efbef49bbe7bdd21bb8b6cddf1c79d21e6d7c"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "cce4b5be59a7072aee27b27496cfd2b36995592e"; } - { locale = "si"; arch = "linux-i686"; sha1 = "64fce36b5536da41b0d6e2144b1d8458fd29c1ec"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "cdf1ccb39f324ada803ebc606ef86f96b813151b"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "a9933f868908c2dd361df41836c8af32e5849f48"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "5462d38f1ea28c5a0abf7523f039f5ae0b4e860a"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "a7e555402c5d7460696b86a2001333f66951a4b1"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "ded2864cea9cdb70f25eaea61d6be6d4d5aaf822"; } - { locale = "son"; arch = "linux-i686"; sha1 = "fe596ad2b09ada772a38e7504f56776ee382851e"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "c920476a3e726708b447a7c3f9b38223fb5c705c"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "16b4033cd9a05717ba5b32e57935a2a9b2e86e1e"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "dfbf24d40bd5c098aa4c00be18db9adeb278b8a1"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "18e143882f23f6bd2ea7b99849d840c5649b67da"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "c748cbc2444151a2df6dc497b26bb6107cf603a0"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "36abc5c42eaf284249612e2bcf5940aeedadc6b7"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "73e1b14a3f00d73f85aced9b83cc281da6fff8eb"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "621451f0be0f7d3edab0f4fdfaa2199d7e18941b"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "89a750bd28b600375823f92fac3c1ac28e26f24a"; } - { locale = "te"; arch = "linux-i686"; sha1 = "0cab27456eb5b5124a848c1fcda70e3d8f2fd9d9"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "80c1b1e5cc6385f1e8b6922024726c36bc3360fb"; } - { locale = "th"; arch = "linux-i686"; sha1 = "4c23cebce4f2548f8692d5d36ab4295bc05a4597"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "e06d1ae0f6dc90766de010102864da5cccca14df"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "0916aaa3a68831ad887708d13770e29edd129ea9"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "a875fa64a788e3fe4b115fc01ad47b631d8aba27"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "d9054dcf7d37ee6e88e462926d5f769bc1392342"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "da23b4a2c9e4434ff927c6af81a3c823e546c24e"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "ee12407db146542b1094342fd618678a8f6d20a3"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "e4c433f31561006c5ba891ca701a03713d30e115"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "07d95dbe0e967732a90b8c6dd1366010791a5286"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "18b0a04c1e38476d85457b0a79942dbe2a0b6b04"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "c4e1f30a92da9ded560209d9a4b8784ec19f9fa8"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "22bfdd2d772f6080dc569b86f27e736c38e99374"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "1d72f825659eec22f52cacdcf4f5890957e8a38e"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "cd1cea8be94c3c4318e0bf9c283acade45f846ff"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "8ddfad29ebeccdddd3e5cdff3d8167a671e6821c"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b4b36e9624ba93ddea2cca52d974acb67ba3407b"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "f5170ec868dd1aee22e42ce5df62714cd5bd0272"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "45cc71012e2c9423f53a9ba501087dc8d47e6b8a"; } + { locale = "af"; arch = "linux-i686"; sha1 = "d9677f0ad122cc64a99638397d52177d6df20128"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "7516c969fe2d572d1f9ef9d4de523e3d6caa88e1"; } + { locale = "an"; arch = "linux-i686"; sha1 = "d4ad4e5f5f7469b0fea1650b4104bf888cb5c15b"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "70bbff8841cc16f77c5095bd5b1069cb00c5f1cc"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "efa4ed982bf62ffdfc665bb87d658936d8db5776"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "0f9f7ade25f478081ba4c727aecd9984aee4df70"; } + { locale = "as"; arch = "linux-i686"; sha1 = "eb2367bf83ac5dbd2ee8878321b52db10d3639ad"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "e08846464bc3ff55d6964d19d737d0039322100f"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "86304c1e29b9c5231767bd401273ec68046c76b2"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "920f441939469910ddc938036cde2ab509cb2343"; } + { locale = "az"; arch = "linux-i686"; sha1 = "1f8520b21a3addb7f75068cc10a7b8e33b8ca518"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "177e632d49f6c1d97e5f1597e23ce11dca07e0e5"; } + { locale = "be"; arch = "linux-i686"; sha1 = "142285626aa67c743c5713b6a65e153fe0a641e0"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "7d49ab01ed0c42bca581bf86b3e8e1ad5bbf7bf1"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "ab1b18aa69960298dfabd161f45d0a27795f0a1a"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "0993c19e4345d993bb94c2dd2b5e4a80c95c4a43"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "a23f101ec5f80a88720615daa367cf0c019da41c"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "5a192b64a22e21cc4e35342c06f90529e0677703"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "0c316e902d44dea1a0c6bdb021ac189207aa791a"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "fc72cd6c2fa14120b78f19e75271a3ab61795889"; } + { locale = "br"; arch = "linux-i686"; sha1 = "5c159e461a8bf96f2189a843786451c62e842a2b"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "236b0c31e5f0ebd147bab0b0b03be356316242db"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "515501f46ba1b02b076204a88954a31b2b2e7914"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "5c7a4a0a260b5b16dc972cc2e4acaf001b3cdd41"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "aa7ea9c8ec0c71445d89bf43031ac87951ea192f"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "b6d9e57dc189c5178bbb585091d133fc8c04e718"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "20fe53563a9c8c21a1e1c4095ac42ed0254bfbdd"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "eb763eefb704c57ac367b4d242695c28eed640b4"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "41c8826a12e642d0a4d073628a02ce3ef1ebd5fe"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "057359932d6526eaa463907513814e2767a21f7d"; } + { locale = "da"; arch = "linux-i686"; sha1 = "b347c71204d4257b0a4ac710644fa0dab1aa8325"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "c0e54aa74ae60b241435a80450f75a8246a472cd"; } + { locale = "de"; arch = "linux-i686"; sha1 = "1eb209d6512043b1a51c805fef9056d377fd23bb"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "de9ba01f5f29a704ee4e9ddd05d0072d340c40f3"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "17c154b2f579ee94efc222dc0ba790e8bd93f324"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "d6f14ca2d875559e8459967b103fde124ab2827b"; } + { locale = "el"; arch = "linux-i686"; sha1 = "6cece97d1faca809bb44cccf1b46c83ec9391ef7"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "a47eecbd48135bb114fcd7160d7368074501a260"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "e7a85809117d0092cc6532c781bfab915b3f16f6"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "62823bc5fed9ed5b86566e2f4ddfb9764d3c3b83"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "5d5fa02110c31f1b1cca53f23f00119bf404a06d"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "41909356a1f661a64cef3c3ae696b356084be5a7"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "077a01cd8a9205c025693eb0cb3055e997a1b40e"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "51c13e2eddbabd12d7d35bb7465003768991806e"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "a3851ca2e53b4fb2be4b2bb05e5551037d11184d"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "103d1300b9fa071ae3c793874846c3cdff2c90c4"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "275d3c72a0b8e6905c97bc58ad7e51811e6e37d7"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "027749dee7e3541b0c29e4c8d1b27e7caa21044e"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "a1c918e6e4460b49e8efdb4e5999ef1e28db9a5c"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "6ebbb610c3614e308b5ee47a9b034292674b76ca"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "21d50757c31db0a1a608aff651971670b8f10ab2"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "f3549981b618fe6de379c1806ae8e5b4c088788e"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "8918a3ae0b1327a100bea927aaad7a6c0fdf35ed"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e40461a28eb7c1dfa0c9e3bbfd76fbf9f532ca9f"; } + { locale = "et"; arch = "linux-i686"; sha1 = "779f1a8399d47a9515e79028e3a0f12a9e9e791a"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "5c1c8be5bc86d386a938d6ad1080d0fd8a763c0d"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "5b8c59f4cf19d66bca5c34d51727717e0626ffd6"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "0e2ba0116a0976059b224321747eb34b91d229dd"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "3f1a0cab5c292d5319b852d4a974b17489b5516d"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "199a7f70e3fa43e910da21b5680368a8b0805fe5"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "7f54aa948b7b030e40019612ad5420d913d636d7"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "38aaae5894f1c9a9aec27a8be3d93239d754178e"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "338d3556673f77ee63f21cfaf5f58eaee4442181"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "f8bd7b421699d499aed052396b2bbaf98c050728"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "e2c58911aa0ff3b5bd98e83c758947c97d955503"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "9b50488ae97c01f2848e827cd842e17abd8b5d21"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "cceb0a3752bd584cd02b3f84f8c07bc27ec38eef"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "c6c0d21b8230fdd2b35b8da591b027a594ef60d0"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c662e5b2b59ce620754a845111bc58eab8e8a0ef"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "17e5c0a48e998c9e6f703033b386533ebd8354c0"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "9a4569025d500290a4e1db03bca59d5731ba1e85"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "3ca3494e510159ef1bb8e5c323a1b7c5b8faf235"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "0b331461d902100249ef67d9038023ed8001d513"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "1b11c8dfe0bdd4de77e03148fb1fe3ecbfb20677"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "03c09178f69f4040fe3817ba6d2fd40e98392aef"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "b0e6de684fcb7a47f7616f3071d09d89afbbcb80"; } + { locale = "he"; arch = "linux-i686"; sha1 = "e3d8f15caf7fa19df43e676a5cf93ca5e09ee27b"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "18441b8f340c0afe14f3869cc37ed041b911fb26"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "fb3627d0f89553741a8fbc3b7671309928832076"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "3da130031d183f003aa7c0fa3509f8982a4e70e1"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "e6e4909d66672c665cf86db494351354720d5682"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "027575c413be191f23b22f87a3db0ecdcb48b13c"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "24f5f3027708320a01d884ba7a91feac98c11f98"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "ede78b5b3ac15fec01de936dc722f25239dac5fb"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "816f5e910aea73d6e36470d3169f900cda2004e2"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "f5248943de5e8af2ed3e15fb85aa4429a7b97787"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "ae4e11326f3ad491ec2f823267be4c54a55f93cc"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "0ad1dce94bdc81f534399b00a09c004bac3c69c9"; } + { locale = "id"; arch = "linux-i686"; sha1 = "6568d4e201def196d457eaf13b6e4486ff70d336"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "45b74a17607f5d93d0062bb09c372afec0eedce6"; } + { locale = "is"; arch = "linux-i686"; sha1 = "d550eefe14d84cf91b3265675298f6c58cfbfe5c"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "0ddf532263b7f987867e640b278a9f2554e792cb"; } + { locale = "it"; arch = "linux-i686"; sha1 = "6cb353c7fbd9fc67571c5ba00b92d4760e33efaa"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "353d8e6e83f709d5ba5d26b1a42bc3cfca9997bf"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "e03b1ad563f75cfdec52b392a888c60d2f1438f0"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "5fad4f77e055e827ae948e9119d6c30e40ecd831"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "68b9b9d57b6a28000abfcb6363273888f6f4814a"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "09f3e62b0e084c26beabdb175232c3a46b8deba9"; } + { locale = "km"; arch = "linux-i686"; sha1 = "7bb71271eae1fecc328abd3a22f97eb8218f2ef4"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "c328d9f0ae6805aa5d1d4747c375a1f049e77252"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "51d910f52c22180e2a92be77c846303ed037a437"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "71411c26ed9c3a899c0e059301050acbcb96a751"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "74f5c7e44dfd537857b29297f27037a6a741cbdd"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "dcecd4c55763ec7441c37e048439dc1cb6ea480f"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "df8d745849099c514ad7b6c40b89e2a6f1333a54"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "d449eab057742d8798f2d255b4c3134f820e4379"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "9186dab13998c5d01e508fca536f36c1a4fc7dfb"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "11e28641755c2ee9648d46181f2861ef67937f53"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "552bd1ef40500c9a5e68b122c8b3525077ce5f6e"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "6a6403dd89318608b1436b7d42700054f9a6945a"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "ec3d4b155e58cfec6496fbd824a15dba9377e6ae"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "15c2e13971e05b8023826e96ad9d326dd254bbdc"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "7fb2263b3376b8f05ccf12672994919b6a0bdeee"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "67b91736a82ab8ce2c523ea084e9be2587d6ee9a"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "9558d57c27f08cf87e35d827bffdc1161505bdf8"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "07dd0613207de1b32d7ea7d057154a25f162c240"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "1f1138e747e86fd2408ae827f7785af9a46e49ec"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "6b9d24d1f1956fbe375d4850d977c8794b2094ce"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "d8c35c7542ad0c30ac06ba8c6670396eb4cba115"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "b885a83d29c8b7670bba999df6bcb67f6c9a13de"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "3fbd8181255cca312da88cadd088b6fe5edabaad"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "969f2d6715824ca22cb19a5c7c338d9b4e9cbc87"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "e8f99b167cc4d9101168c5d054e439fa00b53d66"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "121c2c1839fb65c242e719c05c2794fb80d3df29"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "b77b21a3d8fc78df630f9b412aad94e6bbf6045d"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bece8813404652dc07b4223d93cf925085a8c2d7"; } + { locale = "or"; arch = "linux-i686"; sha1 = "5c79f1aa2a5a4b9d173f8705000cb950764d308e"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "edb4f388e48f6a5e63e285f4fca64fd7053ea291"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "618063149909ead3828d509b3f4bdebe98f562c5"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a50d2f536cbf118ab1480d716f7729627c57e05c"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "e94e2d515b8aed6c24a5239f852b971eb7001202"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "58e2208b25a70586ae6aff1b58e9c25948622be0"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "732f7e366000509958fdd8065f67138ea38a55a6"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "2a6e341c14b8bc060e93e9fdbe20f6c7f14ffaeb"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "5f54ba5748c637d3a94558bc10e6fab3db1518ec"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "72e93c7a33b799c7067163cb7834ab2f93f851f5"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "8c47019cc0cb465431d207e1f8e499d00a7fe8d0"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "29bea7462e7b3295e1964ff472a295906e297925"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "2822d04eef821bbd35448b69f27f8e933def6f4e"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "9a31c8ce51c31d118de81ef9c7afbd2a0536a9e4"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "04a8a632f3cb50445091baa52aced77cfb00f4e2"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "1de49f0817c3a7c6cf4f58f72c10203a8b5a59ba"; } + { locale = "si"; arch = "linux-i686"; sha1 = "f7983c4ce6a6d8b30ae0f55228cc9e3a25ae3971"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "f5cd2cc05d03d34d6284468c08ba76f7ac95b6ef"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "dbe36a51050b2efb613318d81da0df2e32a7361c"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "77dcba31255d019e19c01dc1131b4a2364817e6b"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "42976aa670cf12730ac548603f6a84fde0dd4152"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "7f3d486be4782a5a9a85fbbcccb30cd7f020b0a6"; } + { locale = "son"; arch = "linux-i686"; sha1 = "5becaf85ea5b992798e1bf2561f3771d23676d9d"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "56f32e6524b0d16ba7e3aeb1fde7d9d56fae67e6"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "654860607a653d13895c188d6d7acba8a3cd3342"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "859f9e3fda8e9952dd33e67f619124af6a8f3147"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "e5b06f11813d3e7e1bce62a20c85a3e860828e0a"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "fa2167558158241844e2061cb28c7890bef939ac"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "71c099a731af87a46dfb153b7ba3ea9a5d188fb4"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "f1a151abc610c75ce54fddfc0649e1e361469d01"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "feff271a83d4ed97c754c7502033d5d5d7af8082"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "1976cdbf1153579bc97e00595ce60f93732ee85c"; } + { locale = "te"; arch = "linux-i686"; sha1 = "063c1c55aad4f055cba90292dd231ef037b6add1"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "d04d784383d0bf4a6cf10750c1e2d2dce280e8ad"; } + { locale = "th"; arch = "linux-i686"; sha1 = "4b453bd313d45386d5d99b935e24289bd4c51f25"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "784c38a90182d136407a056892349607b414bdd3"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "bcbc685a2122c23460d8d2ac4e807fdccd75b8e9"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "167ffbf3547713c6f236f9c661de8b239699070d"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "ebd2e78cd94454a58757ff093b3ee84faf08e7b8"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "6b8f59fefb8d37750a311614f8403f5be989917f"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "5a799fd0f5cdcab2580f14dc107a43160e065092"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "c28fe123246a378035ee6ceee3e2d33d0412e874"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "2cdc27ce098519017e006e2cdfb4b4d883264050"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "b5891e4e1284ea3e1a2ee7dc60a60ad5460b65e5"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "ce010fe5110e0dd6b3763d23c460d74ec7bfcaad"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "231a10effa87e4a5d8848a175a4016e104c1cbaf"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "d40f8e841323cd2cb99392514e6e5daae7ab9246"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "5bf94401578d12e01a0f4a4911472efbae95f5c9"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "1e96feab226294cb6170bd4c707d97c6298db91e"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "c7a7698cec959f3592c9cf2e7f3f425016281c04"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 12d581b1566..ce5eac7a2ff 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs +, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx @@ -22,7 +22,9 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; + url = + let ext = if lib.versionAtLeast version "41.0" then "xz" else "bz2"; + in "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.${ext}"; inherit sha1; }; @@ -39,11 +41,11 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + python dbus dbus_glib pango freetype fontconfig xorg.libXi + xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file + alsaLib nspr nss libnotify xorg.pixman yasm mesa + xorg.libXScrnSaver xorg.scrnsaverproto pysqlite + xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx /* cairo */ gstreamer gst_plugins_base icu libpng jemalloc libpulseaudio # only headers are needed @@ -77,6 +79,7 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec { "--disable-installer" "--disable-updater" "--enable-jemalloc" + "--disable-gconf" ] ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] @@ -137,14 +140,14 @@ in { firefox = common { pname = "firefox"; - version = "40.0.3"; - sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13"; + version = "41.0"; + sha1 = "0ce7a5ccdf671a6c98eaac07d06d49a895a99449"; }; firefox-esr = common { pname = "firefox-esr"; - version = "38.2.1esr"; - sha1 = "c596174e7273be5079bf55aecde33ec191d99538"; + version = "38.3.0esr"; + sha1 = "57d2c255348ac13b6ffbb952c5e0d57757aa0290"; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix index 05e3a8bf613..ba40925e1d1 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11 +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, xlibsWrapper , GConf, gnome_mplayer, mplayer, gmtk }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49"; }; - buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser gmtk ]; + buildInputs = [ pkgconfig glib dbus dbus_glib browser xlibsWrapper GConf browser gmtk ]; # !!! fix this preBuild = diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index c90c13b190d..7f2190ab82c 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2 }: +{ stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2, + gst_plugins_base, gst_plugins_good, gst_ffmpeg }: let version = "0.4.0"; in @@ -19,6 +20,12 @@ buildPythonPackage { python pyyaml pyqt5 jinja2 pygments pypeg2 ]; + makeWrapperArgs = '' + --prefix GST_PLUGIN_PATH : "${stdenv.lib.makeSearchPath "lib/gstreamer-0.10" + [ gst_plugins_base gst_plugins_good gst_ffmpeg ]}" + --prefix QT_PLUGIN_PATH : "${qt5.multimedia}/lib/qt5/plugins" + ''; + meta = { homepage = https://github.com/The-Compiler/qutebrowser; description = "Keyboard-focused browser with a minimal GUI"; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index ade28b519bc..d8c421af46a 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -3,12 +3,12 @@ , graphicsSupport ? false , mouseSupport ? false , ncurses, openssl ? null, boehmgc, gettext, zlib -, imlib2 ? null, x11 ? null, fbcon ? null +, imlib2 ? null, xlibsWrapper ? null, fbcon ? null , gpm-ncurses ? null }: assert sslSupport -> openssl != null; -assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null); +assert graphicsSupport -> imlib2 != null && (xlibsWrapper != null || fbcon != null); assert mouseSupport -> gpm-ncurses != null; stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ncurses boehmgc gettext zlib] ++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional mouseSupport gpm-ncurses - ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon]; + ++ stdenv.lib.optionals graphicsSupport [imlib2 xlibsWrapper fbcon]; configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}" + stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb"; diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix index 37c0b4a694d..770f0952e1f 100644 --- a/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}: +{stdenv, fetchurl, which, tcl, tk, xlibsWrapper, libpng, libjpeg, makeWrapper}: stdenv.mkDerivation { name = "amsn-0.98.9"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static"; - buildInputs = [which tcl tk x11 libpng libjpeg makeWrapper]; + buildInputs = [which tcl tk xlibsWrapper libpng libjpeg makeWrapper]; postInstall = '' wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index c6551307df9..6dc0df03eef 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, xlibs, freetype, fontconfig, openssl, glib +{ stdenv, fetchurl, libtool, xorg, freetype, fontconfig, openssl, glib , mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid , libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra , makeWrapper, libredirect, xkeyboard_config, xcbutilkeysyms }: @@ -10,18 +10,18 @@ let rpath = stdenv.lib.makeSearchPath "lib" [ stdenv.glibc libtool - xlibs.libXext - xlibs.libSM - xlibs.libICE - xlibs.libX11 - xlibs.libXft - xlibs.libXau - xlibs.libXdmcp - xlibs.libXrender - xlibs.libXfixes - xlibs.libXcomposite - xlibs.libxcb - xlibs.libXi + xorg.libXext + xorg.libSM + xorg.libICE + xorg.libX11 + xorg.libXft + xorg.libXau + xorg.libXdmcp + xorg.libXrender + xorg.libXfixes + xorg.libXcomposite + xorg.libxcb + xorg.libXi freetype fontconfig openssl diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 494f40f804e..d7b98d535af 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk # Optional, Jitsi still runs without, but you may pass null: -, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xlibs +, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg }: assert stdenv.isLinux; @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { gtk2 libpulseaudio openssl - ] ++ lib.optionals (xlibs != null) [ - xlibs.libX11 - xlibs.libXext - xlibs.libXScrnSaver - xlibs.libXv + ] ++ lib.optionals (xorg != null) [ + xorg.libX11 + xorg.libXext + xorg.libXScrnSaver + xorg.libXv ]); buildInputs = [unzip ant jdk]; @@ -66,12 +66,12 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { homepage = https://jitsi.org/; description = "Open Source Video Calls and Chat"; - license = stdenv.lib.licenses.lgpl21Plus.shortName; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.khumba ]; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = [ maintainers.khumba ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 13798061b71..ece4b9f0e01 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype -, xorg, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null +, xorg, fontconfig, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null , libredirect, quazip, less, which, unzip }: @@ -12,7 +12,7 @@ let deps = [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama - xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio + xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio ]; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index d0cc333c71b..f9209f28cf2 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg -, bwidget, makeWrapper, x11 +, bwidget, makeWrapper, xlibsWrapper , withSitePlugins ? true , theme ? null }: @@ -62,7 +62,7 @@ in mkTkabber (main // { done ''; - buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries; + buildInputs = [ tcl tk xlibsWrapper makeWrapper ] ++ tclLibraries; meta = { homepage = "http://tkabber.jabber.ru/"; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 4ebfddf82e1..8e07bbf975b 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, makeWrapper, xlibs, qt5Full, gstreamer, zlib, sqlite, libxslt }: +{ fetchurl, stdenv, dpkg, makeWrapper, xorg, qt5Full, gstreamer, zlib, sqlite, libxslt }: assert stdenv.system == "x86_64-linux"; @@ -23,15 +23,15 @@ stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath [ qt5Full - xlibs.libX11 + xorg.libX11 gstreamer zlib sqlite - xlibs.libXrender + xorg.libXrender libxslt stdenv.cc.cc - xlibs.libXScrnSaver - xlibs.libXext + xorg.libXScrnSaver + xorg.libXext ]; installPhase = '' diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 5d6e0faad4a..96dd7bb9af0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, which, m4, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs +, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx [ pkgconfig which libpng gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + python dbus dbus_glib pango freetype fontconfig xorg.libXi + xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file + alsaLib nspr nss libnotify xorg.pixman yasm mesa + xorg.libXScrnSaver xorg.scrnsaverproto pysqlite + xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification cairo icu ] ++ [ m4 ]; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index b0c3e58cfbb..ea6d565a10b 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, dpkg, makeWrapper, which -,gcc, xlibs, qt4, zlib +,gcc, xorg, qt4, zlib , ...}: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; @@ -24,7 +24,7 @@ let deps = [ gcc.cc qt4 - xlibs.libX11 + xorg.libX11 zlib ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 9283072c0c1..be1729b57c9 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xlibs }: +{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }: let diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix new file mode 100644 index 00000000000..0aa3d6e51c3 --- /dev/null +++ b/pkgs/applications/science/logic/metis-prover/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, perl, mlton }: + +stdenv.mkDerivation rec { + name = "metis-prover-${version}"; + version = "2.3"; + + src = fetchurl { + url = "http://www.gilith.com/software/metis/metis.tar.gz"; + sha256 = "07wqhic66i5ip2j194x6pswwrxyxrimpc4vg0haa5aqv9pfpmxad"; + }; + + nativeBuildInputs = [ perl ]; + buildInputs = [ mlton ]; + + patchPhase = "patchShebangs scripts/mlpp"; + + buildPhase = "make mlton"; + + installPhase = '' + install -Dm0755 bin/mlton/metis $out/bin/metis + ''; + + meta = with stdenv.lib; { + description = "Automatic theorem prover for first-order logic with equality"; + homepage = http://www.gilith.com/research/metis/; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 3c7f758d91b..7573b8955b1 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -12,7 +12,7 @@ , opencv , openssl , unixODBC -, xlibs +, xorg , zlib }: @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { opencv openssl unixODBC - ] ++ (with xlibs; [ + ] ++ (with xorg; [ libX11 libXext libXtst diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 39f2409a987..233323fceef 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -12,7 +12,7 @@ , opencv , openssl , unixODBC -, xlibs +, xorg , zlib , libxml2 , libuuid @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { unixODBC libxml2 libuuid - ] ++ (with xlibs; [ + ] ++ (with xorg; [ libX11 libXext libXtst diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index bbb34e08c46..8482bd6fe94 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -8,7 +8,7 @@ , ocaml, withOCaml ? false #, withJava ? false #, atlasMath, withAtlas ? false -, x11, withX ? false +, xlibsWrapper, withX ? false }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [gfortran ncurses] ++ lib.optionals withGtk [gtk] ++ lib.optionals withOCaml [ocaml] - ++ lib.optionals withX [x11] + ++ lib.optional withX xlibsWrapper ; @@ -58,11 +58,7 @@ stdenv.mkDerivation rec { # do not compile Java interface + " --without-java" # use the X Window System - + (lib.optionalString withX " - --with-x - --x-libraries=${x11}/lib - --x-includes=${x11}/include - ") + + lib.optionalString withX "--with-x" ; makeFlags = "all"; diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index 3741187067d..5357ff09b21 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, -doxygen, boost, openscenegraph, gnome, pangox_compat, xlibs, git, bash, gtk, makeWrapper }: +doxygen, boost, openscenegraph, gnome, pangox_compat, xorg, git, bash, gtk, makeWrapper }: let @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [autoconf cmake automake libtool gfortran clang gnumake hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison - doxygen boost openscenegraph gnome.gtkglext pangox_compat xlibs.libXmu + doxygen boost openscenegraph gnome.gtkglext pangox_compat xorg.libXmu git gtk makeWrapper]; patchPhase = '' diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 12ca1434466..6a365dc69a5 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -51,13 +51,13 @@ rec { qgit = import ./qgit { inherit fetchurl stdenv; - inherit (xlibs) libXext libX11; + inherit (xorg) libXext libX11; qt = qt4; }; qgitGit = import ./qgit/qgit-git.nix { inherit fetchurl sourceFromHead stdenv; - inherit (xlibs) libXext libX11; + inherit (xorg) libXext libX11; qt = qt4; }; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 2c29ce82de5..0710e38c941 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.5.2"; + version = "2.5.3"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "16qcli3cip1ixbrxrb3hhvvgx6ppy4anig83wz7aqlfy1sln0isb"; + sha256 = "06is8pq8gsia3dav8mgl2zlvms2ny4hs1x0w2792ya51azc2jk8j"; }; patches = [ diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix new file mode 100644 index 00000000000..43df0e5b885 --- /dev/null +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchzip, buildPythonPackage }: + +buildPythonPackage rec { + name = "gitinspector-${version}"; + version = "0.4.1"; + namePrefix = ""; + + src = fetchzip { + url = "https://github.com/ejwa/gitinspector/archive/v${version}.tar.gz"; + sha256 = "07kjvf9cj6g6gvjgnnas5facm3nhxppf0l0fcxyd4vq6xhdb3swp"; + name = name + "-src"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/ejwa/gitinspector; + description = "Statistical analysis tool for git repositories"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 9e0a093c958..db29360c9ec 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null; stdenv.mkDerivation (rec { - version = "1.9.1"; + version = "1.9.2"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - sha1 = "1244a741dbcf24f2b1d165225f0159a0c994e37a"; + sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 5a170047e8f..f53ce93328b 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -3,7 +3,7 @@ , gst_ffmpeg, speex , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , boost, freetype, agg, dbus, curl, pkgconfig, gettext -, glib, gtk, gtkglext, pangox_compat, x11, ming, dejagnu, python, perl +, glib, gtk, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl , freefont_ttf, haxe, swftools , lib, makeWrapper , xulrunner }: @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # XXX: KDE is supported as well so we could make it available optionally. buildInputs = [ - gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good + gettext xlibsWrapper SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg speex libtool libogg libxml2 libjpeg mesa libpng libungif boost freetype agg dbus curl pkgconfig glib gtk gtkglext pangox_compat diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index cd157a473e6..4320022192a 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, qt4, x11, libpulseaudio, fftwSinglePrec +{ stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec , lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sourceRoot = "${name}/mythtv"; buildInputs = [ - freetype qt4 lame zlib x11 mesa perl alsaLib libpulseaudio fftwSinglePrec + freetype qt4 lame zlib xlibsWrapper mesa perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib ]; diff --git a/pkgs/applications/video/tvtime/default.nix b/pkgs/applications/video/tvtime/default.nix index 2ec5e813c41..459ea533dba 100644 --- a/pkgs/applications/video/tvtime/default.nix +++ b/pkgs/applications/video/tvtime/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibs, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau, +{stdenv, fetchurl, xorg, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau, libXdmcp, zlib, libpng, libxml2, freetype, libICE, intltool, libXinerama, gettext, pkgconfig, kernel, file, libXi}: @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { ''; configureFlags = '' - --x-includes=${xlibs.libX11}/include - --x-libraries=${xlibs.libX11}/lib + --x-includes=${xorg.libX11}/include + --x-libraries=${xorg.libX11}/lib ''; buildInputs = [ libX11 libXtst libSM libXext libXv libXxf86vm libXau libXdmcp zlib libpng libxml2 freetype libICE intltool libXinerama gettext pkgconfig file libXi ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 80aa1b3c5c3..732d8cd8a0a 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray +{ stdenv, fetchurl, xz, bzip2, perl, xorg, libdvdnav, libbluray , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva - xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms + xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate ] ++ (if withQt5 then with qt5; [ base ] else [qt4]) diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 6ae4100c827..fd7b31de16e 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xlibs, libpng, xineLib, readline, ncurses, curl +{stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl , lirc, shared_mime_info, libjpeg }: stdenv.mkDerivation rec { @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ xineLib libpng readline ncurses curl lirc libjpeg - xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto - xlibs.libXinerama xlibs.libXi xlibs.libXft + xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.inputproto + xorg.libXinerama xorg.libXi xorg.libXft ]; patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index cfe4ad3a8e1..e8c6b39f493 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, autoconf, automake, libmspack, openssl, pam, xercesc, icu, libdnet, procps, - x11, libXinerama, libXi, libXrender, libXrandr, libXtst, + xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst, pkgconfig, glib, gtk, gtkmm }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation { buildInputs = [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps - pkgconfig glib gtk gtkmm x11 libXinerama libXi libXrender libXrandr libXtst ]; + pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ]; patchPhase = '' sed -i s,-Werror,,g configure.ac diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 2ff66d843ca..71c26c5f99c 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl , libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2 , lvm2, utillinux, procps, texinfo, perl, pythonPackages -, glib, bridge-utils, xlibs, pixman, iproute, udev, bison +, glib, bridge-utils, xorg, pixman, iproute, udev, bison , flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl , checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice , spice_protocol, usbredir, alsaLib, quilt @@ -66,7 +66,7 @@ stdenv.mkDerivation { [ which zlib pkgconfig SDL openssl libuuid gettext ncurses dev86 iasl pciutils bzip2 xz texinfo perl yajl pythonPackages.python pythonPackages.wrapPython - glib bridge-utils pixman iproute udev bison xlibs.libX11 + glib bridge-utils pixman iproute udev bison xorg.libX11 flex ocaml ocamlPackages.findlib figlet libaio checkpolicy pythonPackages.markdown transfig glusterfs acl cmake spice spice_protocol usbredir diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index c57a89193b5..9c9d3d5f451 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf -, xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs +, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen @@ -46,15 +46,15 @@ stdenv.mkDerivation rec { pango pkgconfig xcb-util-cursor - xlibs.libXau - xlibs.libXdmcp - xlibs.libxcb - xlibs.libxshmfence - xlibs.xcbutil - xlibs.xcbutilimage - xlibs.xcbutilkeysyms - xlibs.xcbutilrenderutil - xlibs.xcbutilwm + xorg.libXau + xorg.libXdmcp + xorg.libxcb + xorg.libxshmfence + xorg.xcbutil + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm #xmlto docbook_xml_dtd_45 docbook_xsl ]; diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 7a467b1fcdb..f4199073077 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, lua, gettext, groff }: +{ stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }: stdenv.mkDerivation { name = "ion-3-20090110"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz; sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; - buildInputs = [ x11 lua gettext groff ]; + buildInputs = [ xlibsWrapper lua gettext groff ]; buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; installFlags = "PREFIX=\${out}"; } diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index cd43c06d33e..2177d1a871f 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -4,7 +4,7 @@ stdenv, fetchurl, lua, gettext, groff, pkgconfig, busybox, - x11, libXinerama, libXrandr, libX11 + xlibsWrapper, libXinerama, libXrandr, libX11 }: assert enableXft -> libXft != null; @@ -26,7 +26,7 @@ stdenv.mkDerivation { patches = patches ++ stdenv.lib.optional enableXft ./notion-xft_nixos.diff; postPatch = "substituteInPlace system-autodetect.mk --replace '#PRELOAD_MODULES=1' 'PRELOAD_MODULES=1'"; - buildInputs = [x11 lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft; + buildInputs = [xlibsWrapper lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft; buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; installFlags = "PREFIX=\${out}"; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 39d942362be..236baa131c9 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -17,20 +17,20 @@ buildPythonPackage rec { substituteInPlace libqtile/manager.py --subst-var-by out $out ''; - buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xlibs.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ]; + buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ]; cairocffi-xcffib = python27Packages.cairocffi.override { - LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib"; + LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib"; pythonPath = [ python27Packages.xcffib ]; }; pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline ]; - LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib"; + LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib"; postInstall = '' wrapProgram $out/bin/qtile \ - --prefix LD_LIBRARY_PATH : ${pkgs.xlibs.libxcb}/lib \ + --prefix LD_LIBRARY_PATH : ${pkgs.xorg.libxcb}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.glib}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.cairo}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.pango}/lib diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 114b665225f..862e8b0ea01 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb -, libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput +, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , libwebp ? null, xwayland ? null # beware of null defaults, as the parameters *are* supplied by callPackage by default @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm mtdev - libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva libwebp + wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm + mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva + libwebp ]; configureFlags = [ diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 63691899209..dc6de05bb69 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -18,7 +18,6 @@ _separateDebugInfo() { # Skip non-ELF files. exec 10< "$i" read -n 4 -u 10 magic - if [[ "$magic" =~ ELF ]]; then echo FOO; fi exec 10<&- # Extract the Build ID. FIXME: there's probably a cleaner way. @@ -31,7 +30,15 @@ _separateDebugInfo() { # Extract the debug info. header "separating debug info from $i (build ID $id)" mkdir -p "$dst/${id:0:2}" - objcopy --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" + objcopy --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" --compress-debug-sections strip --strip-debug "$i" done } + +# - We might prefer to compress the debug info during link-time already, +# but our ld doesn't support --compress-debug-sections=zlib (yet). +# - Debug info may cause problems due to excessive memory usage during linking. +# Using -Wa,--compress-debug-sections should help with that; +# further interesting information: https://gcc.gnu.org/wiki/DebugFission +# - Another related tool: https://fedoraproject.org/wiki/Features/DwarfCompressor + diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index ccfb43b14d5..a6c77deb12e 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xlibs }: +{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xorg }: stdenv.mkDerivation rec { version = "0.1.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - xlibs.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive + xorg.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive ]; configurePhase = '' diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index a231d3b93c1..bb07596ab97 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -96,7 +96,16 @@ rec { sha256 = "1pa94gw2y0b6p8r81zbjzcjgi5nrx4dqrqr6mk98wj6jbi465sh2"; }; - buildInputs = [ optipng cairo fontforge pythonPackages.nototools pythonPackages.fonttools pkgconfig ]; + buildInputs = with pythonPackages; [ + optipng cairo fontforge python nototools fonttools pkgconfig + ]; + + #FIXME: perhaps use our pngquant instead + preConfigure = '' + for f in ./*.py ./third_party/pngquant/configure; do + patchShebangs "$f" + done + ''; preBuild = '' export PYTHONPATH=$PYTHONPATH:$PWD @@ -116,4 +125,4 @@ rec { maintainers = with maintainers; [ mathnerd314 ]; }; }; -} \ No newline at end of file +} diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index db1f8806891..b56b7a32d49 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 = "2015-09-14"; + version = "2015-09-22"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; @@ -27,10 +27,10 @@ stdenv.mkDerivation { "0f3y1cpjfd4q55a2kvhzsklmmp6k19v9vsdsjxr4sapc8f5fgfc9"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "1f3jrvh2ivwgvx52r2n62dhyr0gb418q3gzra2108ygdxcm0105h"; + "02vd80bg1hz458i7zfhvr50za1m97l6cqnwsabbby4v09pnlh50v"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "16kvbv63l7cn7032b3gvpzjcb5w9fliyrwirn8sxyad8gywkxznw"; + "1gs79avdx30is31mki82nz66l553ksaiwqcdbrd770ayy85v9pnj"; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index 10b69647c0e..16c934b3b3a 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: stdenv.mkDerivation rec { @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-libav libpulseaudio libsndfile xlibs.libXcursor xlibs.printproto - xlibs.libX11 udev utillinuxCurses ]; + gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto + xorg.libX11 udev utillinuxCurses ]; - propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite - xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext - bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr - xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat luajit + propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xorg.libXcomposite + xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext + bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr + xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm libinput ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "ac_ct_CXX=foo" ]; - NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; + NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; patches = [ ./efl-elua.patch ]; diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix index 7a350d7396b..e4396073c03 100644 --- a/pkgs/desktops/e19/enlightenment.nix +++ b/pkgs/desktops/e19/enlightenment.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, e19, xlibs, libffi, pam, alsaLib, luajit, bzip2 +{ stdenv, fetchurl, pkgconfig, e19, xorg, libffi, pam, alsaLib, luajit, bzip2 , libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }: stdenv.mkDerivation rec { @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; sha256 = "1y83jnq01k9i328adgjgpfwgpvvd2a1ixpm029pjcar8p1mvgadi"; }; - buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb - xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 + buildInputs = [ pkgconfig e19.efl e19.elementary xorg.libXdmcp xorg.libxcb + xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" ]; preConfigure = '' diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 61f58719b27..5aa3d781e4b 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, x11, xlibs, dbus, imlib2, freetype }: +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorg, dbus, imlib2, freetype }: let version = "0.16.8.15"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ let version = "0.16.8.15"; in }; buildInputs = [pkgconfig imlib2 freetype - xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft ]; + xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXft ]; meta = { description = "Desktop shell built on the Enlightenment Foundation Libraries"; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index b278dadfe24..ff50bcd5e5c 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xlibs }: +{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xorg }: stdenv.mkDerivation rec { name = "gtkglext-1.2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lbz96jwz57hnn52b8rfj54inwpwcc9fkdq6ya043cgnfih77g8n"; }; - buildInputs = with xlibs; + buildInputs = with xorg; [ pkgconfig glib gtk mesa pango pangox_compat libX11 libXmu ]; # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index d230d19d588..961fb1c0a19 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango +{ stdenv, fetchurl, pkgconfig, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, libgnome_keyring, libglade }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = - [ xlibs.xlibs libxml2 GConf pango glib libgnome_keyring libglade libtool ]; + [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; } diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix index 042948b4fb7..ec9873390e5 100644 --- a/pkgs/desktops/plasma-5.3/default.nix +++ b/pkgs/desktops/plasma-5.3/default.nix @@ -128,7 +128,7 @@ let freetype glib gnugrep gnused gtk2 gtk3 libinput libssh modemmanager openconnect openexr pam pango qt4 samba socat substituteAll taglib utillinux wayland xapian - xkeyboard_config xlibs xorg; + xkeyboard_config xorg; boost = boost155; canberra = libcanberra; epub = ebook_tools; @@ -157,7 +157,7 @@ let breeze-qt4 = overrideDerivation super.breeze (drv: { name = "breeze-qt4-${version}"; - buildInputs = [ pkgs.xlibs.xproto pkgs.kde4.kdelibs pkgs.qt4 ]; + buildInputs = [ pkgs.xorg.xproto pkgs.kde4.kdelibs pkgs.qt4 ]; nativeBuildInputs = [ scope.cmake pkgs.pkgconfig ]; cmakeFlags = [ "-DUSE_KDE4=ON" @@ -194,18 +194,18 @@ let }; kwin = extendDerivation super.kwin { - buildInputs = with scope.xlibs; [ libICE libSM libXcursor ]; + buildInputs = with scope.xorg; [ libICE libSM libXcursor ]; patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ]; }; libkscreen = extendDerivation super.libkscreen { - buildInputs = [ scope.xlibs.libXrandr]; + buildInputs = [ scope.xorg.libXrandr]; }; plasma-desktop = extendDerivation super.plasma-desktop { buildInputs = with scope; [ canberra ] - ++ (with xlibs; [ libxkbfile libXcursor libXft ]); + ++ (with xorg; [ libxkbfile libXcursor libXft ]); patches = [ (scope.substituteAll { src = ./plasma-desktop/plasma-desktop-hwclock.patch; @@ -217,13 +217,13 @@ let xkb = scope.xkeyboard_config; }) ]; - NIX_CFLAGS_COMPILE = with scope.xlibs; + NIX_CFLAGS_COMPILE = with scope.xorg; lib.concatStringsSep " " [ "-I${xf86inputsynaptics}/include/xorg" "-I${xf86inputevdev}/include/xorg" "-I${xorgserver}/include/xorg" ]; - cmakeFlags = with scope.xlibs; [ + cmakeFlags = with scope.xorg; [ "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include" "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include" ]; @@ -231,7 +231,7 @@ let plasma-workspace = extendDerivation super.plasma-workspace { patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ]; - buildInputs = with scope.xlibs; [ libSM libXcursor scope.pam ]; + buildInputs = with scope.xorg; [ libSM libXcursor scope.pam ]; inherit (scope) bash coreutils gnused gnugrep socat; inherit (scope) kconfig kinit kservice qt5tools; @@ -246,11 +246,11 @@ let }; powerdevil = extendDerivation super.powerdevil { - buildInputs = [ scope.xlibs.libXrandr ]; + buildInputs = [ scope.xorg.libXrandr ]; }; sddm-kcm = extendDerivation super.sddm-kcm { - buildInputs = [ scope.xlibs.libXcursor ]; + buildInputs = [ scope.xorg.libXcursor ]; }; }; diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix index 6e479454459..1ddab2b0752 100644 --- a/pkgs/desktops/xfce/core/thunar.nix +++ b/pkgs/desktops/xfce/core/thunar.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; + patches = [ ./thunarx_plugins_directory.patch ]; + buildInputs = [ pkgconfig intltool gtk dbus_glib libstartup_notification libnotify libexif pcre udev diff --git a/pkgs/desktops/xfce/core/thunarx_plugins_directory.patch b/pkgs/desktops/xfce/core/thunarx_plugins_directory.patch new file mode 100644 index 00000000000..e1431d86b14 --- /dev/null +++ b/pkgs/desktops/xfce/core/thunarx_plugins_directory.patch @@ -0,0 +1,48 @@ +diff --git a/thunarx/thunarx-provider-factory.c b/thunarx/thunarx-provider-factory.c +index 31b8835..a3e7f4e 100644 +--- a/thunarx/thunarx-provider-factory.c ++++ b/thunarx/thunarx-provider-factory.c +@@ -141,12 +141,19 @@ static GList* + thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory) + { + ThunarxProviderModule *module; ++ const gchar *thunar_dir; + const gchar *name; + GList *modules = NULL; + GList *lp; + GDir *dp; + +- dp = g_dir_open (THUNARX_DIRECTORY, 0, NULL); ++ thunar_dir = g_getenv("THUNARX_MODULE_DIR"); ++ if (NULL == thunar_dir) ++ { ++ thunar_dir = THUNARX_DIRECTORY; ++ } ++ ++ dp = g_dir_open (thunar_dir, 0, NULL); + if (G_LIKELY (dp != NULL)) + { + /* determine the types for all existing plugins */ +diff --git a/thunarx/thunarx-provider-module.c b/thunarx/thunarx-provider-module.c +index 023ad2a..6c21997 100644 +--- a/thunarx/thunarx-provider-module.c ++++ b/thunarx/thunarx-provider-module.c +@@ -174,10 +174,17 @@ static gboolean + thunarx_provider_module_load (GTypeModule *type_module) + { + ThunarxProviderModule *module = THUNARX_PROVIDER_MODULE (type_module); ++ const gchar *thunar_dir; + gchar *path; ++ ++ thunar_dir = g_getenv("THUNARX_MODULE_DIR"); ++ if (NULL == thunar_dir) ++ { ++ thunar_dir = THUNARX_DIRECTORY; ++ } + + /* load the module using the runtime link editor */ +- path = g_build_filename (THUNARX_DIRECTORY, type_module->name, NULL); ++ path = g_build_filename (thunar_dir, type_module->name, NULL); + module->library = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + g_free (path); + diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index f2a9f848342..a9903c941bf 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -26,7 +26,8 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od libxfcegui4 = callPackage ./core/libxfcegui4.nix { }; thunar = callPackage ./core/thunar.nix { }; thunar_volman = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now - thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { }; + thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { }; + thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { }; tumbler = callPackage ./core/tumbler.nix { }; xfce4panel = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4 xfce4session = callPackage ./core/xfce4-session.nix { }; diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix new file mode 100644 index 00000000000..cf83386fa26 --- /dev/null +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig +, gtk +, thunar, python2 +}: + +stdenv.mkDerivation rec { + p_name = "thunar-dropbox-plugin"; + ver_maj = "0.2"; + ver_min = "1"; + name = "${p_name}-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "http://softwarebakery.com/maato/files/thunar-dropbox/thunar-dropbox-${ver_maj}.${ver_min}.tar.bz2"; + sha256 = "08vhzzzwshyz371yl7fzfylmhvchhv3s5kml3dva4v39jhvrpnkf"; + }; + + buildInputs = [ + pkgconfig + gtk + thunar python2 + ]; + + configurePhase = "python2 waf configure --prefix=$out"; + + buildPhase = "python2 waf"; + + installPhase = '' + python2 waf install + ''; + + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://softwarebakery.com/maato/thunar-dropbox.html; + description = "A plugin for thunar that adds context-menu items from dropbox"; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/compilers/cudatoolkit/generic.nix b/pkgs/development/compilers/cudatoolkit/generic.nix index d4970b278bb..a02c917ab24 100644 --- a/pkgs/development/compilers/cudatoolkit/generic.nix +++ b/pkgs/development/compilers/cudatoolkit/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib -, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc +, xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc # generic inputs , version, sha256, url ? null, ... } : @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { runtimeDependencies = [ ncurses expat python zlib glibc - xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext + xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext gtk2 glib fontconfig freetype unixODBC alsaLib ]; diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 5423c41f25b..0c270bfc099 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -29,7 +29,7 @@ , lens , parallel, safe, shelly, split, stringsearch, syb , tar, terminfo -, vector, yaml, fetchgit, Cabal +, vector, yaml, fetchgit, fetchFromGitHub, Cabal , alex, happy, git, gnumake, autoconf, patch , automake, libtool , cryptohash @@ -40,23 +40,27 @@ let version = "0.1.0"; ghcjsBoot = fetchgit { - url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "d435c60b62d24b7a4117493f7aaecbfa09968fe6"; # 7.10 branch - sha256 = "07vhmjz21ccnqccms003550xacmwb08pjdkhnjcwcbl2603v4na1"; + url = "git://github.com/ghcjs/ghcjs-boot.git"; + rev = "ec9f795b42b40fd24933d1672db153df5a29cc00"; # master branch + sha256 = "0bkvqlsgb9n0faayi4k1dlkn9cbm99a66m9nnx1kykb44qcl40yg"; fetchSubmodules = true; }; - shims = fetchgit { - url = git://github.com/ghcjs/shims.git; - rev = "0b670ca27fff3f0bad515c37e56ccb8b4d6758fb"; # master branch - sha256 = "19zq79f2y59lw7c8m100awh3rcra5yhbsvpb5xmp3mq6grac7h08"; + shims = fetchFromGitHub { + owner = "ghcjs"; + repo = "shims"; + rev = "01e01dee31a4786b3d01092e72350b0859a9f8c9"; # master branch + sha256 = "01m1yhq6l71azx0zqbpzmqc6rxxf654hgjibc0lz2cg5942wh1hf"; }; in mkDerivation (rec { pname = "ghcjs"; inherit version; - src = fetchgit { - url = git://github.com/ghcjs/ghcjs.git; - rev = "39c1cb6d5d2551b306a7957a0e7f682f4a048490"; # master branch - sha256 = "1v2hpmhdssgf1jmchiwkvp5j8j6rw3k0hpkf326vb8l1b0kbmibr"; + # `src` is ghcjs's a3157072c2593debf2e45e751e9a8aa90b860b4d plus this + # additional dependency bump: https://github.com/ghcjs/ghcjs/pull/408 + src = fetchFromGitHub { + owner = "k0001"; + repo = "ghcjs"; + rev = "1b767e0b3dabdd1561bd17314d472651bfd9b97c"; + sha256 = "0j4vj47qljbcbrp3md3jwxwl2kz9k85visq6yi1x8wdch4wb2kgy"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index eb1f6f668b1..4ff61b27878 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -39,6 +39,7 @@ in stdenv.mkDerivation rec { cmakeFlags = with stdenv; [ "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix index f4640b36e67..a2581f29a3f 100644 --- a/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/pkgs/development/compilers/ocaml/3.08.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11 }: +{ stdenv, fetchurl, xlibsWrapper }: stdenv.mkDerivation { name = "ocaml-3.08.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; configureScript = ./configure-3.08.0; dontAddPrefix = "True"; - configureFlags = ["-no-tk" "-x11lib" x11]; + configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; buildFlags = ["world" "bootstrap" "opt"]; checkTarget = ["opt.opt"]; } diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 69a6a1f5f67..2734bc3235d 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, ncurses }: +{ stdenv, fetchurl, xlibsWrapper, ncurses }: stdenv.mkDerivation (rec { @@ -10,9 +10,9 @@ stdenv.mkDerivation (rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk" "-x11lib" x11]; + configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; buildFlags = "world bootstrap world.opt"; - buildInputs = [x11 ncurses]; + buildInputs = [xlibsWrapper ncurses]; installTargets = "install installopt"; patchPhase = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index ce61e562139..c62a8151ef7 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = stdenv.isi686 || stdenv.isx86_64; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { ]; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; prePatch = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index e6ed6f4b73e..e9073a42cf0 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = !stdenv.isArm && !stdenv.isMips; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ]; preConfigure = '' diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index f8a7ed920a5..b366f20ffb6 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = !stdenv.isArm && !stdenv.isMips; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; preConfigure = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix index 882af287c04..6c2bc8cb9ca 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11 }: +{ stdenv, fetchurl, ncurses, xlibsWrapper }: let useX11 = stdenv.isi686 || stdenv.isx86_64; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ]; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; buildFlags = "core coreboot all"; # "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installFlags = "-i"; installTargets = "install"; # + optionalString useNativeCompilers " installopt"; prePatch = '' diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 9b340f69e90..6eca566dd2c 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, ncurses }: +{ stdenv, fetchurl, xlibsWrapper, ncurses }: stdenv.mkDerivation (rec { @@ -10,9 +10,9 @@ stdenv.mkDerivation (rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk" "-x11lib" x11]; + configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; buildFlags = "world bootstrap world.opt"; - buildInputs = [x11 ncurses]; + buildInputs = [xlibsWrapper ncurses]; installTargets = "install installopt"; patchPhase = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index f4944e45c0e..4e431d334cb 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -13,7 +13,7 @@ , requireFile , unzip , file -, xlibs ? null +, xorg ? null , installjdk ? true , pluginSupport ? true , installjce ? false @@ -34,7 +34,7 @@ }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -assert swingSupport -> xlibs != null; +assert swingSupport -> xorg != null; let @@ -173,8 +173,8 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ - (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.cc.cc] else []); + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ + (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; diff --git a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix index 84fdf63f359..1b33a40635a 100644 --- a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix @@ -3,14 +3,14 @@ , requireFile , unzip , makeWrapper -, xlibs ? null +, xorg ? null , installjdk ? true , pluginSupport ? true , installjce ? false }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -assert swingSupport -> xlibs != null; +assert swingSupport -> xorg != null; let @@ -73,10 +73,10 @@ stdenv.mkDerivation { */ libraries = [stdenv.cc.libc] ++ - (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []); + (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt] else []); inherit swingSupport pluginSupport architecture jce; - inherit (xlibs) libX11; + inherit (xorg) libX11; mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix index a4f70172e1f..00bfb3222e0 100644 --- a/pkgs/development/compilers/rustc/default.nix +++ b/pkgs/development/compilers/rustc/default.nix @@ -1,33 +1,27 @@ { stdenv, callPackage }: + callPackage ./generic.nix { - shortVersion = "1.2.0"; + shortVersion = "1.3.0"; isRelease = true; - srcSha = "1zq2nhgaxkv1ghi3z2qgff6cylqirn33nphvkjiczlkjfi0pyw16"; + configureFlags = [ "--release-channel=stable" ]; + srcSha = "14lhk40n9aslz8h8wj7fas5vsgyrb38b2r319q3hlvplgggdksg8"; /* Rust is bootstrapped from an earlier built version. We need to fetch these earlier versions, which vary per platform. The shapshot info you want can be found at https://github.com/rust-lang/rust/blob/{$shortVersion}/src/snapshots.txt - with the set you want at the top. + with the set you want at the top. Make sure this is the latest snapshot + for the tagged release and not a snapshot in the current HEAD. */ - # linux-i386 - snapshotHashLinux686 = "a6f22e481eabf098cc65bda97bf7e434a1fcc20b"; + snapshotHashLinux686 = "3459275cdf3896f678e225843fa56f0d9fdbabe8"; + snapshotHashLinux64 = "e451e3bd6e5fcef71e41ae6f3da9fb1cf0e13a0c"; + snapshotHashDarwin686 = "428944a7984c0988e77909d82ca2ef77d96a1fbd"; + snapshotHashDarwin64 = "b0515bb7d2892b9a58282fc865fee11a885406d6"; + snapshotDate = "2015-07-26"; + snapshotRev = "a5c12f4"; - # linux-x86_64 - snapshotHashLinux64 = "5fd8698fdfe953e6c4d86cf4fa1d5f3a0053248c"; - - # macos-i386 - snapshotHashDarwin686 = "9a273324a6b63a40f67a553029c0a9fb692ffd1f"; - - # macos-x86_64 - snapshotHashDarwin64 = "e5b12cb7c179fc98fa905a3c84803645d946a6ae"; - - snapshotDate = "2015-05-24"; - snapshotRev = "ba0e1cd"; - - patches = [ - ./patches/stable.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; - configureFlags = [ "--release-channel=stable" ]; + # cc-ar-opts.patch should be removable in 1.4.0+ + patches = [ ./patches/remove-uneeded-git.patch ./patches/cc-ar-opts.patch ] + ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; } diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index ee7d0c7749d..9df259cee8e 100644 --- a/pkgs/development/compilers/rustc/generic.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchgit, fetchzip, which, file, perl, curl, python27 -, makeWrapper, tzdata, git, valgrind, procps, coreutils +{ stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps +, llvmPackages_37, jemalloc, ncurses , shortVersion, isRelease , srcSha, srcRev ? "" @@ -15,15 +15,12 @@ assert !stdenv.isFreeBSD; /* Rust's build process has a few quirks : -- It requires some patched in llvm that haven't landed upstream, so it - compiles its own llvm. This might change in the future, so at some - point we may be able to switch to nix's llvm. - - The Rust compiler is written is Rust, so it requires a bootstrap compiler, which is downloaded during the build. To make the build pure, we download it ourself before and put it where it is expected. Once the language is stable (1.0) , we might want to - switch it to use nix's packaged rust compiler. + switch it to use nix's packaged rust compiler. This might not be possible + as the compiler is highly coupled to the bootstrap. NOTE : some derivation depend on rust. When updating this, please make sure those derivations still compile. (racer, for example). @@ -62,7 +59,7 @@ let version = if isRelease then meta = with stdenv.lib; { homepage = http://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy ]; + maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux; }; @@ -118,29 +115,43 @@ stdenv.mkDerivation { configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ] - # TODO always include starting from 1.3.0, superseeding patch and substituteInPlace below - ++ stdenv.lib.optional (!isRelease) [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${stdenv.cc.binutils}/bin/ar" ] + ++ [ "--llvm-root=${llvmPackages_37.llvm}" "--jemalloc-root=${jemalloc}/lib" ] + ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${stdenv.cc.binutils}/bin/ar" ] ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang"; inherit patches; postPatch = '' substituteInPlace src/rust-installer/gen-install-script.sh \ - --replace /bin/echo "${coreutils}/bin/echo" + --replace /bin/echo "$(type -P echo)" substituteInPlace src/rust-installer/gen-installer.sh \ - --replace /bin/echo "${coreutils}/bin/echo" + --replace /bin/echo "$(type -P echo)" # Workaround for NixOS/nixpkgs#8676 substituteInPlace mk/rustllvm.mk \ --replace "\$\$(subst /,//," "\$\$(subst /,/," - '' + stdenv.lib.optionalString (isRelease) '' - substituteInPlace src/librustc_back/target/mod.rs \ - --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" \ - --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar" - ''; # TODO remove in 1.3.0, superseeded by configure flags - buildInputs = [ which file perl curl python27 makeWrapper git ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ procps valgrind ]; + # Fix dynamic linking against llvm + sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py + + # Fix the configure script to not require curl as we won't use it + sed -i configure \ + -e '/probe_need CFG_CURLORWGET/d' + + # Useful debugging parameter + #export VERBOSE=1 + ''; + + preConfigure = '' + # Needed flags as the upstream configure script has a broken prefix substitution + configureFlagsArray+=("--datadir=$out/share") + configureFlagsArray+=("--infodir=$out/share/info") + ''; + + # Procps is needed for one of the test cases + nativeBuildInputs = [ file python2 ] + ++ stdenv.lib.optionals stdenv.isLinux [ procps ]; + buildInputs = [ llvmPackages_37.llvm ncurses ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 3b1cccee941..045a47e88de 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -1,18 +1,27 @@ # Please make sure to check if rustfmt still builds when updating nightly - { stdenv, callPackage }: + callPackage ./generic.nix { - shortVersion = "2015-09-05"; + shortVersion = "2015-09-21"; isRelease = false; - # src rev for 2015-09-05's nightly channel - srcRev = "779b2a9847319106647dcad12fc6dc472bc0cf4d"; - srcSha = "0m22lxpcjnwa68bpxhfvp07k52gyds8ykif2pf5r2x22lw28vbg3"; + srcRev = "547fd5c11e6902e2f9748e7b46893211b36da421"; + srcSha = "10wklbxz6f4ga9q2rxghih18xdw6xm01bay6c13y72c4bwlnkm2w"; + + /* Rust is bootstrapped from an earlier built version. We need + to fetch these earlier versions, which vary per platform. + The shapshot info you want can be found at + https://github.com/rust-lang/rust/blob/{$shortVersion}/src/snapshots.txt + with the set you want at the top. + */ + snapshotHashLinux686 = "e2553bf399cd134a08ef3511a0a6ab0d7a667216"; snapshotHashLinux64 = "7df8ba9dec63ec77b857066109d4b6250f3d222f"; snapshotHashDarwin686 = "29750870c82a0347f8b8b735a4e2e0da26f5098d"; snapshotHashDarwin64 = "c9f2c588238b4c6998190c3abeb33fd6164099a2"; snapshotDate = "2015-08-11"; snapshotRev = "1af31d4"; - patches = stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; + + patches = [ ./patches/remove-uneeded-git.patch ] + ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec-head.patch; } diff --git a/pkgs/development/compilers/rustc/patches/cc-ar-opts.patch b/pkgs/development/compilers/rustc/patches/cc-ar-opts.patch new file mode 100644 index 00000000000..e73d54de8f5 --- /dev/null +++ b/pkgs/development/compilers/rustc/patches/cc-ar-opts.patch @@ -0,0 +1,57 @@ +From c97759699264c6b1fa0e88420cd3c720df25e594 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou +Date: Tue, 11 Aug 2015 01:09:21 +0200 +Subject: [PATCH] rustc_back: add configure options for default linker and ar + +Signed-off-by: Marc-Antoine Perennou +--- + configure | 4 ++++ + mk/target.mk | 4 ++++ + src/librustc_back/target/mod.rs | 4 ++-- + 3 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 071788c..dc9d7d7 100755 +--- a/configure ++++ b/configure +@@ -607,6 +607,10 @@ valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path" + valopt release-channel "dev" "the name of the release channel to build" + valopt musl-root "/usr/local" "MUSL root installation directory" + ++# Used on systems where "cc" and "ar" are unavailable ++valopt default-linker "cc" "the default linker" ++valopt default-ar "ar" "the default ar" ++ + # Many of these are saved below during the "writing configuration" step + # (others are conditionally saved). + opt_nosave manage-submodules 1 "let the build manage the git submodules" +diff --git a/mk/target.mk b/mk/target.mk +index aae66c4..408ab96 100644 +--- a/mk/target.mk ++++ b/mk/target.mk +@@ -13,6 +13,10 @@ + # this exists can be found on issue #2400 + export CFG_COMPILER_HOST_TRIPLE + ++# Used as defaults for the runtime ar and cc tools ++export CFG_DEFAULT_LINKER ++export CFG_DEFAULT_AR ++ + # The standard libraries should be held up to a higher standard than any old + # code, make sure that these common warnings are denied by default. These can + # be overridden during development temporarily. For stage0, we allow warnings +diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs +index d9cfdaa..542791a 100644 +--- a/src/librustc_back/target/mod.rs ++++ b/src/librustc_back/target/mod.rs +@@ -185,8 +185,8 @@ impl Default for TargetOptions { + fn default() -> TargetOptions { + TargetOptions { + data_layout: String::new(), +- linker: "cc".to_string(), +- ar: "ar".to_string(), ++ linker: option_env!("CFG_DEFAULT_LINKER").unwrap_or("cc").to_string(), ++ ar: option_env!("CFG_DEFAULT_AR").unwrap_or("ar").to_string(), + pre_link_args: Vec::new(), + post_link_args: Vec::new(), + cpu: "generic".to_string(), diff --git a/pkgs/development/compilers/rustc/patches/grsec-head.patch b/pkgs/development/compilers/rustc/patches/grsec-head.patch new file mode 100644 index 00000000000..b97b40c2409 --- /dev/null +++ b/pkgs/development/compilers/rustc/patches/grsec-head.patch @@ -0,0 +1,24 @@ +diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile +index b22f34f..c6489bd 100644 +--- a/src/test/run-make/relocation-model/Makefile ++++ b/src/test/run-make/relocation-model/Makefile +@@ -2,9 +2,11 @@ + + all: others + $(RUSTC) -C relocation-model=dynamic-no-pic foo.rs ++ paxctl -czexm $(TMPDIR)/foo + $(call RUN,foo) + + $(RUSTC) -C relocation-model=default foo.rs ++ paxctl -czexm $(TMPDIR)/foo + $(call RUN,foo) + + $(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs +@@ -16,6 +18,7 @@ others: + else + others: + $(RUSTC) -C relocation-model=static foo.rs ++ paxctl -czexm $(TMPDIR)/foo + $(call RUN,foo) + $(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs + endif diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch deleted file mode 100644 index 2425fff04a1..00000000000 --- a/pkgs/development/compilers/rustc/patches/head.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs -index 2772fc8..3d37b08 100644 ---- a/src/test/run-pass/issue-20797.rs -+++ b/src/test/run-pass/issue-20797.rs -@@ -97,7 +97,7 @@ impl Iterator for Subpaths { - } - - fn _foo() { -- let _walker: Subpaths = Subpaths::walk(&PathBuf::from("/home")).unwrap(); -+ let _walker: Subpaths = Subpaths::walk(&PathBuf::from("/tmp")).unwrap(); - } - - fn main() {} diff --git a/pkgs/development/compilers/rustc/patches/remove-uneeded-git.patch b/pkgs/development/compilers/rustc/patches/remove-uneeded-git.patch new file mode 100644 index 00000000000..3c68d777f88 --- /dev/null +++ b/pkgs/development/compilers/rustc/patches/remove-uneeded-git.patch @@ -0,0 +1,19 @@ +diff --git a/src/etc/tidy.py b/src/etc/tidy.py +index 9f5f919..a607180 100644 +--- a/src/etc/tidy.py ++++ b/src/etc/tidy.py +@@ -66,13 +66,9 @@ def interesting_file(f): + return any(os.path.splitext(f)[1] == ext for ext in interesting_files) + + +-# Be careful to support Python 2.4, 2.6, and 3.x here! +-config_proc = subprocess.Popen(["git", "config", "core.autocrlf"], +- stdout=subprocess.PIPE) +-result = config_proc.communicate()[0] + + true = "true".encode('utf8') +-autocrlf = result.strip() == true if result is not None else False ++autocrlf = False + + current_name = "" + current_contents = "" diff --git a/pkgs/development/compilers/rustc/patches/stable.patch b/pkgs/development/compilers/rustc/patches/stable.patch deleted file mode 100644 index e927d7a742a..00000000000 --- a/pkgs/development/compilers/rustc/patches/stable.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs -index 402fbcd..8fe2de2 100644 ---- a/src/librustc_back/target/mod.rs -+++ b/src/librustc_back/target/mod.rs -@@ -172,8 +172,8 @@ impl Default for TargetOptions { - /// incomplete, and if used for compilation, will certainly not work. - fn default() -> TargetOptions { - TargetOptions { -- linker: "cc".to_string(), -- ar: "ar".to_string(), -+ linker: "@ccPath@".to_string(), // ignore-tidy-linelength -+ ar: "@arPath@".to_string(), // ignore-tidy-linelength - pre_link_args: Vec::new(), - post_link_args: Vec::new(), - cpu: "generic".to_string(), -diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs -index 2772fc8..3d37b08 100644 ---- a/src/test/run-pass/issue-20797.rs -+++ b/src/test/run-pass/issue-20797.rs -@@ -97,7 +97,7 @@ impl Iterator for Subpaths { - } - - fn _foo() { -- let _walker: Subpaths = Subpaths::walk(&PathBuf::from("/home")).unwrap(); -+ let _walker: Subpaths = Subpaths::walk(&PathBuf::from("/tmp")).unwrap(); - } - - fn main() {} diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 90656b564c7..dc862940edf 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure ''; + configureFlags = "--with-openssl=${openssl}"; + preConfigure = '' export PGHEADER="${postgresql}/include/libpq-fe.h"; export MSHEADER="${mysql.lib}/include/mysql/mysql.h"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1c9ec499717..36324b91c7e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -30,6 +30,8 @@ core-packages: - xhtml-3000.2.1 default-package-overrides: + # Add overrides in this section only for packages that are *not* part of + # Stackage to make sure we're conforming to their preferred version list. extra-packages: - aeson < 0.8 # newer versions don't work with GHC 6.12.3 @@ -200,12 +202,19 @@ dont-distribute-packages: alms: [ i686-linux, x86_64-linux, x86_64-darwin ] alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] alpino-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa-core: [ x86_64-darwin ] + alsa-gui: [ x86_64-darwin ] alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa-mixer: [ x86_64-darwin ] alsa-pcm-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa-pcm: [ x86_64-darwin ] alsa-seq-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa-seq: [ x86_64-darwin ] altfloat: [ i686-linux, x86_64-linux, x86_64-darwin ] alure: [ i686-linux, x86_64-linux, x86_64-darwin ] + ALUT: [ x86_64-darwin ] + al: [ x86_64-darwin ] amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -353,6 +362,7 @@ dont-distribute-packages: bindings-codec2: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-common: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-dc1394: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-directfb: [ x86_64-darwin ] bindings-eskit: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-fann: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -365,7 +375,9 @@ dont-distribute-packages: bindings-libstemmer: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libv4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-linux-videodev2: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-lxc: [ x86_64-darwin ] bindings-mpdecimal: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-sane: [ x86_64-darwin ] bindings-sc3: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-sipc: [ i686-linux, x86_64-linux, x86_64-darwin ] bind-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -725,6 +737,7 @@ dont-distribute-packages: curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] cursedcsv: [ i686-linux, x86_64-linux, x86_64-darwin ] curves: [ i686-linux, x86_64-linux, x86_64-darwin ] + cv-combinators: [ x86_64-darwin ] CV: [ i686-linux, x86_64-linux, x86_64-darwin ] cypher: [ i686-linux, x86_64-linux, x86_64-darwin ] DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -818,6 +831,7 @@ dont-distribute-packages: dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-hsqml: [ x86_64-darwin ] diagrams-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-pgf: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-qrcode: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -869,6 +883,7 @@ dont-distribute-packages: doctest-discover: [ i686-linux, x86_64-linux, x86_64-darwin ] DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ] DOM: [ i686-linux, x86_64-linux, x86_64-darwin ] + dotfs: [ x86_64-darwin ] download: [ i686-linux, x86_64-linux, x86_64-darwin ] download-media-content: [ i686-linux, x86_64-linux, x86_64-darwin ] dph-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1056,6 +1071,7 @@ dont-distribute-packages: FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ] + foldl-transduce-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-transduce: [ i686-linux, x86_64-linux, x86_64-darwin ] folds-common: [ i686-linux, x86_64-linux, x86_64-darwin ] folds: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1084,6 +1100,7 @@ dont-distribute-packages: Frank: [ i686-linux, x86_64-linux, x86_64-darwin ] free-game: [ i686-linux, x86_64-linux, x86_64-darwin ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] + freenect: [ x86_64-darwin ] free-operational: [ i686-linux, x86_64-linux, x86_64-darwin ] freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1099,6 +1116,8 @@ dont-distribute-packages: fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] ftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] + FTGL-bytestring: [ x86_64-darwin ] + FTGL: [ x86_64-darwin ] ftp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] ftshell: [ i686-linux, x86_64-linux, x86_64-darwin ] full-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1217,6 +1236,7 @@ dont-distribute-packages: graphbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] GraphHammer-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] GraphHammer: [ i686-linux, x86_64-linux, x86_64-darwin ] + graphics-drawingcombinators: [ x86_64-darwin ] graphics-formats-collada: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1235,6 +1255,7 @@ dont-distribute-packages: greencard-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] greg-client: [ i686-linux, x86_64-linux, x86_64-darwin ] Grempa: [ i686-linux, x86_64-linux, x86_64-darwin ] + gridland: [ x86_64-darwin ] grm: [ i686-linux, x86_64-linux, x86_64-darwin ] Grow: [ i686-linux, x86_64-linux, x86_64-darwin ] GrowlNotify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1379,6 +1400,8 @@ dont-distribute-packages: hash: [ i686-linux, x86_64-linux, x86_64-darwin ] has: [ i686-linux, x86_64-linux, x86_64-darwin ] hasim: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskakafka: [ x86_64-darwin ] + haskanoid: [ x86_64-darwin ] haskarrow: [ i686-linux, x86_64-linux, x86_64-darwin ] haskeem: [ i686-linux, x86_64-linux, x86_64-darwin ] haskeline-class: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1475,6 +1498,7 @@ dont-distribute-packages: hcron: [ i686-linux, x86_64-linux, x86_64-darwin ] hCsound: [ i686-linux, x86_64-linux, x86_64-darwin ] hcube: [ i686-linux, x86_64-linux, x86_64-darwin ] + hcwiid: [ x86_64-darwin ] hdaemonize-buildfix: [ i686-linux, x86_64-linux, x86_64-darwin ] HDBC-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1531,6 +1555,7 @@ dont-distribute-packages: hfiar: [ i686-linux, x86_64-linux, x86_64-darwin ] hfractal: [ i686-linux, x86_64-linux, x86_64-darwin ] HFrequencyQueue: [ i686-linux, x86_64-linux, x86_64-darwin ] + HFuse: [ x86_64-darwin ] hfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] hgalib: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D-API: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1567,6 +1592,8 @@ dont-distribute-packages: H: [ i686-linux, x86_64-linux, x86_64-darwin ] hiccup: [ i686-linux, x86_64-linux, x86_64-darwin ] hichi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hidapi: [ x86_64-darwin ] + hid: [ x86_64-darwin ] hieraclus: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-clustering-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] hiernotify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1602,6 +1629,7 @@ dont-distribute-packages: HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlibBladeRF: [ x86_64-darwin ] hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ] hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1664,6 +1692,7 @@ dont-distribute-packages: hoovie: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencc: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencl: [ i686-linux, x86_64-linux, x86_64-darwin ] + HOpenCV: [ x86_64-darwin ] hOpenPGP: [ i686-linux, x86_64-linux, x86_64-darwin ] hopenpgp-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1754,6 +1783,7 @@ dont-distribute-packages: hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ] HSmarty: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-mesos: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmtpclient: [ i686-linux, x86_64-linux, x86_64-darwin ] hsndfile-storablevector: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1778,8 +1808,10 @@ dont-distribute-packages: hsqml-datamodel: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-datamodel-vinyl: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-demo-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsqml-demo-notes: [ x86_64-darwin ] hsqml-demo-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsqml: [ x86_64-darwin ] hsSqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] HsSVN: [ i686-linux, x86_64-linux, x86_64-darwin ] hstatistics: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2101,6 +2133,7 @@ dont-distribute-packages: libpq: [ i686-linux, x86_64-linux, x86_64-darwin ] libssh2-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] + libsystemd-journal: [ x86_64-darwin ] libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2148,6 +2181,7 @@ dont-distribute-packages: loch: [ i686-linux, x86_64-linux, x86_64-darwin ] log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + logging-facade-journald: [ x86_64-darwin ] logic-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-MPI: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2178,6 +2212,7 @@ dont-distribute-packages: luthor: [ i686-linux, x86_64-linux, x86_64-darwin ] lvish: [ i686-linux, x86_64-linux, x86_64-darwin ] lvmlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + lxc: [ x86_64-darwin ] lye: [ i686-linux, x86_64-linux, x86_64-darwin ] maam: [ i686-linux, x86_64-linux, x86_64-darwin ] mage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2247,6 +2282,8 @@ dont-distribute-packages: Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] mida: [ i686-linux, x86_64-linux, x86_64-darwin ] + midi-alsa: [ x86_64-darwin ] + midimory: [ x86_64-darwin ] midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ] mime-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2324,6 +2361,7 @@ dont-distribute-packages: mps: [ i686-linux, x86_64-linux, x86_64-darwin ] mpvguihs: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack-idl: [ i686-linux, x86_64-linux, x86_64-darwin ] + msi-kb-backlit: [ x86_64-darwin ] mtgoxapi: [ i686-linux, x86_64-linux, x86_64-darwin ] mtl-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] mtlx: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2366,6 +2404,7 @@ dont-distribute-packages: nano-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-md5: [ i686-linux, x86_64-linux, x86_64-darwin ] nanomsg-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + nanomsg: [ x86_64-darwin ] narc: [ i686-linux, x86_64-linux, x86_64-darwin ] nats-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] natural-number: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2458,6 +2497,7 @@ dont-distribute-packages: onu-course: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenAFP: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenAL: [ x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] opencv-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2493,6 +2533,7 @@ dont-distribute-packages: packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] padKONTROL: [ i686-linux, x86_64-linux, x86_64-darwin ] PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + pam: [ x86_64-darwin ] panda: [ i686-linux, x86_64-linux, x86_64-darwin ] PandocAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2603,6 +2644,7 @@ dont-distribute-packages: poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] porte: [ i686-linux, x86_64-linux, x86_64-darwin ] porter: [ i686-linux, x86_64-linux, x86_64-darwin ] + PortMidi: [ x86_64-darwin ] ports: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-acl: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2629,6 +2671,7 @@ dont-distribute-packages: primula-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] printf-mauke: [ i686-linux, x86_64-linux, x86_64-darwin ] Printf-TH: [ i686-linux, x86_64-linux, x86_64-darwin ] + printxosd: [ x86_64-darwin ] PriorityChansConverger: [ i686-linux, x86_64-linux, x86_64-darwin ] priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] ProbabilityMonads: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2654,6 +2697,7 @@ dont-distribute-packages: propane: [ i686-linux, x86_64-linux, x86_64-darwin ] Proper: [ i686-linux, x86_64-linux, x86_64-darwin ] proplang: [ i686-linux, x86_64-linux, x86_64-darwin ] + proteaaudio: [ x86_64-darwin ] protobuf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-descriptor-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2707,6 +2751,7 @@ dont-distribute-packages: rados-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] rail-compiler-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + Raincat: [ x86_64-darwin ] rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] ralist: [ i686-linux, x86_64-linux, x86_64-darwin ] rallod: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2771,6 +2816,7 @@ dont-distribute-packages: reified-records: [ i686-linux, x86_64-linux, x86_64-darwin ] reify: [ i686-linux, x86_64-linux, x86_64-darwin ] rei: [ i686-linux, x86_64-linux, x86_64-darwin ] + relational-record-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] remote: [ i686-linux, x86_64-linux, x86_64-darwin ] remotion: [ i686-linux, x86_64-linux, x86_64-darwin ] reorderable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2837,7 +2883,9 @@ dont-distribute-packages: rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] + rtlsdr: [ x86_64-darwin ] rtorrent-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + rubberband: [ x86_64-darwin ] ruff: [ i686-linux, x86_64-linux, x86_64-darwin ] ruler-core: [ i686-linux, x86_64-linux, x86_64-darwin ] rungekutta: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2894,6 +2942,8 @@ dont-distribute-packages: Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-ttf: [ i686-linux, x86_64-linux, x86_64-darwin ] + SDL-mixer: [ x86_64-darwin ] + sdr: [ x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] search: [ i686-linux, x86_64-linux, x86_64-darwin ] secdh: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2927,6 +2977,7 @@ dont-distribute-packages: sexp: [ i686-linux, x86_64-linux, x86_64-darwin ] sexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] sext: [ i686-linux, x86_64-linux, x86_64-darwin ] + sfml-audio: [ x86_64-darwin ] SFML-control: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML: [ i686-linux, x86_64-linux, x86_64-darwin ] SFont: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3216,6 +3267,7 @@ dont-distribute-packages: tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] TicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] + tidal-midi: [ x86_64-darwin ] tiger: [ i686-linux, x86_64-linux, x86_64-darwin ] tighttp: [ i686-linux, x86_64-linux, x86_64-darwin ] timberc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3241,6 +3293,8 @@ dont-distribute-packages: toilet: [ i686-linux, x86_64-linux, x86_64-darwin ] toktok: [ i686-linux, x86_64-linux, x86_64-darwin ] tokyocabinet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + tokyotyrant-haskell: [ x86_64-darwin ] + tomato-rubato-openal: [ x86_64-darwin ] toml: [ i686-linux, x86_64-linux, x86_64-darwin ] Top: [ i686-linux, x86_64-linux, x86_64-darwin ] topkata: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3273,6 +3327,7 @@ dont-distribute-packages: tuple-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] tupleinstances: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-morph: [ i686-linux, x86_64-linux, x86_64-darwin ] + turing-music: [ x86_64-darwin ] twentefp-rosetree: [ i686-linux, x86_64-linux, x86_64-darwin ] twhs: [ i686-linux, x86_64-linux, x86_64-darwin ] twidge: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3389,12 +3444,14 @@ dont-distribute-packages: Vec-Transform: [ i686-linux, x86_64-linux, x86_64-darwin ] verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] + vimus: [ i686-linux, x86_64-linux, x86_64-darwin ] vintage-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] virthualenv: [ i686-linux, x86_64-linux, x86_64-darwin ] vision: [ i686-linux, x86_64-linux, x86_64-darwin ] visual-graphrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] visual-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] + vivid: [ i686-linux, x86_64-linux, x86_64-darwin ] vk-aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] VKHS: [ i686-linux, x86_64-linux, x86_64-darwin ] vorbiscomment: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3525,12 +3582,14 @@ dont-distribute-packages: xmms2-client-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] xmms2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] XMMS: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmobar: [ x86_64-darwin ] xmonad-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-contrib-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-screenshot: [ i686-linux, x86_64-linux, x86_64-darwin ] xmpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] XMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] + xosd: [ x86_64-darwin ] xournal-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] xournal-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] xournal-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3560,6 +3619,7 @@ dont-distribute-packages: yavie: [ i686-linux, x86_64-linux, x86_64-darwin ] ycextra: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-angular-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-account-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3606,6 +3666,7 @@ dont-distribute-packages: zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ] zendesk-api: [ i686-linux, x86_64-linux, x86_64-darwin ] zeno: [ i686-linux, x86_64-linux, x86_64-darwin ] + ZEO: [ x86_64-darwin ] zeromq3-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] zeromq3-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] zeromq-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index f423ae84bf0..d921561a796 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -688,6 +691,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -827,6 +831,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1358,6 +1363,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1421,6 +1427,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5141,6 +5148,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6418,6 +6427,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7919,6 +7929,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_5"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8042,6 +8053,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8055,6 +8067,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8069,6 +8082,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_2"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8340,6 +8354,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_1"; "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_6"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index 1f1be15ac17..ab29b6397d7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -688,6 +691,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -827,6 +831,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1358,6 +1363,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1421,6 +1427,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5140,6 +5147,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6417,6 +6426,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7918,6 +7928,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_5"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8041,6 +8052,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8054,6 +8066,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8068,6 +8081,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_2"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8339,6 +8353,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_1"; "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_6"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 15c9da959f1..392daa1edf4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -688,6 +691,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -827,6 +831,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1358,6 +1363,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1421,6 +1427,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5140,6 +5147,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6417,6 +6426,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7918,6 +7928,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_5"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8041,6 +8052,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8054,6 +8066,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8068,6 +8081,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_2"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8339,6 +8353,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_1"; "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_6"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 10ba28eef40..9c990e43430 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -688,6 +691,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -827,6 +831,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1358,6 +1363,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1421,6 +1427,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5140,6 +5147,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6417,6 +6426,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7918,6 +7928,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_6"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8041,6 +8052,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8054,6 +8066,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8068,6 +8081,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_2"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8339,6 +8353,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_1_1"; "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_6"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 9fffe27fe4c..9f7d29835d9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -688,6 +691,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -827,6 +831,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1358,6 +1363,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1421,6 +1427,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5137,6 +5144,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6414,6 +6423,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7913,6 +7923,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_6"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8036,6 +8047,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8049,6 +8061,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8063,6 +8076,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_2"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8334,6 +8348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_2"; "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_6_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 83e5cd24db0..6aaccab73b2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -688,6 +691,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -827,6 +831,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1358,6 +1363,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1421,6 +1427,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5137,6 +5144,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6414,6 +6423,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7913,6 +7923,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_7"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8035,6 +8046,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8048,6 +8060,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8062,6 +8075,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_2"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8333,6 +8347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_1"; "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_7"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 3e8c7342f3a..c19a016642c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -687,6 +690,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -826,6 +830,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1357,6 +1362,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1418,6 +1424,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5133,6 +5140,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6409,6 +6418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7907,6 +7917,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8028,6 +8039,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8041,6 +8053,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8055,6 +8068,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_3"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8325,6 +8339,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_1"; "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_7_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 4e96d1faf3c..88d241d3341 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -347,6 +348,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -521,6 +523,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -687,6 +690,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "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"; @@ -826,6 +830,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1357,6 +1362,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1418,6 +1424,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5133,6 +5140,8 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6409,6 +6418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7907,6 +7917,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8028,6 +8039,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8041,6 +8053,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8055,6 +8068,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_3"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8325,6 +8339,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_1"; "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_7_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 9e1e237c3bf..34b00b03846 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_1"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -519,6 +521,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -684,6 +687,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -822,6 +826,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1353,6 +1358,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1414,6 +1420,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5115,6 +5122,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6389,6 +6398,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7884,6 +7894,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -8005,6 +8016,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -8018,6 +8030,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8032,6 +8045,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_3"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8302,6 +8316,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_2"; "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_7_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 513b58ad44b..db60388b0e6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -519,6 +521,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -684,6 +687,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -822,6 +826,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1352,6 +1357,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1413,6 +1419,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5102,6 +5109,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6375,6 +6384,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7864,6 +7874,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7985,6 +7996,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7998,6 +8010,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8012,6 +8025,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_3"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8282,6 +8296,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_3"; "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_7_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index 4ef9bdbbf4f..ec11903b6da 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5076,6 +5083,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6341,6 +6350,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7820,6 +7830,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7940,6 +7951,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7953,6 +7965,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7967,6 +7980,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8235,6 +8249,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_10"; "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_8_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 8bb273f88e6..963aec2889b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5072,6 +5079,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6336,6 +6345,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7814,6 +7824,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7934,6 +7945,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7947,6 +7959,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7961,6 +7974,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8229,6 +8243,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_4"; "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_8_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index a24d72a38e6..49882800183 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5071,6 +5078,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6335,6 +6344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7811,6 +7821,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7931,6 +7942,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7944,6 +7956,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7958,6 +7971,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8226,6 +8240,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_5"; "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_8_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 13827243cb1..549ca45a4c6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5068,6 +5075,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6332,6 +6341,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7807,6 +7817,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7927,6 +7938,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7940,6 +7952,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7954,6 +7967,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8222,6 +8236,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_5"; "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_8_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index 977350175cc..9247ad53615 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -345,6 +346,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -517,6 +519,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -682,6 +685,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -820,6 +824,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1350,6 +1355,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1411,6 +1417,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5063,6 +5070,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6324,6 +6333,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7798,6 +7808,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7918,6 +7929,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7931,6 +7943,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7945,6 +7958,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8213,6 +8227,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_5_1"; "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_8_3"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 71ed124fe32..ea209b42326 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -345,6 +346,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -516,6 +518,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -681,6 +684,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -819,6 +823,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1348,6 +1353,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1409,6 +1415,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5056,6 +5063,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6313,6 +6322,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7785,6 +7795,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_9"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_0"; "uulib" = dontDistribute super."uulib"; @@ -7904,6 +7915,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7917,6 +7929,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7931,6 +7944,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8198,6 +8212,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_5_1"; "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_9"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 44d33682d2f..0a55c99859e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -519,6 +521,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -684,6 +687,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -822,6 +826,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1352,6 +1357,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1413,6 +1419,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5099,6 +5106,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6370,6 +6379,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7858,6 +7868,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7978,6 +7989,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7991,6 +8003,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8005,6 +8018,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_3"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8275,6 +8289,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_3"; "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_7_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 4240e9a2697..e11a53d66a4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5094,6 +5101,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6363,6 +6372,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7850,6 +7860,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7970,6 +7981,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7983,6 +7995,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7997,6 +8010,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_3"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8267,6 +8281,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_4"; "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_7_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index d59d97ff233..d287859de56 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5092,6 +5099,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6361,6 +6370,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7846,6 +7856,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7966,6 +7977,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7979,6 +7991,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7993,6 +8006,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_3"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8263,6 +8277,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_4"; "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_7_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 02faeb84ae5..95d66b44ba5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5085,6 +5092,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6354,6 +6363,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7839,6 +7849,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7959,6 +7970,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7972,6 +7984,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7986,6 +7999,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_4"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8256,6 +8270,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_5"; "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_7_2"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 453fa00c053..547ba511273 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5080,6 +5087,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6349,6 +6358,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7833,6 +7843,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7953,6 +7964,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7966,6 +7978,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7980,6 +7993,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_4"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8250,6 +8264,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_6"; "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_8"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index 7def4be5548..d76e4898be9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -206,6 +206,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -346,6 +347,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_4_0_2"; "GLUT" = doDistribute super."GLUT_2_5_1_1"; @@ -518,6 +520,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -683,6 +686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -821,6 +825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1351,6 +1356,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1412,6 +1418,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5078,6 +5085,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6345,6 +6354,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7829,6 +7839,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_8"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = dontDistribute super."uuid-types"; "uulib" = dontDistribute super."uulib"; @@ -7949,6 +7960,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; "wai-middleware-consul" = dontDistribute super."wai-middleware-consul"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7962,6 +7974,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7976,6 +7989,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_4"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8246,6 +8260,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_3_7"; "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_8_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index eff80738a2a..7ae2e87b2de 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -343,6 +344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_5_0_0"; "GLUT" = doDistribute super."GLUT_2_7_0_0"; @@ -512,6 +514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -674,6 +677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -810,6 +814,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1336,6 +1341,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1397,6 +1403,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5004,6 +5011,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6003,6 +6012,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6240,6 +6250,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7701,6 +7712,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_9"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_0"; "uulib" = dontDistribute super."uulib"; @@ -7818,6 +7830,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7831,6 +7844,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7845,6 +7859,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8108,6 +8123,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_6"; "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_9"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 5424c2dae6d..f2d467b09b7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -343,6 +344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_5_0_0"; "GLUT" = doDistribute super."GLUT_2_7_0_0"; @@ -512,6 +514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -674,6 +677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -810,6 +814,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1336,6 +1341,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1397,6 +1403,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -5002,6 +5009,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -6001,6 +6010,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6238,6 +6248,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7699,6 +7710,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_9"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_0"; "uulib" = dontDistribute super."uulib"; @@ -7815,6 +7827,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7828,6 +7841,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7842,6 +7856,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8105,6 +8120,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_6"; "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_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 1e984a2feb8..7e571832448 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1329,6 +1334,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1388,6 +1394,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4958,6 +4965,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5944,6 +5953,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6180,6 +6190,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7621,6 +7632,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7737,6 +7749,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7750,6 +7763,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7764,6 +7778,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8024,6 +8039,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_9_2"; "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_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 1acae55174b..ee4d3dff5a8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1328,6 +1333,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1387,6 +1393,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4951,6 +4958,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5935,6 +5944,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6171,6 +6181,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7608,6 +7619,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7724,6 +7736,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7737,6 +7750,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7751,6 +7765,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8010,6 +8025,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_9_2"; "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_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index acf3289d5f5..6164b7f58a5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1328,6 +1333,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1387,6 +1393,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4951,6 +4958,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5935,6 +5944,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6171,6 +6181,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7607,6 +7618,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7723,6 +7735,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7736,6 +7749,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7750,6 +7764,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8009,6 +8024,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_9_2"; "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_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 967b99e9a24..0fbe54367a2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1328,6 +1333,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1387,6 +1393,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4949,6 +4956,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5932,6 +5941,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6168,6 +6178,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7603,6 +7614,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7719,6 +7731,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7732,6 +7745,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7746,6 +7760,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8005,6 +8020,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_9_2"; "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_10"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 993c0b08433..1085c9d1353 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1327,6 +1332,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1386,6 +1392,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2845,6 +2852,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fb-persistent" = doDistribute super."fb-persistent_0_3_4"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; @@ -4945,6 +4953,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5928,6 +5938,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6163,6 +6174,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7597,6 +7609,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7712,6 +7725,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7725,6 +7739,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7739,6 +7754,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -7996,6 +8012,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_9_2"; "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_11"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index c232fc7388b..4a83050a9d1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1327,6 +1332,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1386,6 +1392,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2842,6 +2849,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fb-persistent" = doDistribute super."fb-persistent_0_3_4"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; @@ -4942,6 +4950,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5921,6 +5931,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6156,6 +6167,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7589,6 +7601,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7704,6 +7717,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7717,6 +7731,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7731,6 +7746,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -7988,6 +8004,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_10"; "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_11"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 3d9f8647754..a7d090ec36a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -204,6 +204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -216,6 +217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -340,6 +342,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -507,6 +510,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -668,6 +672,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -803,6 +808,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1324,6 +1330,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1383,6 +1390,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2835,6 +2843,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -4930,6 +4939,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5908,6 +5919,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6143,6 +6155,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7574,6 +7587,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7689,6 +7703,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7702,6 +7717,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7716,6 +7732,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -7973,6 +7990,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_10"; "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_11"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 42ba9aee048..631cf76ca52 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -204,6 +204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -216,6 +217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -340,6 +342,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -507,6 +510,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -668,6 +672,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -803,6 +808,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1323,6 +1329,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1381,6 +1388,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2831,6 +2839,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -4922,6 +4931,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5898,6 +5909,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6132,6 +6144,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7562,6 +7575,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7676,6 +7690,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7689,6 +7704,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7703,6 +7719,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7959,6 +7976,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_11"; "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_12"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index 18bb88b135f..86cf33685bc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -204,6 +204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -216,6 +217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -340,6 +342,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -506,6 +509,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -667,6 +671,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -802,6 +807,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1321,6 +1327,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1379,6 +1386,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2825,6 +2833,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -4914,6 +4923,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5887,6 +5898,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6121,6 +6133,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7550,6 +7563,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7663,6 +7677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7676,6 +7691,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7690,6 +7706,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7945,6 +7962,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_11"; "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_12"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index d1f8663af2c..71e429d0749 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -204,6 +204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -216,6 +217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -340,6 +342,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -506,6 +509,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -667,6 +671,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -802,6 +807,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1321,6 +1327,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1379,6 +1386,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2825,6 +2833,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -4913,6 +4922,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5569,6 +5580,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5883,6 +5895,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6117,6 +6130,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7544,6 +7558,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7657,6 +7672,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7670,6 +7686,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7684,6 +7701,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7938,6 +7956,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_11"; "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_12"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 2c12e7fd327..516d30ac378 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -343,6 +344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_5_0_0"; "GLUT" = doDistribute super."GLUT_2_7_0_0"; @@ -512,6 +514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -674,6 +677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -809,6 +813,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1335,6 +1340,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1396,6 +1402,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4998,6 +5005,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5996,6 +6005,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6233,6 +6243,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7694,6 +7705,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7810,6 +7822,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7823,6 +7836,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7837,6 +7851,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8099,6 +8114,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_7"; "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_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 21124a4263a..c2b00edaebb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -204,6 +204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -216,6 +217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -340,6 +342,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -506,6 +509,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -667,6 +671,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -802,6 +807,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1321,6 +1327,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1379,6 +1386,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2821,6 +2829,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -4908,6 +4917,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5564,6 +5575,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5877,6 +5889,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6111,6 +6124,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7537,6 +7551,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7649,6 +7664,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7662,6 +7678,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7676,6 +7693,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7930,6 +7948,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_13"; "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_12"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index b3292b94c1e..71bf24dcb03 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -204,6 +204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -216,6 +217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -340,6 +342,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -506,6 +509,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -667,6 +671,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -802,6 +807,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1321,6 +1327,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1379,6 +1386,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2820,6 +2828,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -4905,6 +4914,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5561,6 +5572,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5871,6 +5883,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6105,6 +6118,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7529,6 +7543,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7640,6 +7655,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7653,6 +7669,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7667,6 +7684,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7920,6 +7938,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_13_1"; "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_12"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 7bb840a92d7..73f903022f5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -204,6 +204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -216,6 +217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -340,6 +342,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -506,6 +509,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -667,6 +671,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -802,6 +807,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1320,6 +1326,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1378,6 +1385,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -2819,6 +2827,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -4902,6 +4911,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5557,6 +5568,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5867,6 +5879,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6101,6 +6114,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7525,6 +7539,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7636,6 +7651,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7649,6 +7665,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7663,6 +7680,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7916,6 +7934,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_13_1"; "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_12"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 9e75d1731d4..5660aee1eed 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -343,6 +344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_5_0_0"; "GLUT" = doDistribute super."GLUT_2_7_0_0"; @@ -512,6 +514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -674,6 +677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -809,6 +813,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1335,6 +1340,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1396,6 +1402,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4995,6 +5002,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5993,6 +6002,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6230,6 +6240,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7690,6 +7701,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7806,6 +7818,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7819,6 +7832,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7833,6 +7847,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8095,6 +8110,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_7"; "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_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 1927ea1d5bb..2dde8fb4a0e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -343,6 +344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_5_0_0"; "GLUT" = doDistribute super."GLUT_2_7_0_0"; @@ -512,6 +514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -674,6 +677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -809,6 +813,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1335,6 +1340,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1396,6 +1402,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4993,6 +5000,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5988,6 +5997,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6225,6 +6235,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7683,6 +7694,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7799,6 +7811,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7812,6 +7825,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7826,6 +7840,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8088,6 +8103,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_7_1"; "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_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 6e825963044..1302aaeebee 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -343,6 +344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_5_0_0"; "GLUT" = doDistribute super."GLUT_2_7_0_0"; @@ -512,6 +514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -674,6 +677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -809,6 +813,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1335,6 +1340,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; "asn1-parse" = doDistribute super."asn1-parse_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1396,6 +1402,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4990,6 +4997,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5985,6 +5994,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6222,6 +6232,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7679,6 +7690,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7795,6 +7807,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7808,6 +7821,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7822,6 +7836,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8084,6 +8099,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_7_1"; "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_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 03ef3a1c493..cb01a3ab274 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -343,6 +344,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = doDistribute super."GLURaw_1_5_0_0"; "GLUT" = doDistribute super."GLUT_2_7_0_0"; @@ -512,6 +514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -674,6 +677,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -809,6 +813,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1332,6 +1337,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1393,6 +1399,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4983,6 +4990,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5977,6 +5986,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6214,6 +6224,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7669,6 +7680,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7785,6 +7797,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7798,6 +7811,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7812,6 +7826,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8073,6 +8088,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_7_2"; "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_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index d8f8f9e8a6b..44648738255 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -672,6 +675,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -807,6 +811,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1330,6 +1335,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1391,6 +1397,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4981,6 +4988,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5975,6 +5984,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6212,6 +6222,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7667,6 +7678,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7783,6 +7795,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7796,6 +7809,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7810,6 +7824,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8071,6 +8086,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_7_2"; "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_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 139196542ff..1c0294f8e04 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1329,6 +1334,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1390,6 +1396,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4976,6 +4983,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5970,6 +5979,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6207,6 +6217,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7657,6 +7668,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7773,6 +7785,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7786,6 +7799,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7800,6 +7814,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8061,6 +8076,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_7_2"; "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_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 0297a978ceb..72761449f4c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -205,6 +205,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -342,6 +343,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; "GLUT" = doDistribute super."GLUT_2_7_0_1"; "GLUtil" = dontDistribute super."GLUtil"; @@ -510,6 +512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -671,6 +674,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "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"; @@ -806,6 +810,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "RichConditional" = dontDistribute super."RichConditional"; "Rlang-QQ" = dontDistribute super."Rlang-QQ"; "RollingDirectory" = dontDistribute super."RollingDirectory"; + "RoyalMonad" = dontDistribute super."RoyalMonad"; "RxHaskell" = dontDistribute super."RxHaskell"; "SBench" = dontDistribute super."SBench"; "SConfig" = dontDistribute super."SConfig"; @@ -1329,6 +1334,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1388,6 +1394,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -4967,6 +4974,8 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5957,6 +5966,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -6194,6 +6204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; "redis-io" = dontDistribute super."redis-io"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-resp" = dontDistribute super."redis-resp"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; @@ -7640,6 +7651,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "uuid" = doDistribute super."uuid_1_3_10"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uuid-types" = doDistribute super."uuid-types_1_0_1"; "uulib" = dontDistribute super."uulib"; @@ -7756,6 +7768,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-crowd" = dontDistribute super."wai-middleware-crowd"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; @@ -7769,6 +7782,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_6_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = dontDistribute super."wai-middleware-throttle"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = dontDistribute super."wai-predicates"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7783,6 +7797,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wai-websockets" = doDistribute super."wai-websockets_3_0_0_5"; "wait-handle" = dontDistribute super."wait-handle"; @@ -8043,6 +8058,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_9_1"; "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_9_1"; "yesod-crud" = dontDistribute super."yesod-crud"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 70a38a23c63..a4a309a141e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -190,6 +190,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -202,6 +203,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -326,6 +328,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = dontDistribute super."GLURaw"; "GLUT" = dontDistribute super."GLUT"; @@ -491,6 +494,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -651,6 +655,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -781,6 +786,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -1275,6 +1281,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1331,6 +1338,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -1830,6 +1838,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_5_11"; "clash-lib" = doDistribute super."clash-lib_0_5_10"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_2"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_7"; "clash-verilog" = doDistribute super."clash-verilog_0_5_7"; @@ -2049,6 +2058,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; + "country-codes" = doDistribute super."country-codes_0_1_2"; "courier" = doDistribute super."courier_0_1_0_15"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; @@ -2699,6 +2709,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fay-hsx" = dontDistribute super."fay-hsx"; "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -3013,6 +3024,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-checklist" = dontDistribute super."git-checklist"; @@ -3457,6 +3469,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -3472,6 +3485,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "haxl" = dontDistribute super."haxl"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_1"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -4289,6 +4303,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "jsc" = dontDistribute super."jsc"; "jsmw" = dontDistribute super."jsmw"; "json-assertions" = dontDistribute super."json-assertions"; + "json-autotype" = doDistribute super."json-autotype_1_0_7"; "json-b" = dontDistribute super."json-b"; "json-enumerator" = dontDistribute super."json-enumerator"; "json-extra" = dontDistribute super."json-extra"; @@ -4455,6 +4470,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; "layers" = dontDistribute super."layers"; @@ -4676,6 +4692,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4730,6 +4748,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "mancala" = dontDistribute super."mancala"; "mandrill" = doDistribute super."mandrill_0_3_0_0"; "mandulia" = dontDistribute super."mandulia"; + "mangopay" = doDistribute super."mangopay_1_11_4"; "manifolds" = dontDistribute super."manifolds"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5298,6 +5317,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5592,6 +5612,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -5818,6 +5839,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "reddit" = dontDistribute super."reddit"; "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; @@ -6439,6 +6461,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "spata" = dontDistribute super."spata"; "spatial-math" = dontDistribute super."spatial-math"; "spawn" = dontDistribute super."spawn"; + "spdx" = doDistribute super."spdx_0_2_0_0"; "spe" = dontDistribute super."spe"; "special-functors" = dontDistribute super."special-functors"; "special-keys" = dontDistribute super."special-keys"; @@ -7176,6 +7199,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7283,6 +7307,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7294,6 +7319,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_1"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7305,6 +7331,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7546,6 +7573,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_13_2"; "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_12"; "yesod-crud" = dontDistribute super."yesod-crud"; @@ -7558,6 +7586,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_4"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; "yesod-paginate" = dontDistribute super."yesod-paginate"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index b136a8d3c0e..f4705ae236b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -190,6 +190,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -202,6 +203,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -326,6 +328,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = dontDistribute super."GLURaw"; "GLUT" = dontDistribute super."GLUT"; @@ -491,6 +494,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -651,6 +655,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -781,6 +786,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -1273,6 +1279,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1329,6 +1336,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -1827,6 +1835,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_5_11"; "clash-lib" = doDistribute super."clash-lib_0_5_10"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_2"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_7"; "clash-verilog" = doDistribute super."clash-verilog_0_5_7"; @@ -2046,6 +2055,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; + "country-codes" = doDistribute super."country-codes_0_1_2"; "courier" = doDistribute super."courier_0_1_0_15"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; @@ -2694,6 +2704,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -3007,6 +3018,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-checklist" = dontDistribute super."git-checklist"; @@ -3451,6 +3463,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -3466,6 +3479,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "haxl" = dontDistribute super."haxl"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_1"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -4282,6 +4296,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "jsc" = dontDistribute super."jsc"; "jsmw" = dontDistribute super."jsmw"; "json-assertions" = dontDistribute super."json-assertions"; + "json-autotype" = doDistribute super."json-autotype_1_0_7"; "json-b" = dontDistribute super."json-b"; "json-enumerator" = dontDistribute super."json-enumerator"; "json-extra" = dontDistribute super."json-extra"; @@ -4448,6 +4463,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; "layers" = dontDistribute super."layers"; @@ -4669,6 +4685,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4722,6 +4740,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "mancala" = dontDistribute super."mancala"; "mandrill" = doDistribute super."mandrill_0_3_0_0"; "mandulia" = dontDistribute super."mandulia"; + "mangopay" = doDistribute super."mangopay_1_11_4"; "manifolds" = dontDistribute super."manifolds"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5284,10 +5303,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_3_1"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5581,6 +5602,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -5807,6 +5829,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "reddit" = dontDistribute super."reddit"; "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; @@ -6427,6 +6450,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "spata" = dontDistribute super."spata"; "spatial-math" = dontDistribute super."spatial-math"; "spawn" = dontDistribute super."spawn"; + "spdx" = doDistribute super."spdx_0_2_0_0"; "spe" = dontDistribute super."spe"; "special-functors" = dontDistribute super."special-functors"; "special-keys" = dontDistribute super."special-keys"; @@ -7164,6 +7188,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7270,6 +7295,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7281,6 +7307,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_1"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7292,6 +7319,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7531,6 +7559,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-bin" = doDistribute super."yesod-bin_1_4_13_3"; "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_13"; "yesod-crud" = dontDistribute super."yesod-crud"; @@ -7543,6 +7572,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_4"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; "yesod-paginate" = dontDistribute super."yesod-paginate"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 25d45e618e9..a6b4ffa8b86 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -189,6 +189,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -201,6 +202,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -324,6 +326,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = dontDistribute super."GLURaw"; "GLUT" = dontDistribute super."GLUT"; @@ -488,6 +491,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -648,6 +652,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -778,6 +783,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -1269,6 +1275,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1325,6 +1332,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -1823,6 +1831,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_5_11"; "clash-lib" = doDistribute super."clash-lib_0_5_10"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_2"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_7"; "clash-verilog" = doDistribute super."clash-verilog_0_5_7"; @@ -2042,6 +2051,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; + "country-codes" = doDistribute super."country-codes_0_1_2"; "courier" = doDistribute super."courier_0_1_0_15"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; @@ -2689,6 +2699,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -3001,6 +3012,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-checklist" = dontDistribute super."git-checklist"; @@ -3444,6 +3456,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -3459,6 +3472,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "haxl" = dontDistribute super."haxl"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_1"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -4274,6 +4288,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "jsc" = dontDistribute super."jsc"; "jsmw" = dontDistribute super."jsmw"; "json-assertions" = dontDistribute super."json-assertions"; + "json-autotype" = doDistribute super."json-autotype_1_0_7"; "json-b" = dontDistribute super."json-b"; "json-enumerator" = dontDistribute super."json-enumerator"; "json-extra" = dontDistribute super."json-extra"; @@ -4439,6 +4454,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; "layers" = dontDistribute super."layers"; @@ -4659,6 +4675,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4712,6 +4730,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "mancala" = dontDistribute super."mancala"; "mandrill" = doDistribute super."mandrill_0_3_0_0"; "mandulia" = dontDistribute super."mandulia"; + "mangopay" = doDistribute super."mangopay_1_11_4"; "manifolds" = dontDistribute super."manifolds"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5274,10 +5293,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_3_1"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5570,6 +5591,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -5795,6 +5817,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "reddit" = dontDistribute super."reddit"; "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; @@ -6410,6 +6433,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "spata" = dontDistribute super."spata"; "spatial-math" = dontDistribute super."spatial-math"; "spawn" = dontDistribute super."spawn"; + "spdx" = doDistribute super."spdx_0_2_0_0"; "spe" = dontDistribute super."spe"; "special-functors" = dontDistribute super."special-functors"; "special-keys" = dontDistribute super."special-keys"; @@ -7145,6 +7169,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7251,6 +7276,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7261,6 +7287,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7272,6 +7299,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7509,6 +7537,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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_14"; "yesod-crud" = dontDistribute super."yesod-crud"; @@ -7521,6 +7550,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_4"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; "yesod-paginate" = dontDistribute super."yesod-paginate"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index ca1280d6989..dac1d68ca46 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -189,6 +189,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -201,6 +202,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -324,6 +326,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = dontDistribute super."GLURaw"; "GLUT" = dontDistribute super."GLUT"; @@ -488,6 +491,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -647,6 +651,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -777,6 +782,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -1267,6 +1273,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1323,6 +1330,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -1820,6 +1828,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_5_11"; "clash-lib" = doDistribute super."clash-lib_0_5_10"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_2"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_7"; "clash-verilog" = doDistribute super."clash-verilog_0_5_7"; @@ -2035,6 +2044,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; + "country-codes" = doDistribute super."country-codes_0_1_2"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; @@ -2680,6 +2690,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -2991,6 +3002,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-checklist" = dontDistribute super."git-checklist"; @@ -3434,6 +3446,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -3449,6 +3462,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "haxl" = dontDistribute super."haxl"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_1"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -4262,6 +4276,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "jsc" = dontDistribute super."jsc"; "jsmw" = dontDistribute super."jsmw"; "json-assertions" = dontDistribute super."json-assertions"; + "json-autotype" = doDistribute super."json-autotype_1_0_7"; "json-b" = dontDistribute super."json-b"; "json-enumerator" = dontDistribute super."json-enumerator"; "json-extra" = dontDistribute super."json-extra"; @@ -4427,6 +4442,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; "layers" = dontDistribute super."layers"; @@ -4647,6 +4663,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4700,6 +4718,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "mancala" = dontDistribute super."mancala"; "mandrill" = doDistribute super."mandrill_0_3_0_0"; "mandulia" = dontDistribute super."mandulia"; + "mangopay" = doDistribute super."mangopay_1_11_4"; "manifolds" = dontDistribute super."manifolds"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5259,10 +5278,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_3_1"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5555,6 +5576,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -5779,6 +5801,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "reddit" = dontDistribute super."reddit"; "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; @@ -6387,6 +6410,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "spata" = dontDistribute super."spata"; "spatial-math" = dontDistribute super."spatial-math"; "spawn" = dontDistribute super."spawn"; + "spdx" = doDistribute super."spdx_0_2_0_0"; "spe" = dontDistribute super."spe"; "special-functors" = dontDistribute super."special-functors"; "special-keys" = dontDistribute super."special-keys"; @@ -6912,6 +6936,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tst" = dontDistribute super."tst"; "tsvsql" = dontDistribute super."tsvsql"; "ttrie" = dontDistribute super."ttrie"; + "tttool" = doDistribute super."tttool_1_4_0_4"; "tubes" = dontDistribute super."tubes"; "tuntap" = dontDistribute super."tuntap"; "tup-functor" = dontDistribute super."tup-functor"; @@ -7118,6 +7143,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7224,6 +7250,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7234,6 +7261,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7245,6 +7273,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7481,6 +7510,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; @@ -7492,6 +7522,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_4"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; "yesod-paginate" = dontDistribute super."yesod-paginate"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index 8562b83c1dd..624c48a0542 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -189,6 +189,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -201,6 +202,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -324,6 +326,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = dontDistribute super."GLURaw"; "GLUT" = dontDistribute super."GLUT"; @@ -488,6 +491,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -647,6 +651,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -777,6 +782,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -1267,6 +1273,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1323,6 +1330,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -1819,6 +1827,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_5_11"; "clash-lib" = doDistribute super."clash-lib_0_5_10"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_2"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_7"; "clash-verilog" = doDistribute super."clash-verilog_0_5_7"; @@ -2034,6 +2043,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; + "country-codes" = doDistribute super."country-codes_0_1_2"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; @@ -2679,6 +2689,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -2990,6 +3001,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-checklist" = dontDistribute super."git-checklist"; @@ -3433,6 +3445,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -3448,6 +3461,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "haxl" = dontDistribute super."haxl"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_1"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -4261,6 +4275,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "jsc" = dontDistribute super."jsc"; "jsmw" = dontDistribute super."jsmw"; "json-assertions" = dontDistribute super."json-assertions"; + "json-autotype" = doDistribute super."json-autotype_1_0_7"; "json-b" = dontDistribute super."json-b"; "json-enumerator" = dontDistribute super."json-enumerator"; "json-extra" = dontDistribute super."json-extra"; @@ -4426,6 +4441,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; "layers" = dontDistribute super."layers"; @@ -4646,6 +4662,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4699,6 +4717,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "mancala" = dontDistribute super."mancala"; "mandrill" = doDistribute super."mandrill_0_3_0_0"; "mandulia" = dontDistribute super."mandulia"; + "mangopay" = doDistribute super."mangopay_1_11_4"; "manifolds" = dontDistribute super."manifolds"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5257,10 +5276,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_3_1"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5553,6 +5574,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -5777,6 +5799,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "reddit" = dontDistribute super."reddit"; "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; @@ -6383,6 +6406,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "spata" = dontDistribute super."spata"; "spatial-math" = dontDistribute super."spatial-math"; "spawn" = dontDistribute super."spawn"; + "spdx" = doDistribute super."spdx_0_2_0_0"; "spe" = dontDistribute super."spe"; "special-functors" = dontDistribute super."special-functors"; "special-keys" = dontDistribute super."special-keys"; @@ -6907,6 +6931,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tst" = dontDistribute super."tst"; "tsvsql" = dontDistribute super."tsvsql"; "ttrie" = dontDistribute super."ttrie"; + "tttool" = doDistribute super."tttool_1_4_0_4"; "tubes" = dontDistribute super."tubes"; "tuntap" = dontDistribute super."tuntap"; "tup-functor" = dontDistribute super."tup-functor"; @@ -7113,6 +7138,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7219,6 +7245,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7229,6 +7256,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7240,6 +7268,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7475,6 +7504,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; @@ -7486,6 +7516,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_4"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; "yesod-paginate" = dontDistribute super."yesod-paginate"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index f615543076e..69854c8a3ab 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -189,6 +189,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -201,6 +202,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "Crypto" = dontDistribute super."Crypto"; "CurryDB" = dontDistribute super."CurryDB"; "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; "DBlimited" = dontDistribute super."DBlimited"; "DBus" = dontDistribute super."DBus"; "DCFL" = dontDistribute super."DCFL"; @@ -324,6 +326,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; "GLFW-task" = dontDistribute super."GLFW-task"; "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; "GLMatrix" = dontDistribute super."GLMatrix"; "GLURaw" = dontDistribute super."GLURaw"; "GLUT" = dontDistribute super."GLUT"; @@ -488,6 +491,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -647,6 +651,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -776,6 +781,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "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"; @@ -1229,6 +1235,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_5"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1263,6 +1270,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asic" = dontDistribute super."asic"; "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; + "asn1-encoding" = doDistribute super."asn1-encoding_0_9_2"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; "assert" = dontDistribute super."assert"; @@ -1319,6 +1328,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; "autoproc" = dontDistribute super."autoproc"; "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; "average" = dontDistribute super."average"; "avers" = dontDistribute super."avers"; "avl-static" = dontDistribute super."avl-static"; @@ -1814,6 +1824,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash" = dontDistribute super."clash"; "clash-ghc" = doDistribute super."clash-ghc_0_5_13"; "clash-lib" = doDistribute super."clash-lib_0_5_11"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_2"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_8"; "clash-verilog" = doDistribute super."clash-verilog_0_5_8"; @@ -2028,6 +2039,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; + "country-codes" = doDistribute super."country-codes_0_1_2"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; @@ -2673,6 +2685,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; "fca" = dontDistribute super."fca"; "fcd" = dontDistribute super."fcd"; "fckeditor" = dontDistribute super."fckeditor"; @@ -2981,6 +2994,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "gimlh" = dontDistribute super."gimlh"; "ginger" = dontDistribute super."ginger"; "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; "gist" = dontDistribute super."gist"; "git-all" = dontDistribute super."git-all"; "git-checklist" = dontDistribute super."git-checklist"; @@ -3423,6 +3437,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5"; "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; "hastache-aeson" = dontDistribute super."hastache-aeson"; "haste" = dontDistribute super."haste"; @@ -3438,6 +3453,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "haxl" = dontDistribute super."haxl"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_1"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -4246,6 +4262,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "jsc" = dontDistribute super."jsc"; "jsmw" = dontDistribute super."jsmw"; "json-assertions" = dontDistribute super."json-assertions"; + "json-autotype" = doDistribute super."json-autotype_1_0_7"; "json-b" = dontDistribute super."json-b"; "json-enumerator" = dontDistribute super."json-enumerator"; "json-extra" = dontDistribute super."json-extra"; @@ -4411,6 +4428,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; + "lattices" = doDistribute super."lattices_1_3"; "launchpad-control" = dontDistribute super."launchpad-control"; "lax" = dontDistribute super."lax"; "layers" = dontDistribute super."layers"; @@ -4630,6 +4648,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "luhn" = dontDistribute super."luhn"; "lui" = dontDistribute super."lui"; "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -4683,6 +4703,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "mancala" = dontDistribute super."mancala"; "mandrill" = doDistribute super."mandrill_0_3_0_0"; "mandulia" = dontDistribute super."mandulia"; + "mangopay" = doDistribute super."mangopay_1_11_4"; "manifolds" = dontDistribute super."manifolds"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5239,10 +5260,12 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_3_1"; "pandoc-crossref" = dontDistribute super."pandoc-crossref"; "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; "pandoc-lens" = dontDistribute super."pandoc-lens"; "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; "pandoc-unlit" = dontDistribute super."pandoc-unlit"; "papillon" = dontDistribute super."papillon"; "pappy" = dontDistribute super."pappy"; @@ -5530,6 +5553,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pretty-tree" = dontDistribute super."pretty-tree"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-uniq" = dontDistribute super."prim-uniq"; + "primitive" = doDistribute super."primitive_0_6"; "primula-board" = dontDistribute super."primula-board"; "primula-bot" = dontDistribute super."primula-bot"; "printf-mauke" = dontDistribute super."printf-mauke"; @@ -5754,6 +5778,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "reddit" = dontDistribute super."reddit"; "redis" = dontDistribute super."redis"; "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; "redis-simple" = dontDistribute super."redis-simple"; "redo" = dontDistribute super."redo"; "reducers" = doDistribute super."reducers_3_10_3_2"; @@ -6357,6 +6382,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "spata" = dontDistribute super."spata"; "spatial-math" = dontDistribute super."spatial-math"; "spawn" = dontDistribute super."spawn"; + "spdx" = doDistribute super."spdx_0_2_0_0"; "spe" = dontDistribute super."spe"; "special-functors" = dontDistribute super."special-functors"; "special-keys" = dontDistribute super."special-keys"; @@ -6479,6 +6505,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "streamed" = dontDistribute super."streamed"; "streaming" = dontDistribute super."streaming"; "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_13"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-utils" = dontDistribute super."streaming-utils"; "streamproc" = dontDistribute super."streamproc"; @@ -6875,6 +6902,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tst" = dontDistribute super."tst"; "tsvsql" = dontDistribute super."tsvsql"; "ttrie" = dontDistribute super."ttrie"; + "tttool" = doDistribute super."tttool_1_4_0_4"; "tubes" = dontDistribute super."tubes"; "tuntap" = dontDistribute super."tuntap"; "tup-functor" = dontDistribute super."tup-functor"; @@ -6909,6 +6937,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "twitter" = dontDistribute super."twitter"; "twitter-conduit" = dontDistribute super."twitter-conduit"; "twitter-enumerator" = dontDistribute super."twitter-enumerator"; + "twitter-feed" = doDistribute super."twitter-feed_0_2_0_3"; "twitter-types" = dontDistribute super."twitter-types"; "twitter-types-lens" = dontDistribute super."twitter-types-lens"; "tx" = dontDistribute super."tx"; @@ -7080,6 +7109,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "uuagd" = dontDistribute super."uuagd"; "uuid-aeson" = dontDistribute super."uuid-aeson"; "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; "uuid-quasi" = dontDistribute super."uuid-quasi"; "uulib" = dontDistribute super."uulib"; "uvector" = dontDistribute super."uvector"; @@ -7186,6 +7216,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7196,6 +7227,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7207,6 +7239,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "wai-static-pages" = dontDistribute super."wai-static-pages"; "wai-test" = dontDistribute super."wai-test"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; "wai-util" = dontDistribute super."wai-util"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; @@ -7435,6 +7468,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; @@ -7446,6 +7480,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; "yesod-lucid" = dontDistribute super."yesod-lucid"; + "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_4"; "yesod-markdown" = dontDistribute super."yesod-markdown"; "yesod-media-simple" = dontDistribute super."yesod-media-simple"; "yesod-paginate" = dontDistribute super."yesod-paginate"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix new file mode 100644 index 00000000000..f4b25c6283c --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -0,0 +1,7538 @@ +{ pkgs }: + +with import ./lib.nix { inherit pkgs; }; + +self: super: assert super.ghc.name == "ghc-7.10.2"; { + + # core libraries provided by the compiler + Cabal = null; + array = null; + base = null; + bin-package-db = null; + binary = null; + bytestring = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-prim = null; + hoopl = null; + hpc = null; + integer-gmp = null; + pretty = null; + process = null; + rts = null; + template-haskell = null; + time = null; + transformers = null; + unix = null; + + # lts-3.6 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"; + "Cascade" = dontDistribute super."Cascade"; + "Catana" = dontDistribute super."Catana"; + "Chart-gtk" = dontDistribute super."Chart-gtk"; + "Chart-simple" = dontDistribute super."Chart-simple"; + "CheatSheet" = dontDistribute super."CheatSheet"; + "Checked" = dontDistribute super."Checked"; + "Chitra" = dontDistribute super."Chitra"; + "ChristmasTree" = dontDistribute super."ChristmasTree"; + "CirruParser" = dontDistribute super."CirruParser"; + "ClassLaws" = dontDistribute super."ClassLaws"; + "ClassyPrelude" = dontDistribute super."ClassyPrelude"; + "Clean" = dontDistribute super."Clean"; + "Clipboard" = dontDistribute super."Clipboard"; + "ClustalParser" = dontDistribute super."ClustalParser"; + "Coadjute" = dontDistribute super."Coadjute"; + "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF"; + "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL"; + "Combinatorrent" = dontDistribute super."Combinatorrent"; + "Command" = dontDistribute super."Command"; + "Commando" = dontDistribute super."Commando"; + "ComonadSheet" = dontDistribute super."ComonadSheet"; + "ConcurrentUtils" = dontDistribute super."ConcurrentUtils"; + "Concurrential" = dontDistribute super."Concurrential"; + "Condor" = dontDistribute super."Condor"; + "ConfigFileTH" = dontDistribute super."ConfigFileTH"; + "Configger" = dontDistribute super."Configger"; + "Configurable" = dontDistribute super."Configurable"; + "ConsStream" = dontDistribute super."ConsStream"; + "Conscript" = dontDistribute super."Conscript"; + "ConstraintKinds" = dontDistribute super."ConstraintKinds"; + "Consumer" = dontDistribute super."Consumer"; + "ContArrow" = dontDistribute super."ContArrow"; + "ContextAlgebra" = dontDistribute super."ContextAlgebra"; + "Contract" = dontDistribute super."Contract"; + "Control-Engine" = dontDistribute super."Control-Engine"; + "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; + "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2"; + "CoreErlang" = dontDistribute super."CoreErlang"; + "CoreFoundation" = dontDistribute super."CoreFoundation"; + "Coroutine" = dontDistribute super."Coroutine"; + "CouchDB" = dontDistribute super."CouchDB"; + "Craft3e" = dontDistribute super."Craft3e"; + "Crypto" = dontDistribute super."Crypto"; + "CurryDB" = dontDistribute super."CurryDB"; + "DAG-Tournament" = dontDistribute super."DAG-Tournament"; + "DAV" = doDistribute super."DAV_1_0_7"; + "DBlimited" = dontDistribute super."DBlimited"; + "DBus" = dontDistribute super."DBus"; + "DCFL" = dontDistribute super."DCFL"; + "DMuCheck" = dontDistribute super."DMuCheck"; + "DOM" = dontDistribute super."DOM"; + "DP" = dontDistribute super."DP"; + "DPM" = dontDistribute super."DPM"; + "DSA" = dontDistribute super."DSA"; + "DSH" = dontDistribute super."DSH"; + "DSTM" = dontDistribute super."DSTM"; + "DTC" = dontDistribute super."DTC"; + "Dangerous" = dontDistribute super."Dangerous"; + "Dao" = dontDistribute super."Dao"; + "DarcsHelpers" = dontDistribute super."DarcsHelpers"; + "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent"; + "Data-Rope" = dontDistribute super."Data-Rope"; + "DataTreeView" = dontDistribute super."DataTreeView"; + "Deadpan-DDP" = dontDistribute super."Deadpan-DDP"; + "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers"; + "DecisionTree" = dontDistribute super."DecisionTree"; + "DeepArrow" = dontDistribute super."DeepArrow"; + "DefendTheKing" = dontDistribute super."DefendTheKing"; + "DescriptiveKeys" = dontDistribute super."DescriptiveKeys"; + "Dflow" = dontDistribute super."Dflow"; + "DifferenceLogic" = dontDistribute super."DifferenceLogic"; + "DifferentialEvolution" = dontDistribute super."DifferentialEvolution"; + "Digit" = dontDistribute super."Digit"; + "DigitalOcean" = dontDistribute super."DigitalOcean"; + "DimensionalHash" = dontDistribute super."DimensionalHash"; + "DirectSound" = dontDistribute super."DirectSound"; + "DisTract" = dontDistribute super."DisTract"; + "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem"; + "Dish" = dontDistribute super."Dish"; + "Dist" = dontDistribute super."Dist"; + "DistanceTransform" = dontDistribute super."DistanceTransform"; + "DistanceUnits" = dontDistribute super."DistanceUnits"; + "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment"; + "DocTest" = dontDistribute super."DocTest"; + "Docs" = dontDistribute super."Docs"; + "DrHylo" = dontDistribute super."DrHylo"; + "DrIFT" = dontDistribute super."DrIFT"; + "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized"; + "Dung" = dontDistribute super."Dung"; + "Dust" = dontDistribute super."Dust"; + "Dust-crypto" = dontDistribute super."Dust-crypto"; + "Dust-tools" = dontDistribute super."Dust-tools"; + "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap"; + "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp"; + "DysFRP" = dontDistribute super."DysFRP"; + "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo"; + "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk"; + "EEConfig" = dontDistribute super."EEConfig"; + "Earley" = doDistribute super."Earley_0_9_0"; + "Ebnf2ps" = dontDistribute super."Ebnf2ps"; + "EdisonAPI" = dontDistribute super."EdisonAPI"; + "EdisonCore" = dontDistribute super."EdisonCore"; + "EditTimeReport" = dontDistribute super."EditTimeReport"; + "EitherT" = dontDistribute super."EitherT"; + "Elm" = dontDistribute super."Elm"; + "Emping" = dontDistribute super."Emping"; + "Encode" = dontDistribute super."Encode"; + "EntrezHTTP" = dontDistribute super."EntrezHTTP"; + "EnumContainers" = dontDistribute super."EnumContainers"; + "EnumMap" = dontDistribute super."EnumMap"; + "Eq" = dontDistribute super."Eq"; + "EqualitySolver" = dontDistribute super."EqualitySolver"; + "EsounD" = dontDistribute super."EsounD"; + "EstProgress" = dontDistribute super."EstProgress"; + "EtaMOO" = dontDistribute super."EtaMOO"; + "Etage" = dontDistribute super."Etage"; + "Etage-Graph" = dontDistribute super."Etage-Graph"; + "Eternal10Seconds" = dontDistribute super."Eternal10Seconds"; + "Etherbunny" = dontDistribute super."Etherbunny"; + "EuroIT" = dontDistribute super."EuroIT"; + "Euterpea" = dontDistribute super."Euterpea"; + "EventSocket" = dontDistribute super."EventSocket"; + "Extra" = dontDistribute super."Extra"; + "FComp" = dontDistribute super."FComp"; + "FM-SBLEX" = dontDistribute super."FM-SBLEX"; + "FModExRaw" = dontDistribute super."FModExRaw"; + "FPretty" = dontDistribute super."FPretty"; + "FTGL" = dontDistribute super."FTGL"; + "FTGL-bytestring" = dontDistribute super."FTGL-bytestring"; + "FTPLine" = dontDistribute super."FTPLine"; + "Facts" = dontDistribute super."Facts"; + "FailureT" = dontDistribute super."FailureT"; + "FastxPipe" = dontDistribute super."FastxPipe"; + "FermatsLastMargin" = dontDistribute super."FermatsLastMargin"; + "FerryCore" = dontDistribute super."FerryCore"; + "Feval" = dontDistribute super."Feval"; + "FieldTrip" = dontDistribute super."FieldTrip"; + "FileManip" = dontDistribute super."FileManip"; + "FileManipCompat" = dontDistribute super."FileManipCompat"; + "FilePather" = dontDistribute super."FilePather"; + "FileSystem" = dontDistribute super."FileSystem"; + "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo"; + "Finance-Treasury" = dontDistribute super."Finance-Treasury"; + "FindBin" = dontDistribute super."FindBin"; + "FiniteMap" = dontDistribute super."FiniteMap"; + "FirstOrderTheory" = dontDistribute super."FirstOrderTheory"; + "FixedPoint-simple" = dontDistribute super."FixedPoint-simple"; + "Flippi" = dontDistribute super."Flippi"; + "Focus" = dontDistribute super."Focus"; + "Folly" = dontDistribute super."Folly"; + "ForSyDe" = dontDistribute super."ForSyDe"; + "ForkableT" = dontDistribute super."ForkableT"; + "FormalGrammars" = dontDistribute super."FormalGrammars"; + "Foster" = dontDistribute super."Foster"; + "FpMLv53" = dontDistribute super."FpMLv53"; + "Frames" = dontDistribute super."Frames"; + "Frank" = dontDistribute super."Frank"; + "FreeTypeGL" = dontDistribute super."FreeTypeGL"; + "FunGEn" = dontDistribute super."FunGEn"; + "Fungi" = dontDistribute super."Fungi"; + "GA" = dontDistribute super."GA"; + "GGg" = dontDistribute super."GGg"; + "GHood" = dontDistribute super."GHood"; + "GLFW" = dontDistribute super."GLFW"; + "GLFW-OGL" = dontDistribute super."GLFW-OGL"; + "GLFW-b" = dontDistribute super."GLFW-b"; + "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; + "GLFW-task" = dontDistribute super."GLFW-task"; + "GLHUI" = dontDistribute super."GLHUI"; + "GLM" = dontDistribute super."GLM"; + "GLMatrix" = dontDistribute super."GLMatrix"; + "GLURaw" = dontDistribute super."GLURaw"; + "GLUT" = dontDistribute super."GLUT"; + "GLUtil" = dontDistribute super."GLUtil"; + "GPX" = dontDistribute super."GPX"; + "GPipe" = dontDistribute super."GPipe"; + "GPipe-Collada" = dontDistribute super."GPipe-Collada"; + "GPipe-Examples" = dontDistribute super."GPipe-Examples"; + "GPipe-GLFW" = dontDistribute super."GPipe-GLFW"; + "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad"; + "GTALib" = dontDistribute super."GTALib"; + "Gamgine" = dontDistribute super."Gamgine"; + "Ganymede" = dontDistribute super."Ganymede"; + "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration"; + "GeBoP" = dontDistribute super."GeBoP"; + "GenI" = dontDistribute super."GenI"; + "GenSmsPdu" = dontDistribute super."GenSmsPdu"; + "Genbank" = dontDistribute super."Genbank"; + "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe"; + "GenussFold" = dontDistribute super."GenussFold"; + "GeoIp" = dontDistribute super."GeoIp"; + "Geodetic" = dontDistribute super."Geodetic"; + "GeomPredicates" = dontDistribute super."GeomPredicates"; + "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; + "GiST" = dontDistribute super."GiST"; + "GiveYouAHead" = dontDistribute super."GiveYouAHead"; + "GlomeTrace" = dontDistribute super."GlomeTrace"; + "GlomeVec" = dontDistribute super."GlomeVec"; + "GlomeView" = dontDistribute super."GlomeView"; + "GoogleChart" = dontDistribute super."GoogleChart"; + "GoogleDirections" = dontDistribute super."GoogleDirections"; + "GoogleSB" = dontDistribute super."GoogleSB"; + "GoogleSuggest" = dontDistribute super."GoogleSuggest"; + "GoogleTranslate" = dontDistribute super."GoogleTranslate"; + "GotoT-transformers" = dontDistribute super."GotoT-transformers"; + "GrammarProducts" = dontDistribute super."GrammarProducts"; + "Graph500" = dontDistribute super."Graph500"; + "GraphHammer" = dontDistribute super."GraphHammer"; + "GraphHammer-examples" = dontDistribute super."GraphHammer-examples"; + "Graphalyze" = dontDistribute super."Graphalyze"; + "Grempa" = dontDistribute super."Grempa"; + "GroteTrap" = dontDistribute super."GroteTrap"; + "Grow" = dontDistribute super."Grow"; + "GrowlNotify" = dontDistribute super."GrowlNotify"; + "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics"; + "GtkGLTV" = dontDistribute super."GtkGLTV"; + "GtkTV" = dontDistribute super."GtkTV"; + "GuiHaskell" = dontDistribute super."GuiHaskell"; + "GuiTV" = dontDistribute super."GuiTV"; + "H" = dontDistribute super."H"; + "HARM" = dontDistribute super."HARM"; + "HAppS-Data" = dontDistribute super."HAppS-Data"; + "HAppS-IxSet" = dontDistribute super."HAppS-IxSet"; + "HAppS-Server" = dontDistribute super."HAppS-Server"; + "HAppS-State" = dontDistribute super."HAppS-State"; + "HAppS-Util" = dontDistribute super."HAppS-Util"; + "HAppSHelpers" = dontDistribute super."HAppSHelpers"; + "HCL" = dontDistribute super."HCL"; + "HCard" = dontDistribute super."HCard"; + "HDBC" = dontDistribute super."HDBC"; + "HDBC-mysql" = dontDistribute super."HDBC-mysql"; + "HDBC-odbc" = dontDistribute super."HDBC-odbc"; + "HDBC-postgresql" = dontDistribute super."HDBC-postgresql"; + "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; + "HDBC-session" = dontDistribute super."HDBC-session"; + "HDBC-sqlite3" = dontDistribute super."HDBC-sqlite3"; + "HDRUtils" = dontDistribute super."HDRUtils"; + "HERA" = dontDistribute super."HERA"; + "HFrequencyQueue" = dontDistribute super."HFrequencyQueue"; + "HFuse" = dontDistribute super."HFuse"; + "HGL" = dontDistribute super."HGL"; + "HGamer3D" = dontDistribute super."HGamer3D"; + "HGamer3D-API" = dontDistribute super."HGamer3D-API"; + "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio"; + "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding"; + "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding"; + "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding"; + "HGamer3D-Common" = dontDistribute super."HGamer3D-Common"; + "HGamer3D-Data" = dontDistribute super."HGamer3D-Data"; + "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding"; + "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI"; + "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D"; + "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem"; + "HGamer3D-Network" = dontDistribute super."HGamer3D-Network"; + "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding"; + "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding"; + "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding"; + "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding"; + "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent"; + "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire"; + "HGraphStorage" = dontDistribute super."HGraphStorage"; + "HHDL" = dontDistribute super."HHDL"; + "HJScript" = dontDistribute super."HJScript"; + "HJVM" = dontDistribute super."HJVM"; + "HJavaScript" = dontDistribute super."HJavaScript"; + "HLearn-algebra" = dontDistribute super."HLearn-algebra"; + "HLearn-approximation" = dontDistribute super."HLearn-approximation"; + "HLearn-classification" = dontDistribute super."HLearn-classification"; + "HLearn-datastructures" = dontDistribute super."HLearn-datastructures"; + "HLearn-distributions" = dontDistribute super."HLearn-distributions"; + "HListPP" = dontDistribute super."HListPP"; + "HLogger" = dontDistribute super."HLogger"; + "HMM" = dontDistribute super."HMM"; + "HMap" = dontDistribute super."HMap"; + "HNM" = dontDistribute super."HNM"; + "HODE" = dontDistribute super."HODE"; + "HOpenCV" = dontDistribute super."HOpenCV"; + "HPDF" = dontDistribute super."HPDF"; + "HPath" = dontDistribute super."HPath"; + "HPi" = dontDistribute super."HPi"; + "HPlot" = dontDistribute super."HPlot"; + "HPong" = dontDistribute super."HPong"; + "HROOT" = dontDistribute super."HROOT"; + "HROOT-core" = dontDistribute super."HROOT-core"; + "HROOT-graf" = dontDistribute super."HROOT-graf"; + "HROOT-hist" = dontDistribute super."HROOT-hist"; + "HROOT-io" = dontDistribute super."HROOT-io"; + "HROOT-math" = dontDistribute super."HROOT-math"; + "HRay" = dontDistribute super."HRay"; + "HSFFIG" = dontDistribute super."HSFFIG"; + "HSGEP" = dontDistribute super."HSGEP"; + "HSH" = dontDistribute super."HSH"; + "HSHHelpers" = dontDistribute super."HSHHelpers"; + "HSlippyMap" = dontDistribute super."HSlippyMap"; + "HSmarty" = dontDistribute super."HSmarty"; + "HSoundFile" = dontDistribute super."HSoundFile"; + "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; + "HSvm" = dontDistribute super."HSvm"; + "HTTP-Simple" = dontDistribute super."HTTP-Simple"; + "HTab" = dontDistribute super."HTab"; + "HTicTacToe" = dontDistribute super."HTicTacToe"; + "HUnit-Diff" = dontDistribute super."HUnit-Diff"; + "HUnit-Plus" = dontDistribute super."HUnit-Plus"; + "HUnit-approx" = dontDistribute super."HUnit-approx"; + "HXMPP" = dontDistribute super."HXMPP"; + "HXQ" = dontDistribute super."HXQ"; + "HaLeX" = dontDistribute super."HaLeX"; + "HaMinitel" = dontDistribute super."HaMinitel"; + "HaPy" = dontDistribute super."HaPy"; + "HaRe" = dontDistribute super."HaRe"; + "HaTeX-meta" = dontDistribute super."HaTeX-meta"; + "HaTeX-qq" = dontDistribute super."HaTeX-qq"; + "HaVSA" = dontDistribute super."HaVSA"; + "Hach" = dontDistribute super."Hach"; + "HackMail" = dontDistribute super."HackMail"; + "Haggressive" = dontDistribute super."Haggressive"; + "HandlerSocketClient" = dontDistribute super."HandlerSocketClient"; + "Hangman" = dontDistribute super."Hangman"; + "HarmTrace" = dontDistribute super."HarmTrace"; + "HarmTrace-Base" = dontDistribute super."HarmTrace-Base"; + "HasGP" = dontDistribute super."HasGP"; + "Haschoo" = dontDistribute super."Haschoo"; + "Hashell" = dontDistribute super."Hashell"; + "HaskellForMaths" = dontDistribute super."HaskellForMaths"; + "HaskellLM" = dontDistribute super."HaskellLM"; + "HaskellNN" = dontDistribute super."HaskellNN"; + "HaskellNet-SSL" = dontDistribute super."HaskellNet-SSL"; + "HaskellTorrent" = dontDistribute super."HaskellTorrent"; + "HaskellTutorials" = dontDistribute super."HaskellTutorials"; + "Haskelloids" = dontDistribute super."Haskelloids"; + "Hawk" = dontDistribute super."Hawk"; + "Hayoo" = dontDistribute super."Hayoo"; + "Hclip" = dontDistribute super."Hclip"; + "Hedi" = dontDistribute super."Hedi"; + "HerbiePlugin" = dontDistribute super."HerbiePlugin"; + "Hermes" = dontDistribute super."Hermes"; + "Hieroglyph" = dontDistribute super."Hieroglyph"; + "HiggsSet" = dontDistribute super."HiggsSet"; + "Hipmunk" = dontDistribute super."Hipmunk"; + "HipmunkPlayground" = dontDistribute super."HipmunkPlayground"; + "Histogram" = dontDistribute super."Histogram"; + "Hmpf" = dontDistribute super."Hmpf"; + "Hoed" = dontDistribute super."Hoed"; + "HoleyMonoid" = dontDistribute super."HoleyMonoid"; + "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution"; + "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce"; + "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine"; + "Holumbus-Storage" = dontDistribute super."Holumbus-Storage"; + "Homology" = dontDistribute super."Homology"; + "HongoDB" = dontDistribute super."HongoDB"; + "HostAndPort" = dontDistribute super."HostAndPort"; + "Hricket" = dontDistribute super."Hricket"; + "Hs2lib" = dontDistribute super."Hs2lib"; + "HsASA" = dontDistribute super."HsASA"; + "HsHaruPDF" = dontDistribute super."HsHaruPDF"; + "HsHyperEstraier" = dontDistribute super."HsHyperEstraier"; + "HsJudy" = dontDistribute super."HsJudy"; + "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system"; + "HsParrot" = dontDistribute super."HsParrot"; + "HsPerl5" = dontDistribute super."HsPerl5"; + "HsSVN" = dontDistribute super."HsSVN"; + "HsSyck" = dontDistribute super."HsSyck"; + "HsTools" = dontDistribute super."HsTools"; + "Hsed" = dontDistribute super."Hsed"; + "Hsmtlib" = dontDistribute super."Hsmtlib"; + "HueAPI" = dontDistribute super."HueAPI"; + "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; + "IDynamic" = dontDistribute super."IDynamic"; + "IFS" = dontDistribute super."IFS"; + "INblobs" = dontDistribute super."INblobs"; + "IOR" = dontDistribute super."IOR"; + "IORefCAS" = dontDistribute super."IORefCAS"; + "IcoGrid" = dontDistribute super."IcoGrid"; + "Imlib" = dontDistribute super."Imlib"; + "ImperativeHaskell" = dontDistribute super."ImperativeHaskell"; + "IndentParser" = dontDistribute super."IndentParser"; + "IndexedList" = dontDistribute super."IndexedList"; + "InfixApplicative" = dontDistribute super."InfixApplicative"; + "Interpolation" = dontDistribute super."Interpolation"; + "Interpolation-maxs" = dontDistribute super."Interpolation-maxs"; + "IntervalMap" = dontDistribute super."IntervalMap"; + "Irc" = dontDistribute super."Irc"; + "IrrHaskell" = dontDistribute super."IrrHaskell"; + "IsNull" = dontDistribute super."IsNull"; + "JSON-Combinator" = dontDistribute super."JSON-Combinator"; + "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples"; + "JSONb" = dontDistribute super."JSONb"; + "JYU-Utils" = dontDistribute super."JYU-Utils"; + "JackMiniMix" = dontDistribute super."JackMiniMix"; + "Javasf" = dontDistribute super."Javasf"; + "Javav" = dontDistribute super."Javav"; + "JsContracts" = dontDistribute super."JsContracts"; + "JsonGrammar" = dontDistribute super."JsonGrammar"; + "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; + "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa"; + "JuicyPixels-util" = dontDistribute super."JuicyPixels-util"; + "JunkDB" = dontDistribute super."JunkDB"; + "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm"; + "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables"; + "JustParse" = dontDistribute super."JustParse"; + "KMP" = dontDistribute super."KMP"; + "KSP" = dontDistribute super."KSP"; + "Kalman" = dontDistribute super."Kalman"; + "KdTree" = dontDistribute super."KdTree"; + "Ketchup" = dontDistribute super."Ketchup"; + "KiCS" = dontDistribute super."KiCS"; + "KiCS-debugger" = dontDistribute super."KiCS-debugger"; + "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; + "Kleislify" = dontDistribute super."Kleislify"; + "Konf" = dontDistribute super."Konf"; + "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"; + "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"; + "LinkChecker" = dontDistribute super."LinkChecker"; + "ListTree" = dontDistribute super."ListTree"; + "ListZipper" = dontDistribute super."ListZipper"; + "Logic" = dontDistribute super."Logic"; + "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees"; + "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI"; + "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network"; + "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes"; + "LslPlus" = dontDistribute super."LslPlus"; + "Lucu" = dontDistribute super."Lucu"; + "MC-Fold-DP" = dontDistribute super."MC-Fold-DP"; + "MFlow" = dontDistribute super."MFlow"; + "MHask" = dontDistribute super."MHask"; + "MSQueue" = dontDistribute super."MSQueue"; + "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"; + "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator"; + "MiniAgda" = dontDistribute super."MiniAgda"; + "MissingK" = dontDistribute super."MissingK"; + "MissingM" = dontDistribute super."MissingM"; + "MissingPy" = dontDistribute super."MissingPy"; + "Modulo" = dontDistribute super."Modulo"; + "Moe" = dontDistribute super."Moe"; + "MoeDict" = dontDistribute super."MoeDict"; + "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl"; + "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign"; + "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; + "MonadCompose" = dontDistribute super."MonadCompose"; + "MonadLab" = dontDistribute super."MonadLab"; + "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; + "MonadStack" = dontDistribute super."MonadStack"; + "Monadius" = dontDistribute super."Monadius"; + "Monaris" = dontDistribute super."Monaris"; + "Monatron" = dontDistribute super."Monatron"; + "Monatron-IO" = dontDistribute super."Monatron-IO"; + "Monocle" = dontDistribute super."Monocle"; + "MorseCode" = dontDistribute super."MorseCode"; + "MuCheck" = dontDistribute super."MuCheck"; + "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit"; + "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec"; + "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck"; + "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck"; + "Munkres" = dontDistribute super."Munkres"; + "Munkres-simple" = dontDistribute super."Munkres-simple"; + "MusicBrainz" = dontDistribute super."MusicBrainz"; + "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid"; + "MyPrimes" = dontDistribute super."MyPrimes"; + "NGrams" = dontDistribute super."NGrams"; + "NTRU" = dontDistribute super."NTRU"; + "NXT" = dontDistribute super."NXT"; + "NXTDSL" = dontDistribute super."NXTDSL"; + "NanoProlog" = dontDistribute super."NanoProlog"; + "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; + "NaturalSort" = dontDistribute super."NaturalSort"; + "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; + "Neks" = dontDistribute super."Neks"; + "NestedFunctor" = dontDistribute super."NestedFunctor"; + "NestedSampling" = dontDistribute super."NestedSampling"; + "NetSNMP" = dontDistribute super."NetSNMP"; + "NewBinary" = dontDistribute super."NewBinary"; + "Ninjas" = dontDistribute super."Ninjas"; + "NoSlow" = dontDistribute super."NoSlow"; + "NoTrace" = dontDistribute super."NoTrace"; + "Noise" = dontDistribute super."Noise"; + "Nomyx" = dontDistribute super."Nomyx"; + "Nomyx-Core" = dontDistribute super."Nomyx-Core"; + "Nomyx-Language" = dontDistribute super."Nomyx-Language"; + "Nomyx-Rules" = dontDistribute super."Nomyx-Rules"; + "Nomyx-Web" = dontDistribute super."Nomyx-Web"; + "NonEmpty" = dontDistribute super."NonEmpty"; + "NonEmptyList" = dontDistribute super."NonEmptyList"; + "NumLazyByteString" = dontDistribute super."NumLazyByteString"; + "NumberSieves" = dontDistribute super."NumberSieves"; + "Numbers" = dontDistribute super."Numbers"; + "Nussinov78" = dontDistribute super."Nussinov78"; + "Nutri" = dontDistribute super."Nutri"; + "OGL" = dontDistribute super."OGL"; + "OSM" = dontDistribute super."OSM"; + "OTP" = dontDistribute super."OTP"; + "Object" = dontDistribute super."Object"; + "ObjectIO" = dontDistribute super."ObjectIO"; + "ObjectName" = dontDistribute super."ObjectName"; + "Obsidian" = dontDistribute super."Obsidian"; + "OddWord" = dontDistribute super."OddWord"; + "Omega" = dontDistribute super."Omega"; + "OpenAFP" = dontDistribute super."OpenAFP"; + "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils"; + "OpenAL" = dontDistribute super."OpenAL"; + "OpenCL" = dontDistribute super."OpenCL"; + "OpenCLRaw" = dontDistribute super."OpenCLRaw"; + "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; + "OpenGL" = dontDistribute super."OpenGL"; + "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = dontDistribute super."OpenGLRaw"; + "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; + "OpenSCAD" = dontDistribute super."OpenSCAD"; + "OpenVG" = dontDistribute super."OpenVG"; + "OpenVGRaw" = dontDistribute super."OpenVGRaw"; + "Operads" = dontDistribute super."Operads"; + "OptDir" = dontDistribute super."OptDir"; + "OrPatterns" = dontDistribute super."OrPatterns"; + "OrchestrateDB" = dontDistribute super."OrchestrateDB"; + "OrderedBits" = dontDistribute super."OrderedBits"; + "Ordinals" = dontDistribute super."Ordinals"; + "PArrows" = dontDistribute super."PArrows"; + "PBKDF2" = dontDistribute super."PBKDF2"; + "PCLT" = dontDistribute super."PCLT"; + "PCLT-DB" = dontDistribute super."PCLT-DB"; + "PDBtools" = dontDistribute super."PDBtools"; + "PTQ" = dontDistribute super."PTQ"; + "PageIO" = dontDistribute super."PageIO"; + "Paillier" = dontDistribute super."Paillier"; + "PandocAgda" = dontDistribute super."PandocAgda"; + "Paraiso" = dontDistribute super."Paraiso"; + "Parry" = dontDistribute super."Parry"; + "ParsecTools" = dontDistribute super."ParsecTools"; + "ParserFunction" = dontDistribute super."ParserFunction"; + "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; + "PasswordGenerator" = dontDistribute super."PasswordGenerator"; + "PastePipe" = dontDistribute super."PastePipe"; + "Pathfinder" = dontDistribute super."Pathfinder"; + "Peano" = dontDistribute super."Peano"; + "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; + "PerfectHash" = dontDistribute super."PerfectHash"; + "PermuteEffects" = dontDistribute super."PermuteEffects"; + "Phsu" = dontDistribute super."Phsu"; + "Pipe" = dontDistribute super."Pipe"; + "Piso" = dontDistribute super."Piso"; + "PlayHangmanGame" = dontDistribute super."PlayHangmanGame"; + "PlayingCards" = dontDistribute super."PlayingCards"; + "Plot-ho-matic" = dontDistribute super."Plot-ho-matic"; + "PlslTools" = dontDistribute super."PlslTools"; + "Plural" = dontDistribute super."Plural"; + "Pollutocracy" = dontDistribute super."Pollutocracy"; + "PortFusion" = dontDistribute super."PortFusion"; + "PortMidi" = dontDistribute super."PortMidi"; + "PostgreSQL" = dontDistribute super."PostgreSQL"; + "PrimitiveArray" = dontDistribute super."PrimitiveArray"; + "Printf-TH" = dontDistribute super."Printf-TH"; + "PriorityChansConverger" = dontDistribute super."PriorityChansConverger"; + "ProbabilityMonads" = dontDistribute super."ProbabilityMonads"; + "PropLogic" = dontDistribute super."PropLogic"; + "Proper" = dontDistribute super."Proper"; + "ProxN" = dontDistribute super."ProxN"; + "Pugs" = dontDistribute super."Pugs"; + "Pup-Events" = dontDistribute super."Pup-Events"; + "Pup-Events-Client" = dontDistribute super."Pup-Events-Client"; + "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo"; + "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue"; + "Pup-Events-Server" = dontDistribute super."Pup-Events-Server"; + "QIO" = dontDistribute super."QIO"; + "QuadEdge" = dontDistribute super."QuadEdge"; + "QuadTree" = dontDistribute super."QuadTree"; + "QuickAnnotate" = dontDistribute super."QuickAnnotate"; + "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; + "Quickson" = dontDistribute super."Quickson"; + "R-pandoc" = dontDistribute super."R-pandoc"; + "RANSAC" = dontDistribute super."RANSAC"; + "RBTree" = dontDistribute super."RBTree"; + "RESTng" = dontDistribute super."RESTng"; + "RFC1751" = dontDistribute super."RFC1751"; + "RJson" = dontDistribute super."RJson"; + "RMP" = dontDistribute super."RMP"; + "RNAFold" = dontDistribute super."RNAFold"; + "RNAFoldProgs" = dontDistribute super."RNAFoldProgs"; + "RNAdesign" = dontDistribute super."RNAdesign"; + "RNAdraw" = dontDistribute super."RNAdraw"; + "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"; + "SVGPath" = dontDistribute super."SVGPath"; + "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB"; + "SableCC2Hs" = dontDistribute super."SableCC2Hs"; + "Safe" = dontDistribute super."Safe"; + "Salsa" = dontDistribute super."Salsa"; + "Saturnin" = dontDistribute super."Saturnin"; + "SciFlow" = dontDistribute super."SciFlow"; + "ScratchFs" = dontDistribute super."ScratchFs"; + "Scurry" = dontDistribute super."Scurry"; + "SegmentTree" = dontDistribute super."SegmentTree"; + "Semantique" = dontDistribute super."Semantique"; + "Semigroup" = dontDistribute super."Semigroup"; + "SeqAlign" = dontDistribute super."SeqAlign"; + "SessionLogger" = dontDistribute super."SessionLogger"; + "ShellCheck" = dontDistribute super."ShellCheck"; + "Shellac" = dontDistribute super."Shellac"; + "Shellac-compatline" = dontDistribute super."Shellac-compatline"; + "Shellac-editline" = dontDistribute super."Shellac-editline"; + "Shellac-haskeline" = dontDistribute super."Shellac-haskeline"; + "Shellac-readline" = dontDistribute super."Shellac-readline"; + "ShowF" = dontDistribute super."ShowF"; + "Shrub" = dontDistribute super."Shrub"; + "Shu-thing" = dontDistribute super."Shu-thing"; + "SimpleAES" = dontDistribute super."SimpleAES"; + "SimpleEA" = dontDistribute super."SimpleEA"; + "SimpleGL" = dontDistribute super."SimpleGL"; + "SimpleH" = dontDistribute super."SimpleH"; + "SimpleLog" = dontDistribute super."SimpleLog"; + "SizeCompare" = dontDistribute super."SizeCompare"; + "Smooth" = dontDistribute super."Smooth"; + "SmtLib" = dontDistribute super."SmtLib"; + "Snusmumrik" = dontDistribute super."Snusmumrik"; + "SoOSiM" = dontDistribute super."SoOSiM"; + "SoccerFun" = dontDistribute super."SoccerFun"; + "SoccerFunGL" = dontDistribute super."SoccerFunGL"; + "Sonnex" = dontDistribute super."Sonnex"; + "SourceGraph" = dontDistribute super."SourceGraph"; + "Southpaw" = dontDistribute super."Southpaw"; + "SpaceInvaders" = dontDistribute super."SpaceInvaders"; + "SpacePrivateers" = dontDistribute super."SpacePrivateers"; + "SpinCounter" = dontDistribute super."SpinCounter"; + "Spock" = doDistribute super."Spock_0_8_1_0"; + "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "SpreadsheetML" = dontDistribute super."SpreadsheetML"; + "Sprig" = dontDistribute super."Sprig"; + "Stasis" = dontDistribute super."Stasis"; + "StateVar-transformer" = dontDistribute super."StateVar-transformer"; + "StatisticalMethods" = dontDistribute super."StatisticalMethods"; + "Stomp" = dontDistribute super."Stomp"; + "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib"; + "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell"; + "Strafunski-StrategyLib" = dontDistribute super."Strafunski-StrategyLib"; + "StrappedTemplates" = dontDistribute super."StrappedTemplates"; + "StrategyLib" = dontDistribute super."StrategyLib"; + "StrictBench" = dontDistribute super."StrictBench"; + "SuffixStructures" = dontDistribute super."SuffixStructures"; + "SybWidget" = dontDistribute super."SybWidget"; + "SyntaxMacros" = dontDistribute super."SyntaxMacros"; + "Sysmon" = dontDistribute super."Sysmon"; + "TBC" = dontDistribute super."TBC"; + "TBit" = dontDistribute super."TBit"; + "THEff" = dontDistribute super."THEff"; + "TTTAS" = dontDistribute super."TTTAS"; + "TV" = dontDistribute super."TV"; + "TYB" = dontDistribute super."TYB"; + "TableAlgebra" = dontDistribute super."TableAlgebra"; + "Tables" = dontDistribute super."Tables"; + "Tablify" = dontDistribute super."Tablify"; + "Tainted" = dontDistribute super."Tainted"; + "Takusen" = dontDistribute super."Takusen"; + "Tape" = dontDistribute super."Tape"; + "Taxonomy" = dontDistribute super."Taxonomy"; + "TeaHS" = dontDistribute super."TeaHS"; + "Tensor" = dontDistribute super."Tensor"; + "TernaryTrees" = dontDistribute super."TernaryTrees"; + "TestExplode" = dontDistribute super."TestExplode"; + "Theora" = dontDistribute super."Theora"; + "Thingie" = dontDistribute super."Thingie"; + "ThreadObjects" = dontDistribute super."ThreadObjects"; + "Thrift" = dontDistribute super."Thrift"; + "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; + "TicTacToe" = dontDistribute super."TicTacToe"; + "TigerHash" = dontDistribute super."TigerHash"; + "TimePiece" = dontDistribute super."TimePiece"; + "TinyLaunchbury" = dontDistribute super."TinyLaunchbury"; + "TinyURL" = dontDistribute super."TinyURL"; + "Titim" = dontDistribute super."Titim"; + "Top" = dontDistribute super."Top"; + "Tournament" = dontDistribute super."Tournament"; + "TraceUtils" = dontDistribute super."TraceUtils"; + "TransformersStepByStep" = dontDistribute super."TransformersStepByStep"; + "Transhare" = dontDistribute super."Transhare"; + "TreeCounter" = dontDistribute super."TreeCounter"; + "TreeStructures" = dontDistribute super."TreeStructures"; + "TreeT" = dontDistribute super."TreeT"; + "Treiber" = dontDistribute super."Treiber"; + "TrendGraph" = dontDistribute super."TrendGraph"; + "TrieMap" = dontDistribute super."TrieMap"; + "Twofish" = dontDistribute super."Twofish"; + "TypeClass" = dontDistribute super."TypeClass"; + "TypeCompose" = dontDistribute super."TypeCompose"; + "TypeIlluminator" = dontDistribute super."TypeIlluminator"; + "TypeNat" = dontDistribute super."TypeNat"; + "TypingTester" = dontDistribute super."TypingTester"; + "UISF" = dontDistribute super."UISF"; + "UMM" = dontDistribute super."UMM"; + "URLT" = dontDistribute super."URLT"; + "URLb" = dontDistribute super."URLb"; + "UTFTConverter" = dontDistribute super."UTFTConverter"; + "Unique" = dontDistribute super."Unique"; + "Unixutils-shadow" = dontDistribute super."Unixutils-shadow"; + "Updater" = dontDistribute super."Updater"; + "UrlDisp" = dontDistribute super."UrlDisp"; + "Useful" = dontDistribute super."Useful"; + "UtilityTM" = dontDistribute super."UtilityTM"; + "VKHS" = dontDistribute super."VKHS"; + "Validation" = dontDistribute super."Validation"; + "Vec" = dontDistribute super."Vec"; + "Vec-Boolean" = dontDistribute super."Vec-Boolean"; + "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw"; + "Vec-Transform" = dontDistribute super."Vec-Transform"; + "VecN" = dontDistribute super."VecN"; + "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings"; + "ViennaRNAParser" = dontDistribute super."ViennaRNAParser"; + "WAVE" = dontDistribute super."WAVE"; + "WL500gPControl" = dontDistribute super."WL500gPControl"; + "WL500gPLib" = dontDistribute super."WL500gPLib"; + "WMSigner" = dontDistribute super."WMSigner"; + "WURFL" = dontDistribute super."WURFL"; + "WXDiffCtrl" = dontDistribute super."WXDiffCtrl"; + "WashNGo" = dontDistribute super."WashNGo"; + "Weather" = dontDistribute super."Weather"; + "WebBits" = dontDistribute super."WebBits"; + "WebBits-Html" = dontDistribute super."WebBits-Html"; + "WebBits-multiplate" = dontDistribute super."WebBits-multiplate"; + "WebCont" = dontDistribute super."WebCont"; + "WeberLogic" = dontDistribute super."WeberLogic"; + "Webrexp" = dontDistribute super."Webrexp"; + "Wheb" = dontDistribute super."Wheb"; + "WikimediaParser" = dontDistribute super."WikimediaParser"; + "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server"; + "Win32-errors" = dontDistribute super."Win32-errors"; + "Win32-extras" = dontDistribute super."Win32-extras"; + "Win32-junction-point" = dontDistribute super."Win32-junction-point"; + "Win32-security" = dontDistribute super."Win32-security"; + "Win32-services" = dontDistribute super."Win32-services"; + "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; + "Wired" = dontDistribute super."Wired"; + "WordNet" = dontDistribute super."WordNet"; + "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; + "Wordlint" = dontDistribute super."Wordlint"; + "WxGeneric" = dontDistribute super."WxGeneric"; + "X11-extras" = dontDistribute super."X11-extras"; + "X11-rm" = dontDistribute super."X11-rm"; + "X11-xdamage" = dontDistribute super."X11-xdamage"; + "X11-xfixes" = dontDistribute super."X11-xfixes"; + "X11-xft" = dontDistribute super."X11-xft"; + "X11-xshape" = dontDistribute super."X11-xshape"; + "XAttr" = dontDistribute super."XAttr"; + "XInput" = dontDistribute super."XInput"; + "XMMS" = dontDistribute super."XMMS"; + "XMPP" = dontDistribute super."XMPP"; + "XSaiga" = dontDistribute super."XSaiga"; + "Xauth" = dontDistribute super."Xauth"; + "Xec" = dontDistribute super."Xec"; + "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter"; + "Xorshift128Plus" = dontDistribute super."Xorshift128Plus"; + "YACPong" = dontDistribute super."YACPong"; + "YFrob" = dontDistribute super."YFrob"; + "Yablog" = dontDistribute super."Yablog"; + "YamlReference" = dontDistribute super."YamlReference"; + "Yampa-core" = dontDistribute super."Yampa-core"; + "Yocto" = dontDistribute super."Yocto"; + "Yogurt" = dontDistribute super."Yogurt"; + "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone"; + "ZEBEDDE" = dontDistribute super."ZEBEDDE"; + "ZFS" = dontDistribute super."ZFS"; + "ZMachine" = dontDistribute super."ZMachine"; + "ZipFold" = dontDistribute super."ZipFold"; + "ZipperAG" = dontDistribute super."ZipperAG"; + "Zora" = dontDistribute super."Zora"; + "Zwaluw" = dontDistribute super."Zwaluw"; + "a50" = dontDistribute super."a50"; + "abacate" = dontDistribute super."abacate"; + "abc-puzzle" = dontDistribute super."abc-puzzle"; + "abcBridge" = dontDistribute super."abcBridge"; + "abcnotation" = dontDistribute super."abcnotation"; + "abeson" = dontDistribute super."abeson"; + "abstract-deque-tests" = dontDistribute super."abstract-deque-tests"; + "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate"; + "abt" = dontDistribute super."abt"; + "ac-machine" = dontDistribute super."ac-machine"; + "ac-machine-conduit" = dontDistribute super."ac-machine-conduit"; + "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic"; + "accelerate-cublas" = dontDistribute super."accelerate-cublas"; + "accelerate-cuda" = dontDistribute super."accelerate-cuda"; + "accelerate-cufft" = dontDistribute super."accelerate-cufft"; + "accelerate-examples" = dontDistribute super."accelerate-examples"; + "accelerate-fft" = dontDistribute super."accelerate-fft"; + "accelerate-fftw" = dontDistribute super."accelerate-fftw"; + "accelerate-fourier" = dontDistribute super."accelerate-fourier"; + "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark"; + "accelerate-io" = dontDistribute super."accelerate-io"; + "accelerate-utility" = dontDistribute super."accelerate-utility"; + "accentuateus" = dontDistribute super."accentuateus"; + "access-time" = dontDistribute super."access-time"; + "acid-state" = doDistribute super."acid-state_0_12_4"; + "acid-state-dist" = dontDistribute super."acid-state-dist"; + "acid-state-tls" = dontDistribute super."acid-state-tls"; + "acl2" = dontDistribute super."acl2"; + "acme-all-monad" = dontDistribute super."acme-all-monad"; + "acme-box" = dontDistribute super."acme-box"; + "acme-cadre" = dontDistribute super."acme-cadre"; + "acme-cofunctor" = dontDistribute super."acme-cofunctor"; + "acme-colosson" = dontDistribute super."acme-colosson"; + "acme-comonad" = dontDistribute super."acme-comonad"; + "acme-cutegirl" = dontDistribute super."acme-cutegirl"; + "acme-dont" = dontDistribute super."acme-dont"; + "acme-flipping-tables" = dontDistribute super."acme-flipping-tables"; + "acme-grawlix" = dontDistribute super."acme-grawlix"; + "acme-hq9plus" = dontDistribute super."acme-hq9plus"; + "acme-http" = dontDistribute super."acme-http"; + "acme-inator" = dontDistribute super."acme-inator"; + "acme-io" = dontDistribute super."acme-io"; + "acme-lolcat" = dontDistribute super."acme-lolcat"; + "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval"; + "acme-memorandom" = dontDistribute super."acme-memorandom"; + "acme-microwave" = dontDistribute super."acme-microwave"; + "acme-miscorder" = dontDistribute super."acme-miscorder"; + "acme-missiles" = dontDistribute super."acme-missiles"; + "acme-now" = dontDistribute super."acme-now"; + "acme-numbersystem" = dontDistribute super."acme-numbersystem"; + "acme-omitted" = dontDistribute super."acme-omitted"; + "acme-one" = dontDistribute super."acme-one"; + "acme-operators" = dontDistribute super."acme-operators"; + "acme-php" = dontDistribute super."acme-php"; + "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers"; + "acme-realworld" = dontDistribute super."acme-realworld"; + "acme-safe" = dontDistribute super."acme-safe"; + "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel"; + "acme-strfry" = dontDistribute super."acme-strfry"; + "acme-stringly-typed" = dontDistribute super."acme-stringly-typed"; + "acme-strtok" = dontDistribute super."acme-strtok"; + "acme-timemachine" = dontDistribute super."acme-timemachine"; + "acme-year" = dontDistribute super."acme-year"; + "acme-zero" = dontDistribute super."acme-zero"; + "activehs" = dontDistribute super."activehs"; + "activehs-base" = dontDistribute super."activehs-base"; + "activitystreams-aeson" = dontDistribute super."activitystreams-aeson"; + "actor" = dontDistribute super."actor"; + "adaptive-containers" = dontDistribute super."adaptive-containers"; + "adaptive-tuple" = dontDistribute super."adaptive-tuple"; + "adb" = dontDistribute super."adb"; + "adblock2privoxy" = dontDistribute super."adblock2privoxy"; + "addLicenseInfo" = dontDistribute super."addLicenseInfo"; + "adhoc-network" = dontDistribute super."adhoc-network"; + "adict" = dontDistribute super."adict"; + "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; + "adp-multi" = dontDistribute super."adp-multi"; + "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; + "aeson" = doDistribute super."aeson_0_8_0_2"; + "aeson-applicative" = dontDistribute super."aeson-applicative"; + "aeson-bson" = dontDistribute super."aeson-bson"; + "aeson-casing" = dontDistribute super."aeson-casing"; + "aeson-diff" = dontDistribute super."aeson-diff"; + "aeson-lens" = dontDistribute super."aeson-lens"; + "aeson-native" = dontDistribute super."aeson-native"; + "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7"; + "aeson-serialize" = dontDistribute super."aeson-serialize"; + "aeson-smart" = dontDistribute super."aeson-smart"; + "aeson-streams" = dontDistribute super."aeson-streams"; + "aeson-t" = dontDistribute super."aeson-t"; + "aeson-toolkit" = dontDistribute super."aeson-toolkit"; + "aeson-value-parser" = dontDistribute super."aeson-value-parser"; + "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc"; + "afis" = dontDistribute super."afis"; + "afv" = dontDistribute super."afv"; + "agda-server" = dontDistribute super."agda-server"; + "agum" = dontDistribute super."agum"; + "aig" = dontDistribute super."aig"; + "air" = dontDistribute super."air"; + "air-extra" = dontDistribute super."air-extra"; + "air-spec" = dontDistribute super."air-spec"; + "air-th" = dontDistribute super."air-th"; + "airbrake" = dontDistribute super."airbrake"; + "airship" = dontDistribute super."airship"; + "aivika" = dontDistribute super."aivika"; + "aivika-experiment" = dontDistribute super."aivika-experiment"; + "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; + "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; + "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams"; + "aivika-transformers" = dontDistribute super."aivika-transformers"; + "ajhc" = dontDistribute super."ajhc"; + "al" = dontDistribute super."al"; + "alea" = dontDistribute super."alea"; + "alex-meta" = dontDistribute super."alex-meta"; + "alfred" = dontDistribute super."alfred"; + "algebra" = dontDistribute super."algebra"; + "algebra-dag" = dontDistribute super."algebra-dag"; + "algebra-sql" = dontDistribute super."algebra-sql"; + "algebraic" = dontDistribute super."algebraic"; + "algebraic-classes" = dontDistribute super."algebraic-classes"; + "align" = dontDistribute super."align"; + "align-text" = dontDistribute super."align-text"; + "aligned-foreignptr" = dontDistribute super."aligned-foreignptr"; + "allocated-processor" = dontDistribute super."allocated-processor"; + "alloy" = dontDistribute super."alloy"; + "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd"; + "almost-fix" = dontDistribute super."almost-fix"; + "alms" = dontDistribute super."alms"; + "alpha" = dontDistribute super."alpha"; + "alpino-tools" = dontDistribute super."alpino-tools"; + "alsa" = dontDistribute super."alsa"; + "alsa-core" = dontDistribute super."alsa-core"; + "alsa-gui" = dontDistribute super."alsa-gui"; + "alsa-midi" = dontDistribute super."alsa-midi"; + "alsa-mixer" = dontDistribute super."alsa-mixer"; + "alsa-pcm" = dontDistribute super."alsa-pcm"; + "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests"; + "alsa-seq" = dontDistribute super."alsa-seq"; + "alsa-seq-tests" = dontDistribute super."alsa-seq-tests"; + "altcomposition" = dontDistribute super."altcomposition"; + "alternative-io" = dontDistribute super."alternative-io"; + "altfloat" = dontDistribute super."altfloat"; + "alure" = dontDistribute super."alure"; + "amazon-emailer" = dontDistribute super."amazon-emailer"; + "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap"; + "amazon-products" = dontDistribute super."amazon-products"; + "amazonka" = doDistribute super."amazonka_0_3_6"; + "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_0_3_6"; + "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_0_3_6"; + "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_0_3_6"; + "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_0_3_6"; + "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_0_3_6"; + "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_0_3_6"; + "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_0_3_6"; + "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_0_3_6"; + "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_0_3_6"; + "amazonka-codecommit" = dontDistribute super."amazonka-codecommit"; + "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6"; + "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline"; + "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6"; + "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6"; + "amazonka-config" = doDistribute super."amazonka-config_0_3_6"; + "amazonka-core" = doDistribute super."amazonka-core_0_3_6"; + "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_0_3_6"; + "amazonka-devicefarm" = dontDistribute super."amazonka-devicefarm"; + "amazonka-directconnect" = doDistribute super."amazonka-directconnect_0_3_6"; + "amazonka-ds" = dontDistribute super."amazonka-ds"; + "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_0_3_6"; + "amazonka-dynamodb-streams" = dontDistribute super."amazonka-dynamodb-streams"; + "amazonka-ec2" = doDistribute super."amazonka-ec2_0_3_6_1"; + "amazonka-ecs" = doDistribute super."amazonka-ecs_0_3_6"; + "amazonka-efs" = dontDistribute super."amazonka-efs"; + "amazonka-elasticache" = doDistribute super."amazonka-elasticache_0_3_6"; + "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_0_3_6"; + "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_0_3_6"; + "amazonka-elb" = doDistribute super."amazonka-elb_0_3_6"; + "amazonka-emr" = doDistribute super."amazonka-emr_0_3_6"; + "amazonka-glacier" = doDistribute super."amazonka-glacier_0_3_6"; + "amazonka-iam" = doDistribute super."amazonka-iam_0_3_6"; + "amazonka-importexport" = doDistribute super."amazonka-importexport_0_3_6"; + "amazonka-kinesis" = doDistribute super."amazonka-kinesis_0_3_6"; + "amazonka-kms" = doDistribute super."amazonka-kms_0_3_6"; + "amazonka-lambda" = doDistribute super."amazonka-lambda_0_3_6"; + "amazonka-ml" = doDistribute super."amazonka-ml_0_3_6"; + "amazonka-opsworks" = doDistribute super."amazonka-opsworks_0_3_6"; + "amazonka-rds" = doDistribute super."amazonka-rds_0_3_6"; + "amazonka-redshift" = doDistribute super."amazonka-redshift_0_3_6"; + "amazonka-route53" = doDistribute super."amazonka-route53_0_3_6_1"; + "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_0_3_6"; + "amazonka-s3" = doDistribute super."amazonka-s3_0_3_6"; + "amazonka-sdb" = doDistribute super."amazonka-sdb_0_3_6"; + "amazonka-ses" = doDistribute super."amazonka-ses_0_3_6"; + "amazonka-sns" = doDistribute super."amazonka-sns_0_3_6"; + "amazonka-sqs" = doDistribute super."amazonka-sqs_0_3_6"; + "amazonka-ssm" = doDistribute super."amazonka-ssm_0_3_6"; + "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_0_3_6"; + "amazonka-sts" = doDistribute super."amazonka-sts_0_3_6"; + "amazonka-support" = doDistribute super."amazonka-support_0_3_6"; + "amazonka-swf" = doDistribute super."amazonka-swf_0_3_6"; + "amazonka-test" = dontDistribute super."amazonka-test"; + "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6"; + "ampersand" = dontDistribute super."ampersand"; + "amqp-conduit" = dontDistribute super."amqp-conduit"; + "amrun" = dontDistribute super."amrun"; + "analyze-client" = dontDistribute super."analyze-client"; + "anansi" = dontDistribute super."anansi"; + "anansi-hscolour" = dontDistribute super."anansi-hscolour"; + "anansi-pandoc" = dontDistribute super."anansi-pandoc"; + "anatomy" = dontDistribute super."anatomy"; + "android-lint-summary" = dontDistribute super."android-lint-summary"; + "animalcase" = dontDistribute super."animalcase"; + "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0"; + "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests"; + "ansi-pretty" = dontDistribute super."ansi-pretty"; + "antagonist" = dontDistribute super."antagonist"; + "antfarm" = dontDistribute super."antfarm"; + "anticiv" = dontDistribute super."anticiv"; + "antigate" = dontDistribute super."antigate"; + "antimirov" = dontDistribute super."antimirov"; + "antiquoter" = dontDistribute super."antiquoter"; + "antisplice" = dontDistribute super."antisplice"; + "antlrc" = dontDistribute super."antlrc"; + "anydbm" = dontDistribute super."anydbm"; + "aosd" = dontDistribute super."aosd"; + "ap-reflect" = dontDistribute super."ap-reflect"; + "apache-md5" = dontDistribute super."apache-md5"; + "apelsin" = dontDistribute super."apelsin"; + "api-builder" = dontDistribute super."api-builder"; + "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode"; + "api-tools" = dontDistribute super."api-tools"; + "apiary-helics" = dontDistribute super."apiary-helics"; + "apiary-purescript" = dontDistribute super."apiary-purescript"; + "apis" = dontDistribute super."apis"; + "apotiki" = dontDistribute super."apotiki"; + "app-lens" = dontDistribute super."app-lens"; + "app-settings" = dontDistribute super."app-settings"; + "appc" = dontDistribute super."appc"; + "applicative-extras" = dontDistribute super."applicative-extras"; + "applicative-fail" = dontDistribute super."applicative-fail"; + "applicative-numbers" = dontDistribute super."applicative-numbers"; + "applicative-parsec" = dontDistribute super."applicative-parsec"; + "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"; + "arbtt" = doDistribute super."arbtt_0_9_0_5"; + "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"; + "argparser" = dontDistribute super."argparser"; + "arguedit" = dontDistribute super."arguedit"; + "ariadne" = dontDistribute super."ariadne"; + "arion" = dontDistribute super."arion"; + "arith-encode" = dontDistribute super."arith-encode"; + "arithmatic" = dontDistribute super."arithmatic"; + "arithmetic" = dontDistribute super."arithmetic"; + "arithmoi" = dontDistribute super."arithmoi"; + "armada" = dontDistribute super."armada"; + "arpa" = dontDistribute super."arpa"; + "array-forth" = dontDistribute super."array-forth"; + "array-memoize" = dontDistribute super."array-memoize"; + "array-primops" = dontDistribute super."array-primops"; + "array-utils" = dontDistribute super."array-utils"; + "arrow-improve" = dontDistribute super."arrow-improve"; + "arrowapply-utils" = dontDistribute super."arrowapply-utils"; + "arrowp" = dontDistribute super."arrowp"; + "artery" = dontDistribute super."artery"; + "arx" = dontDistribute super."arx"; + "arxiv" = dontDistribute super."arxiv"; + "ascetic" = dontDistribute super."ascetic"; + "ascii" = dontDistribute super."ascii"; + "ascii-progress" = dontDistribute super."ascii-progress"; + "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; + "ascii85-conduit" = dontDistribute super."ascii85-conduit"; + "asic" = dontDistribute super."asic"; + "asil" = dontDistribute super."asil"; + "asn1-data" = dontDistribute super."asn1-data"; + "asn1-encoding" = doDistribute super."asn1-encoding_0_9_2"; + "asn1-types" = doDistribute super."asn1-types_0_3_0"; + "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"; + "attempt" = dontDistribute super."attempt"; + "atto-lisp" = dontDistribute super."atto-lisp"; + "attoparsec" = doDistribute super."attoparsec_0_12_1_6"; + "attoparsec-arff" = dontDistribute super."attoparsec-arff"; + "attoparsec-binary" = dontDistribute super."attoparsec-binary"; + "attoparsec-conduit" = dontDistribute super."attoparsec-conduit"; + "attoparsec-csv" = dontDistribute super."attoparsec-csv"; + "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee"; + "attoparsec-parsec" = dontDistribute super."attoparsec-parsec"; + "attoparsec-text" = dontDistribute super."attoparsec-text"; + "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator"; + "attosplit" = dontDistribute super."attosplit"; + "atuin" = dontDistribute super."atuin"; + "audacity" = dontDistribute super."audacity"; + "audiovisual" = dontDistribute super."audiovisual"; + "augeas" = dontDistribute super."augeas"; + "augur" = dontDistribute super."augur"; + "aur" = dontDistribute super."aur"; + "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; + "authenticate-ldap" = dontDistribute super."authenticate-ldap"; + "authinfo-hs" = dontDistribute super."authinfo-hs"; + "authoring" = dontDistribute super."authoring"; + "autonix-deps" = dontDistribute super."autonix-deps"; + "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; + "autoproc" = dontDistribute super."autoproc"; + "avahi" = dontDistribute super."avahi"; + "avatar-generator" = dontDistribute super."avatar-generator"; + "average" = dontDistribute super."average"; + "avers" = dontDistribute super."avers"; + "avl-static" = dontDistribute super."avl-static"; + "avr-shake" = dontDistribute super."avr-shake"; + "awesomium" = dontDistribute super."awesomium"; + "awesomium-glut" = dontDistribute super."awesomium-glut"; + "awesomium-raw" = dontDistribute super."awesomium-raw"; + "aws-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"; + "banwords" = dontDistribute super."banwords"; + "barchart" = dontDistribute super."barchart"; + "barcodes-code128" = dontDistribute super."barcodes-code128"; + "barecheck" = dontDistribute super."barecheck"; + "barley" = dontDistribute super."barley"; + "barrie" = dontDistribute super."barrie"; + "barrier" = dontDistribute super."barrier"; + "barrier-monad" = dontDistribute super."barrier-monad"; + "base-generics" = dontDistribute super."base-generics"; + "base-io-access" = dontDistribute super."base-io-access"; + "base-noprelude" = dontDistribute super."base-noprelude"; + "base32-bytestring" = dontDistribute super."base32-bytestring"; + "base58-bytestring" = dontDistribute super."base58-bytestring"; + "base58address" = dontDistribute super."base58address"; + "base64-conduit" = dontDistribute super."base64-conduit"; + "base91" = dontDistribute super."base91"; + "basex-client" = dontDistribute super."basex-client"; + "bash" = dontDistribute super."bash"; + "basic-lens" = dontDistribute super."basic-lens"; + "basic-sop" = dontDistribute super."basic-sop"; + "baskell" = dontDistribute super."baskell"; + "battlenet" = dontDistribute super."battlenet"; + "battlenet-yesod" = dontDistribute super."battlenet-yesod"; + "battleships" = dontDistribute super."battleships"; + "bayes-stack" = dontDistribute super."bayes-stack"; + "bbdb" = dontDistribute super."bbdb"; + "bcrypt" = doDistribute super."bcrypt_0_0_6"; + "bdd" = dontDistribute super."bdd"; + "bdelta" = dontDistribute super."bdelta"; + "bdo" = dontDistribute super."bdo"; + "beamable" = dontDistribute super."beamable"; + "beautifHOL" = dontDistribute super."beautifHOL"; + "bed-and-breakfast" = dontDistribute super."bed-and-breakfast"; + "bein" = dontDistribute super."bein"; + "benchmark-function" = dontDistribute super."benchmark-function"; + "benchpress" = dontDistribute super."benchpress"; + "bencoding" = dontDistribute super."bencoding"; + "berkeleydb" = dontDistribute super."berkeleydb"; + "berp" = dontDistribute super."berp"; + "bert" = dontDistribute super."bert"; + "besout" = dontDistribute super."besout"; + "bet" = dontDistribute super."bet"; + "betacode" = dontDistribute super."betacode"; + "between" = dontDistribute super."between"; + "bf-cata" = dontDistribute super."bf-cata"; + "bff" = dontDistribute super."bff"; + "bff-mono" = dontDistribute super."bff-mono"; + "bgmax" = dontDistribute super."bgmax"; + "bgzf" = dontDistribute super."bgzf"; + "bibtex" = dontDistribute super."bibtex"; + "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; + "bidispec" = dontDistribute super."bidispec"; + "bidispec-extras" = dontDistribute super."bidispec-extras"; + "billboard-parser" = dontDistribute super."billboard-parser"; + "billeksah-forms" = dontDistribute super."billeksah-forms"; + "billeksah-main" = dontDistribute super."billeksah-main"; + "billeksah-main-static" = dontDistribute super."billeksah-main-static"; + "billeksah-pane" = dontDistribute super."billeksah-pane"; + "billeksah-services" = dontDistribute super."billeksah-services"; + "bimap" = dontDistribute super."bimap"; + "bimap-server" = dontDistribute super."bimap-server"; + "bimaps" = dontDistribute super."bimaps"; + "binary-bits" = dontDistribute super."binary-bits"; + "binary-communicator" = dontDistribute super."binary-communicator"; + "binary-derive" = dontDistribute super."binary-derive"; + "binary-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-orphans" = dontDistribute super."binary-orphans"; + "binary-protocol" = dontDistribute super."binary-protocol"; + "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; + "binary-shared" = dontDistribute super."binary-shared"; + "binary-state" = dontDistribute super."binary-state"; + "binary-store" = dontDistribute super."binary-store"; + "binary-streams" = dontDistribute super."binary-streams"; + "binary-strict" = dontDistribute super."binary-strict"; + "binary-tagged" = dontDistribute super."binary-tagged"; + "binary-typed" = dontDistribute super."binary-typed"; + "binarydefer" = dontDistribute super."binarydefer"; + "bind-marshal" = dontDistribute super."bind-marshal"; + "binding-core" = dontDistribute super."binding-core"; + "binding-gtk" = dontDistribute super."binding-gtk"; + "binding-wx" = dontDistribute super."binding-wx"; + "bindings" = dontDistribute super."bindings"; + "bindings-EsounD" = dontDistribute super."bindings-EsounD"; + "bindings-GLFW" = dontDistribute super."bindings-GLFW"; + "bindings-K8055" = dontDistribute super."bindings-K8055"; + "bindings-apr" = dontDistribute super."bindings-apr"; + "bindings-apr-util" = dontDistribute super."bindings-apr-util"; + "bindings-audiofile" = dontDistribute super."bindings-audiofile"; + "bindings-bfd" = dontDistribute super."bindings-bfd"; + "bindings-cctools" = dontDistribute super."bindings-cctools"; + "bindings-codec2" = dontDistribute super."bindings-codec2"; + "bindings-common" = dontDistribute super."bindings-common"; + "bindings-dc1394" = dontDistribute super."bindings-dc1394"; + "bindings-directfb" = dontDistribute super."bindings-directfb"; + "bindings-eskit" = dontDistribute super."bindings-eskit"; + "bindings-fann" = dontDistribute super."bindings-fann"; + "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth"; + "bindings-friso" = dontDistribute super."bindings-friso"; + "bindings-glib" = dontDistribute super."bindings-glib"; + "bindings-gobject" = dontDistribute super."bindings-gobject"; + "bindings-gpgme" = dontDistribute super."bindings-gpgme"; + "bindings-gsl" = dontDistribute super."bindings-gsl"; + "bindings-gts" = dontDistribute super."bindings-gts"; + "bindings-hamlib" = dontDistribute super."bindings-hamlib"; + "bindings-hdf5" = dontDistribute super."bindings-hdf5"; + "bindings-levmar" = dontDistribute super."bindings-levmar"; + "bindings-libcddb" = dontDistribute super."bindings-libcddb"; + "bindings-libffi" = dontDistribute super."bindings-libffi"; + "bindings-libftdi" = dontDistribute super."bindings-libftdi"; + "bindings-librrd" = dontDistribute super."bindings-librrd"; + "bindings-libstemmer" = dontDistribute super."bindings-libstemmer"; + "bindings-libusb" = dontDistribute super."bindings-libusb"; + "bindings-libv4l2" = dontDistribute super."bindings-libv4l2"; + "bindings-libzip" = dontDistribute super."bindings-libzip"; + "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2"; + "bindings-lxc" = dontDistribute super."bindings-lxc"; + "bindings-mmap" = dontDistribute super."bindings-mmap"; + "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal"; + "bindings-nettle" = dontDistribute super."bindings-nettle"; + "bindings-parport" = dontDistribute super."bindings-parport"; + "bindings-portaudio" = dontDistribute super."bindings-portaudio"; + "bindings-posix" = dontDistribute super."bindings-posix"; + "bindings-potrace" = dontDistribute super."bindings-potrace"; + "bindings-ppdev" = dontDistribute super."bindings-ppdev"; + "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd"; + "bindings-sane" = dontDistribute super."bindings-sane"; + "bindings-sc3" = dontDistribute super."bindings-sc3"; + "bindings-sipc" = dontDistribute super."bindings-sipc"; + "bindings-sophia" = dontDistribute super."bindings-sophia"; + "bindings-sqlite3" = dontDistribute super."bindings-sqlite3"; + "bindings-svm" = dontDistribute super."bindings-svm"; + "bindings-uname" = dontDistribute super."bindings-uname"; + "bindings-yices" = dontDistribute super."bindings-yices"; + "binembed" = dontDistribute super."binembed"; + "binembed-example" = dontDistribute super."binembed-example"; + "bio" = dontDistribute super."bio"; + "biophd" = dontDistribute super."biophd"; + "biosff" = dontDistribute super."biosff"; + "biostockholm" = dontDistribute super."biostockholm"; + "bird" = dontDistribute super."bird"; + "bit-array" = dontDistribute super."bit-array"; + "bit-vector" = dontDistribute super."bit-vector"; + "bitarray" = dontDistribute super."bitarray"; + "bitcoin-rpc" = dontDistribute super."bitcoin-rpc"; + "bitly-cli" = dontDistribute super."bitly-cli"; + "bitmap" = dontDistribute super."bitmap"; + "bitmap-opengl" = dontDistribute super."bitmap-opengl"; + "bitmaps" = dontDistribute super."bitmaps"; + "bits-atomic" = dontDistribute super."bits-atomic"; + "bits-conduit" = dontDistribute super."bits-conduit"; + "bits-extras" = dontDistribute super."bits-extras"; + "bitset" = dontDistribute super."bitset"; + "bitspeak" = dontDistribute super."bitspeak"; + "bitstream" = dontDistribute super."bitstream"; + "bitstring" = dontDistribute super."bitstring"; + "bittorrent" = dontDistribute super."bittorrent"; + "bitvec" = dontDistribute super."bitvec"; + "bitx-bitcoin" = dontDistribute super."bitx-bitcoin"; + "bk-tree" = dontDistribute super."bk-tree"; + "bkr" = dontDistribute super."bkr"; + "bktrees" = dontDistribute super."bktrees"; + "bla" = dontDistribute super."bla"; + "black-jewel" = dontDistribute super."black-jewel"; + "blacktip" = dontDistribute super."blacktip"; + "blakesum" = dontDistribute super."blakesum"; + "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = dontDistribute super."blank-canvas"; + "blas" = dontDistribute super."blas"; + "blas-hs" = dontDistribute super."blas-hs"; + "blaze" = dontDistribute super."blaze"; + "blaze-bootstrap" = dontDistribute super."blaze-bootstrap"; + "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; + "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; + "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; + "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; + "blaze-json" = dontDistribute super."blaze-json"; + "blaze-shields" = dontDistribute super."blaze-shields"; + "blaze-textual-native" = dontDistribute super."blaze-textual-native"; + "blazeMarker" = dontDistribute super."blazeMarker"; + "blink1" = dontDistribute super."blink1"; + "blip" = dontDistribute super."blip"; + "bliplib" = dontDistribute super."bliplib"; + "blocking-transactions" = dontDistribute super."blocking-transactions"; + "blogination" = dontDistribute super."blogination"; + "bloodhound" = doDistribute super."bloodhound_0_7_0_1"; + "bloxorz" = dontDistribute super."bloxorz"; + "blubber" = dontDistribute super."blubber"; + "blubber-server" = dontDistribute super."blubber-server"; + "bluetile" = dontDistribute super."bluetile"; + "bluetileutils" = dontDistribute super."bluetileutils"; + "blunt" = dontDistribute super."blunt"; + "board-games" = dontDistribute super."board-games"; + "bogre-banana" = dontDistribute super."bogre-banana"; + "boolean-list" = dontDistribute super."boolean-list"; + "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; + "boolexpr" = dontDistribute super."boolexpr"; + "bools" = dontDistribute super."bools"; + "boolsimplifier" = dontDistribute super."boolsimplifier"; + "boomange" = dontDistribute super."boomange"; + "boomerang" = dontDistribute super."boomerang"; + "boomslang" = dontDistribute super."boomslang"; + "borel" = dontDistribute super."borel"; + "bot" = dontDistribute super."bot"; + "both" = dontDistribute super."both"; + "botpp" = dontDistribute super."botpp"; + "bound-gen" = dontDistribute super."bound-gen"; + "bounded-tchan" = dontDistribute super."bounded-tchan"; + "boundingboxes" = dontDistribute super."boundingboxes"; + "bpann" = dontDistribute super."bpann"; + "brainfuck-monad" = dontDistribute super."brainfuck-monad"; + "brainfuck-tut" = dontDistribute super."brainfuck-tut"; + "break" = dontDistribute super."break"; + "breakout" = dontDistribute super."breakout"; + "breve" = dontDistribute super."breve"; + "brians-brain" = dontDistribute super."brians-brain"; + "brick" = dontDistribute super."brick"; + "brillig" = dontDistribute super."brillig"; + "broccoli" = dontDistribute super."broccoli"; + "broker-haskell" = dontDistribute super."broker-haskell"; + "bsd-sysctl" = dontDistribute super."bsd-sysctl"; + "bson-generic" = dontDistribute super."bson-generic"; + "bson-generics" = dontDistribute super."bson-generics"; + "bson-lens" = dontDistribute super."bson-lens"; + "bson-mapping" = dontDistribute super."bson-mapping"; + "bspack" = dontDistribute super."bspack"; + "bsparse" = dontDistribute super."bsparse"; + "btree-concurrent" = dontDistribute super."btree-concurrent"; + "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson"; + "bugzilla" = dontDistribute super."bugzilla"; + "buildable" = dontDistribute super."buildable"; + "buildbox" = dontDistribute super."buildbox"; + "buildbox-tools" = dontDistribute super."buildbox-tools"; + "buildwrapper" = dontDistribute super."buildwrapper"; + "bullet" = dontDistribute super."bullet"; + "burst-detection" = dontDistribute super."burst-detection"; + "bus-pirate" = dontDistribute super."bus-pirate"; + "buster" = dontDistribute super."buster"; + "buster-gtk" = dontDistribute super."buster-gtk"; + "buster-network" = dontDistribute super."buster-network"; + "bustle" = dontDistribute super."bustle"; + "bv" = dontDistribute super."bv"; + "byline" = dontDistribute super."byline"; + "bytable" = dontDistribute super."bytable"; + "byteset" = dontDistribute super."byteset"; + "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; + "bytestring-class" = dontDistribute super."bytestring-class"; + "bytestring-csv" = dontDistribute super."bytestring-csv"; + "bytestring-delta" = dontDistribute super."bytestring-delta"; + "bytestring-from" = dontDistribute super."bytestring-from"; + "bytestring-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"; + "bytestringparser" = dontDistribute super."bytestringparser"; + "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; + "bytestringreadp" = dontDistribute super."bytestringreadp"; + "c-dsl" = dontDistribute super."c-dsl"; + "c-io" = dontDistribute super."c-io"; + "c-storable-deriving" = dontDistribute super."c-storable-deriving"; + "c0check" = dontDistribute super."c0check"; + "c0parser" = dontDistribute super."c0parser"; + "c10k" = dontDistribute super."c10k"; + "c2hs" = doDistribute super."c2hs_0_25_2"; + "c2hsc" = dontDistribute super."c2hsc"; + "cab" = dontDistribute super."cab"; + "cabal-audit" = dontDistribute super."cabal-audit"; + "cabal-bounds" = dontDistribute super."cabal-bounds"; + "cabal-cargs" = dontDistribute super."cabal-cargs"; + "cabal-constraints" = dontDistribute super."cabal-constraints"; + "cabal-db" = dontDistribute super."cabal-db"; + "cabal-debian" = doDistribute super."cabal-debian_4_30_2"; + "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses"; + "cabal-dev" = dontDistribute super."cabal-dev"; + "cabal-dir" = dontDistribute super."cabal-dir"; + "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags"; + "cabal-ghci" = dontDistribute super."cabal-ghci"; + "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; + "cabal-helper" = dontDistribute super."cabal-helper"; + "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; + "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; + "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; + "cabal-lenses" = dontDistribute super."cabal-lenses"; + "cabal-macosx" = dontDistribute super."cabal-macosx"; + "cabal-meta" = dontDistribute super."cabal-meta"; + "cabal-mon" = dontDistribute super."cabal-mon"; + "cabal-nirvana" = dontDistribute super."cabal-nirvana"; + "cabal-progdeps" = dontDistribute super."cabal-progdeps"; + "cabal-query" = dontDistribute super."cabal-query"; + "cabal-scripts" = dontDistribute super."cabal-scripts"; + "cabal-setup" = dontDistribute super."cabal-setup"; + "cabal-sign" = dontDistribute super."cabal-sign"; + "cabal-sort" = dontDistribute super."cabal-sort"; + "cabal-test" = dontDistribute super."cabal-test"; + "cabal-test-bin" = dontDistribute super."cabal-test-bin"; + "cabal-test-compat" = dontDistribute super."cabal-test-compat"; + "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck"; + "cabal-uninstall" = dontDistribute super."cabal-uninstall"; + "cabal-upload" = dontDistribute super."cabal-upload"; + "cabal2arch" = dontDistribute super."cabal2arch"; + "cabal2doap" = dontDistribute super."cabal2doap"; + "cabal2ebuild" = dontDistribute super."cabal2ebuild"; + "cabal2ghci" = dontDistribute super."cabal2ghci"; + "cabal2nix" = dontDistribute super."cabal2nix"; + "cabal2spec" = dontDistribute super."cabal2spec"; + "cabalQuery" = dontDistribute super."cabalQuery"; + "cabalg" = dontDistribute super."cabalg"; + "cabalgraph" = dontDistribute super."cabalgraph"; + "cabalmdvrpm" = dontDistribute super."cabalmdvrpm"; + "cabalrpmdeps" = dontDistribute super."cabalrpmdeps"; + "cabalvchk" = dontDistribute super."cabalvchk"; + "cabin" = dontDistribute super."cabin"; + "cabocha" = dontDistribute super."cabocha"; + "cached-io" = dontDistribute super."cached-io"; + "cached-traversable" = dontDistribute super."cached-traversable"; + "caf" = dontDistribute super."caf"; + "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; + "caffegraph" = dontDistribute super."caffegraph"; + "cairo-appbase" = dontDistribute super."cairo-appbase"; + "cake" = dontDistribute super."cake"; + "cake3" = dontDistribute super."cake3"; + "cakyrespa" = dontDistribute super."cakyrespa"; + "cal3d" = dontDistribute super."cal3d"; + "cal3d-examples" = dontDistribute super."cal3d-examples"; + "cal3d-opengl" = dontDistribute super."cal3d-opengl"; + "calc" = dontDistribute super."calc"; + "calculator" = dontDistribute super."calculator"; + "caldims" = dontDistribute super."caldims"; + "caledon" = dontDistribute super."caledon"; + "call" = dontDistribute super."call"; + "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything"; + "camh" = dontDistribute super."camh"; + "campfire" = dontDistribute super."campfire"; + "canonical-filepath" = dontDistribute super."canonical-filepath"; + "canteven-config" = dontDistribute super."canteven-config"; + "canteven-log" = dontDistribute super."canteven-log"; + "cantor" = dontDistribute super."cantor"; + "cao" = dontDistribute super."cao"; + "cap" = dontDistribute super."cap"; + "capped-list" = dontDistribute super."capped-list"; + "capri" = dontDistribute super."capri"; + "caramia" = dontDistribute super."caramia"; + "carboncopy" = dontDistribute super."carboncopy"; + "carettah" = dontDistribute super."carettah"; + "carray" = dontDistribute super."carray"; + "casadi-bindings" = dontDistribute super."casadi-bindings"; + "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; + "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; + "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal"; + "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface"; + "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface"; + "cascading" = dontDistribute super."cascading"; + "case-conversion" = dontDistribute super."case-conversion"; + "cased" = dontDistribute super."cased"; + "cash" = dontDistribute super."cash"; + "casing" = dontDistribute super."casing"; + "cassandra-cql" = dontDistribute super."cassandra-cql"; + "cassandra-thrift" = dontDistribute super."cassandra-thrift"; + "cassava-conduit" = dontDistribute super."cassava-conduit"; + "cassava-streams" = dontDistribute super."cassava-streams"; + "cassette" = dontDistribute super."cassette"; + "cassy" = dontDistribute super."cassy"; + "castle" = dontDistribute super."castle"; + "casui" = dontDistribute super."casui"; + "catamorphism" = dontDistribute super."catamorphism"; + "catch-fd" = dontDistribute super."catch-fd"; + "categorical-algebra" = dontDistribute super."categorical-algebra"; + "categories" = dontDistribute super."categories"; + "category-extras" = dontDistribute super."category-extras"; + "cblrepo" = dontDistribute super."cblrepo"; + "cci" = dontDistribute super."cci"; + "ccnx" = dontDistribute super."ccnx"; + "cctools-workqueue" = dontDistribute super."cctools-workqueue"; + "cedict" = dontDistribute super."cedict"; + "cef" = dontDistribute super."cef"; + "ceilometer-common" = dontDistribute super."ceilometer-common"; + "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; + "cereal-derive" = dontDistribute super."cereal-derive"; + "cereal-enumerator" = dontDistribute super."cereal-enumerator"; + "cereal-ieee754" = dontDistribute super."cereal-ieee754"; + "cereal-plus" = dontDistribute super."cereal-plus"; + "cereal-text" = dontDistribute super."cereal-text"; + "certificate" = dontDistribute super."certificate"; + "cf" = dontDistribute super."cf"; + "cfipu" = dontDistribute super."cfipu"; + "cflp" = dontDistribute super."cflp"; + "cfopu" = dontDistribute super."cfopu"; + "cg" = dontDistribute super."cg"; + "cgen" = dontDistribute super."cgen"; + "cgi-undecidable" = dontDistribute super."cgi-undecidable"; + "cgi-utils" = dontDistribute super."cgi-utils"; + "cgrep" = dontDistribute super."cgrep"; + "chain-codes" = dontDistribute super."chain-codes"; + "chalk" = dontDistribute super."chalk"; + "chalkboard" = dontDistribute super."chalkboard"; + "chalkboard-viewer" = dontDistribute super."chalkboard-viewer"; + "chalmers-lava2000" = dontDistribute super."chalmers-lava2000"; + "chan-split" = dontDistribute super."chan-split"; + "change-monger" = dontDistribute super."change-monger"; + "charade" = dontDistribute super."charade"; + "charsetdetect" = dontDistribute super."charsetdetect"; + "charsetdetect-ae" = dontDistribute super."charsetdetect-ae"; + "chart-histogram" = dontDistribute super."chart-histogram"; + "chaselev-deque" = dontDistribute super."chaselev-deque"; + "chatter" = dontDistribute super."chatter"; + "chatty" = dontDistribute super."chatty"; + "chatty-text" = dontDistribute super."chatty-text"; + "chatty-utils" = dontDistribute super."chatty-utils"; + "cheapskate" = dontDistribute super."cheapskate"; + "check-pvp" = dontDistribute super."check-pvp"; + "checked" = dontDistribute super."checked"; + "chell-hunit" = dontDistribute super."chell-hunit"; + "chesshs" = dontDistribute super."chesshs"; + "chevalier-common" = dontDistribute super."chevalier-common"; + "chp" = dontDistribute super."chp"; + "chp-mtl" = dontDistribute super."chp-mtl"; + "chp-plus" = dontDistribute super."chp-plus"; + "chp-spec" = dontDistribute super."chp-spec"; + "chp-transformers" = dontDistribute super."chp-transformers"; + "chronograph" = dontDistribute super."chronograph"; + "chu2" = dontDistribute super."chu2"; + "chuchu" = dontDistribute super."chuchu"; + "chunks" = dontDistribute super."chunks"; + "chunky" = dontDistribute super."chunky"; + "church-list" = dontDistribute super."church-list"; + "cil" = dontDistribute super."cil"; + "cinvoke" = dontDistribute super."cinvoke"; + "cio" = dontDistribute super."cio"; + "cipher-rc5" = dontDistribute super."cipher-rc5"; + "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"; + "clanki" = dontDistribute super."clanki"; + "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_5_14"; + "clash-lib" = doDistribute super."clash-lib_0_5_12"; + "clash-prelude" = doDistribute super."clash-prelude_0_9_2"; + "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_9"; + "clash-verilog" = doDistribute super."clash-verilog_0_5_9"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_5_11"; + "classify" = dontDistribute super."classify"; + "classy-parallel" = dontDistribute super."classy-parallel"; + "clckwrks" = dontDistribute super."clckwrks"; + "clckwrks-cli" = dontDistribute super."clckwrks-cli"; + "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; + "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; + "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; + "clckwrks-plugin-media" = dontDistribute super."clckwrks-plugin-media"; + "clckwrks-plugin-page" = dontDistribute super."clckwrks-plugin-page"; + "clckwrks-theme-bootstrap" = dontDistribute super."clckwrks-theme-bootstrap"; + "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks"; + "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap"; + "cld2" = dontDistribute super."cld2"; + "clean-home" = dontDistribute super."clean-home"; + "clean-unions" = dontDistribute super."clean-unions"; + "cless" = dontDistribute super."cless"; + "clevercss" = dontDistribute super."clevercss"; + "cli" = dontDistribute super."cli"; + "click-clack" = dontDistribute super."click-clack"; + "clifford" = dontDistribute super."clifford"; + "clippard" = dontDistribute super."clippard"; + "clipper" = dontDistribute super."clipper"; + "clippings" = dontDistribute super."clippings"; + "clist" = dontDistribute super."clist"; + "clocked" = dontDistribute super."clocked"; + "clogparse" = dontDistribute super."clogparse"; + "clone-all" = dontDistribute super."clone-all"; + "closure" = dontDistribute super."closure"; + "cloud-haskell" = dontDistribute super."cloud-haskell"; + "cloudfront-signer" = dontDistribute super."cloudfront-signer"; + "cloudyfs" = dontDistribute super."cloudyfs"; + "cltw" = dontDistribute super."cltw"; + "clua" = dontDistribute super."clua"; + "cluss" = dontDistribute super."cluss"; + "clustertools" = dontDistribute super."clustertools"; + "clutterhs" = dontDistribute super."clutterhs"; + "cmaes" = dontDistribute super."cmaes"; + "cmath" = dontDistribute super."cmath"; + "cmathml3" = dontDistribute super."cmathml3"; + "cmd-item" = dontDistribute super."cmd-item"; + "cmdargs-browser" = dontDistribute super."cmdargs-browser"; + "cmdlib" = dontDistribute super."cmdlib"; + "cmdtheline" = dontDistribute super."cmdtheline"; + "cml" = dontDistribute super."cml"; + "cmonad" = dontDistribute super."cmonad"; + "cmu" = dontDistribute super."cmu"; + "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler"; + "cndict" = dontDistribute super."cndict"; + "codec" = dontDistribute super."codec"; + "codec-libevent" = dontDistribute super."codec-libevent"; + "codec-mbox" = dontDistribute super."codec-mbox"; + "codecov-haskell" = dontDistribute super."codecov-haskell"; + "codemonitor" = dontDistribute super."codemonitor"; + "codepad" = dontDistribute super."codepad"; + "codo-notation" = dontDistribute super."codo-notation"; + "cofunctor" = dontDistribute super."cofunctor"; + "cognimeta-utils" = dontDistribute super."cognimeta-utils"; + "coinbase-exchange" = dontDistribute super."coinbase-exchange"; + "colada" = dontDistribute super."colada"; + "colchis" = dontDistribute super."colchis"; + "collada-output" = dontDistribute super."collada-output"; + "collada-types" = dontDistribute super."collada-types"; + "collapse-util" = dontDistribute super."collapse-util"; + "collection-json" = dontDistribute super."collection-json"; + "collections" = dontDistribute super."collections"; + "collections-api" = dontDistribute super."collections-api"; + "collections-base-instances" = dontDistribute super."collections-base-instances"; + "colock" = dontDistribute super."colock"; + "colorize-haskell" = dontDistribute super."colorize-haskell"; + "colors" = dontDistribute super."colors"; + "coltrane" = dontDistribute super."coltrane"; + "com" = dontDistribute super."com"; + "combinat" = dontDistribute super."combinat"; + "combinat-diagrams" = dontDistribute super."combinat-diagrams"; + "combinator-interactive" = dontDistribute super."combinator-interactive"; + "combinatorial-problems" = dontDistribute super."combinatorial-problems"; + "combinatorics" = dontDistribute super."combinatorics"; + "combobuffer" = dontDistribute super."combobuffer"; + "comfort-graph" = dontDistribute super."comfort-graph"; + "command" = dontDistribute super."command"; + "command-qq" = dontDistribute super."command-qq"; + "commodities" = dontDistribute super."commodities"; + "commsec" = dontDistribute super."commsec"; + "commsec-keyexchange" = dontDistribute super."commsec-keyexchange"; + "commutative" = dontDistribute super."commutative"; + "comonad-extras" = dontDistribute super."comonad-extras"; + "comonad-random" = dontDistribute super."comonad-random"; + "compact-map" = dontDistribute super."compact-map"; + "compact-socket" = dontDistribute super."compact-socket"; + "compact-string" = dontDistribute super."compact-string"; + "compact-string-fix" = dontDistribute super."compact-string-fix"; + "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-trans" = dontDistribute super."compose-trans"; + "composition-extra" = doDistribute super."composition-extra_1_1_0"; + "compression" = dontDistribute super."compression"; + "compstrat" = dontDistribute super."compstrat"; + "comptrans" = dontDistribute super."comptrans"; + "computational-algebra" = dontDistribute super."computational-algebra"; + "computations" = dontDistribute super."computations"; + "conceit" = dontDistribute super."conceit"; + "concorde" = dontDistribute super."concorde"; + "concraft" = dontDistribute super."concraft"; + "concraft-hr" = dontDistribute super."concraft-hr"; + "concraft-pl" = dontDistribute super."concraft-pl"; + "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser"; + "concrete-typerep" = dontDistribute super."concrete-typerep"; + "concurrent-barrier" = dontDistribute super."concurrent-barrier"; + "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache"; + "concurrent-machines" = dontDistribute super."concurrent-machines"; + "concurrent-sa" = dontDistribute super."concurrent-sa"; + "concurrent-split" = dontDistribute super."concurrent-split"; + "concurrent-state" = dontDistribute super."concurrent-state"; + "concurrentoutput" = dontDistribute super."concurrentoutput"; + "condor" = dontDistribute super."condor"; + "condorcet" = dontDistribute super."condorcet"; + "conductive-base" = dontDistribute super."conductive-base"; + "conductive-clock" = dontDistribute super."conductive-clock"; + "conductive-hsc3" = dontDistribute super."conductive-hsc3"; + "conductive-song" = dontDistribute super."conductive-song"; + "conduit-audio" = dontDistribute super."conduit-audio"; + "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; + "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; + "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-connection" = dontDistribute super."conduit-connection"; + "conduit-iconv" = dontDistribute super."conduit-iconv"; + "conduit-network-stream" = dontDistribute super."conduit-network-stream"; + "conduit-parse" = dontDistribute super."conduit-parse"; + "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; + "conf" = dontDistribute super."conf"; + "config-select" = dontDistribute super."config-select"; + "config-value" = dontDistribute super."config-value"; + "configifier" = dontDistribute super."configifier"; + "configuration" = dontDistribute super."configuration"; + "configuration-tools" = dontDistribute super."configuration-tools"; + "confsolve" = dontDistribute super."confsolve"; + "congruence-relation" = dontDistribute super."congruence-relation"; + "conjugateGradient" = dontDistribute super."conjugateGradient"; + "conjure" = dontDistribute super."conjure"; + "conlogger" = dontDistribute super."conlogger"; + "connection-pool" = dontDistribute super."connection-pool"; + "consistent" = dontDistribute super."consistent"; + "console-program" = dontDistribute super."console-program"; + "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; + "constrained-categories" = dontDistribute super."constrained-categories"; + "constrained-normal" = dontDistribute super."constrained-normal"; + "constructible" = dontDistribute super."constructible"; + "constructive-algebra" = dontDistribute super."constructive-algebra"; + "consumers" = dontDistribute super."consumers"; + "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"; + "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"; + "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"; + "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"; + "country-codes" = doDistribute super."country-codes_0_1_2"; + "court" = dontDistribute super."court"; + "coverage" = dontDistribute super."coverage"; + "cpio-conduit" = dontDistribute super."cpio-conduit"; + "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; + "cpsa" = dontDistribute super."cpsa"; + "cpuid" = dontDistribute super."cpuid"; + "cpuperf" = dontDistribute super."cpuperf"; + "cpython" = dontDistribute super."cpython"; + "cqrs" = dontDistribute super."cqrs"; + "cqrs-core" = dontDistribute super."cqrs-core"; + "cqrs-example" = dontDistribute super."cqrs-example"; + "cqrs-memory" = dontDistribute super."cqrs-memory"; + "cqrs-postgresql" = dontDistribute super."cqrs-postgresql"; + "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3"; + "cqrs-test" = dontDistribute super."cqrs-test"; + "cqrs-testkit" = dontDistribute super."cqrs-testkit"; + "cqrs-types" = dontDistribute super."cqrs-types"; + "cr" = dontDistribute super."cr"; + "crack" = dontDistribute super."crack"; + "craftwerk" = dontDistribute super."craftwerk"; + "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; + "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; + "crc16" = dontDistribute super."crc16"; + "crc16-table" = dontDistribute super."crc16-table"; + "creatur" = dontDistribute super."creatur"; + "crf-chain1" = dontDistribute super."crf-chain1"; + "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained"; + "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; + "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; + "critbit" = dontDistribute super."critbit"; + "criterion-plus" = dontDistribute super."criterion-plus"; + "criterion-to-html" = dontDistribute super."criterion-to-html"; + "crockford" = dontDistribute super."crockford"; + "crocodile" = dontDistribute super."crocodile"; + "cron" = doDistribute super."cron_0_3_0"; + "cron-compat" = dontDistribute super."cron-compat"; + "cruncher-types" = dontDistribute super."cruncher-types"; + "crunghc" = dontDistribute super."crunghc"; + "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; + "crypto-classical" = dontDistribute super."crypto-classical"; + "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; + "crypto-random-effect" = dontDistribute super."crypto-random-effect"; + "crypto-totp" = dontDistribute super."crypto-totp"; + "cryptonite" = doDistribute super."cryptonite_0_6"; + "cryptsy-api" = dontDistribute super."cryptsy-api"; + "crystalfontz" = dontDistribute super."crystalfontz"; + "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin"; + "csound-catalog" = dontDistribute super."csound-catalog"; + "csound-expression" = dontDistribute super."csound-expression"; + "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic"; + "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes"; + "csound-expression-typed" = dontDistribute super."csound-expression-typed"; + "csound-sampler" = dontDistribute super."csound-sampler"; + "csp" = dontDistribute super."csp"; + "cspmchecker" = dontDistribute super."cspmchecker"; + "css" = dontDistribute super."css"; + "css-syntax" = dontDistribute super."css-syntax"; + "csv-enumerator" = dontDistribute super."csv-enumerator"; + "csv-nptools" = dontDistribute super."csv-nptools"; + "csv-to-qif" = dontDistribute super."csv-to-qif"; + "ctemplate" = dontDistribute super."ctemplate"; + "ctkl" = dontDistribute super."ctkl"; + "ctpl" = dontDistribute super."ctpl"; + "ctrie" = dontDistribute super."ctrie"; + "cube" = dontDistribute super."cube"; + "cubical" = dontDistribute super."cubical"; + "cubicbezier" = dontDistribute super."cubicbezier"; + "cublas" = dontDistribute super."cublas"; + "cuboid" = dontDistribute super."cuboid"; + "cuda" = dontDistribute super."cuda"; + "cudd" = dontDistribute super."cudd"; + "cufft" = dontDistribute super."cufft"; + "curl-aeson" = dontDistribute super."curl-aeson"; + "curlhs" = dontDistribute super."curlhs"; + "currency" = dontDistribute super."currency"; + "current-locale" = dontDistribute super."current-locale"; + "curry-base" = dontDistribute super."curry-base"; + "curry-frontend" = dontDistribute super."curry-frontend"; + "cursedcsv" = dontDistribute super."cursedcsv"; + "curve25519" = dontDistribute super."curve25519"; + "curves" = dontDistribute super."curves"; + "custom-prelude" = dontDistribute super."custom-prelude"; + "cv-combinators" = dontDistribute super."cv-combinators"; + "cyclotomic" = dontDistribute super."cyclotomic"; + "cypher" = dontDistribute super."cypher"; + "d-bus" = dontDistribute super."d-bus"; + "d3js" = dontDistribute super."d3js"; + "daemonize-doublefork" = dontDistribute super."daemonize-doublefork"; + "daemons" = dontDistribute super."daemons"; + "dag" = dontDistribute super."dag"; + "damnpacket" = dontDistribute super."damnpacket"; + "dao" = dontDistribute super."dao"; + "dapi" = dontDistribute super."dapi"; + "darcs" = dontDistribute super."darcs"; + "darcs-benchmark" = dontDistribute super."darcs-benchmark"; + "darcs-beta" = dontDistribute super."darcs-beta"; + "darcs-buildpackage" = dontDistribute super."darcs-buildpackage"; + "darcs-cabalized" = dontDistribute super."darcs-cabalized"; + "darcs-fastconvert" = dontDistribute super."darcs-fastconvert"; + "darcs-graph" = dontDistribute super."darcs-graph"; + "darcs-monitor" = dontDistribute super."darcs-monitor"; + "darcs-scripts" = dontDistribute super."darcs-scripts"; + "darcs2dot" = dontDistribute super."darcs2dot"; + "darcsden" = dontDistribute super."darcsden"; + "darcswatch" = dontDistribute super."darcswatch"; + "darkplaces-demo" = dontDistribute super."darkplaces-demo"; + "darkplaces-rcon" = dontDistribute super."darkplaces-rcon"; + "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; + "darkplaces-text" = dontDistribute super."darkplaces-text"; + "dash-haskell" = dontDistribute super."dash-haskell"; + "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib"; + "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd"; + "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf"; + "data-accessor-template" = dontDistribute super."data-accessor-template"; + "data-accessor-transformers" = dontDistribute super."data-accessor-transformers"; + "data-aviary" = dontDistribute super."data-aviary"; + "data-bword" = dontDistribute super."data-bword"; + "data-carousel" = dontDistribute super."data-carousel"; + "data-category" = dontDistribute super."data-category"; + "data-cell" = dontDistribute super."data-cell"; + "data-checked" = dontDistribute super."data-checked"; + "data-clist" = dontDistribute super."data-clist"; + "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; + "data-cycle" = dontDistribute super."data-cycle"; + "data-default-generics" = dontDistribute super."data-default-generics"; + "data-dispersal" = dontDistribute super."data-dispersal"; + "data-dword" = dontDistribute super."data-dword"; + "data-easy" = dontDistribute super."data-easy"; + "data-endian" = dontDistribute super."data-endian"; + "data-extra" = dontDistribute super."data-extra"; + "data-filepath" = dontDistribute super."data-filepath"; + "data-fin" = dontDistribute super."data-fin"; + "data-fin-simple" = dontDistribute super."data-fin-simple"; + "data-fix" = dontDistribute super."data-fix"; + "data-fix-cse" = dontDistribute super."data-fix-cse"; + "data-flags" = dontDistribute super."data-flags"; + "data-flagset" = dontDistribute super."data-flagset"; + "data-fresh" = dontDistribute super."data-fresh"; + "data-interval" = dontDistribute super."data-interval"; + "data-ivar" = dontDistribute super."data-ivar"; + "data-kiln" = dontDistribute super."data-kiln"; + "data-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-rev" = dontDistribute super."data-rev"; + "data-rope" = dontDistribute super."data-rope"; + "data-size" = dontDistribute super."data-size"; + "data-spacepart" = dontDistribute super."data-spacepart"; + "data-store" = dontDistribute super."data-store"; + "data-stringmap" = dontDistribute super."data-stringmap"; + "data-structure-inferrer" = dontDistribute super."data-structure-inferrer"; + "data-tensor" = dontDistribute super."data-tensor"; + "data-textual" = dontDistribute super."data-textual"; + "data-timeout" = dontDistribute super."data-timeout"; + "data-transform" = dontDistribute super."data-transform"; + "data-treify" = dontDistribute super."data-treify"; + "data-type" = dontDistribute super."data-type"; + "data-util" = dontDistribute super."data-util"; + "data-variant" = dontDistribute super."data-variant"; + "database-migrate" = dontDistribute super."database-migrate"; + "database-study" = dontDistribute super."database-study"; + "dataenc" = dontDistribute super."dataenc"; + "dataflow" = dontDistribute super."dataflow"; + "datalog" = dontDistribute super."datalog"; + "datapacker" = dontDistribute super."datapacker"; + "date-cache" = dontDistribute super."date-cache"; + "dates" = dontDistribute super."dates"; + "datetime" = dontDistribute super."datetime"; + "datetime-sb" = dontDistribute super."datetime-sb"; + "dawg" = dontDistribute super."dawg"; + "dbcleaner" = dontDistribute super."dbcleaner"; + "dbf" = dontDistribute super."dbf"; + "dbjava" = dontDistribute super."dbjava"; + "dbmigrations" = dontDistribute super."dbmigrations"; + "dbus-client" = dontDistribute super."dbus-client"; + "dbus-core" = dontDistribute super."dbus-core"; + "dbus-qq" = dontDistribute super."dbus-qq"; + "dbus-th" = dontDistribute super."dbus-th"; + "dclabel" = dontDistribute super."dclabel"; + "dclabel-eci11" = dontDistribute super."dclabel-eci11"; + "ddc-base" = dontDistribute super."ddc-base"; + "ddc-build" = dontDistribute super."ddc-build"; + "ddc-code" = dontDistribute super."ddc-code"; + "ddc-core" = dontDistribute super."ddc-core"; + "ddc-core-eval" = dontDistribute super."ddc-core-eval"; + "ddc-core-flow" = dontDistribute super."ddc-core-flow"; + "ddc-core-llvm" = dontDistribute super."ddc-core-llvm"; + "ddc-core-salt" = dontDistribute super."ddc-core-salt"; + "ddc-core-simpl" = dontDistribute super."ddc-core-simpl"; + "ddc-core-tetra" = dontDistribute super."ddc-core-tetra"; + "ddc-driver" = dontDistribute super."ddc-driver"; + "ddc-interface" = dontDistribute super."ddc-interface"; + "ddc-source-tetra" = dontDistribute super."ddc-source-tetra"; + "ddc-tools" = dontDistribute super."ddc-tools"; + "ddc-war" = dontDistribute super."ddc-war"; + "ddci-core" = dontDistribute super."ddci-core"; + "dead-code-detection" = dontDistribute super."dead-code-detection"; + "dead-simple-json" = dontDistribute super."dead-simple-json"; + "debian" = doDistribute super."debian_3_87_2"; + "debian-binary" = dontDistribute super."debian-binary"; + "debian-build" = dontDistribute super."debian-build"; + "debug-diff" = dontDistribute super."debug-diff"; + "decepticons" = dontDistribute super."decepticons"; + "decode-utf8" = dontDistribute super."decode-utf8"; + "decoder-conduit" = dontDistribute super."decoder-conduit"; + "dedukti" = dontDistribute super."dedukti"; + "deeplearning-hs" = dontDistribute super."deeplearning-hs"; + "deepseq-bounded" = dontDistribute super."deepseq-bounded"; + "deepseq-magic" = dontDistribute super."deepseq-magic"; + "deepseq-th" = dontDistribute super."deepseq-th"; + "deepzoom" = dontDistribute super."deepzoom"; + "defargs" = dontDistribute super."defargs"; + "definitive-base" = dontDistribute super."definitive-base"; + "definitive-filesystem" = dontDistribute super."definitive-filesystem"; + "definitive-graphics" = dontDistribute super."definitive-graphics"; + "definitive-parser" = dontDistribute super."definitive-parser"; + "definitive-reactive" = dontDistribute super."definitive-reactive"; + "definitive-sound" = dontDistribute super."definitive-sound"; + "deiko-config" = dontDistribute super."deiko-config"; + "dejafu" = dontDistribute super."dejafu"; + "deka" = dontDistribute super."deka"; + "deka-tests" = dontDistribute super."deka-tests"; + "delaunay" = dontDistribute super."delaunay"; + "delicious" = dontDistribute super."delicious"; + "delimited-text" = dontDistribute super."delimited-text"; + "delta" = dontDistribute super."delta"; + "delta-h" = dontDistribute super."delta-h"; + "demarcate" = dontDistribute super."demarcate"; + "denominate" = dontDistribute super."denominate"; + "depends" = dontDistribute super."depends"; + "dephd" = dontDistribute super."dephd"; + "dequeue" = dontDistribute super."dequeue"; + "derangement" = dontDistribute super."derangement"; + "derivation-trees" = dontDistribute super."derivation-trees"; + "derive-IG" = dontDistribute super."derive-IG"; + "derive-enumerable" = dontDistribute super."derive-enumerable"; + "derive-gadt" = dontDistribute super."derive-gadt"; + "derive-topdown" = dontDistribute super."derive-topdown"; + "derive-trie" = dontDistribute super."derive-trie"; + "deriving-compat" = dontDistribute super."deriving-compat"; + "derp" = dontDistribute super."derp"; + "derp-lib" = dontDistribute super."derp-lib"; + "descrilo" = dontDistribute super."descrilo"; + "despair" = dontDistribute super."despair"; + "deterministic-game-engine" = dontDistribute super."deterministic-game-engine"; + "detrospector" = dontDistribute super."detrospector"; + "deunicode" = dontDistribute super."deunicode"; + "devil" = dontDistribute super."devil"; + "dewdrop" = dontDistribute super."dewdrop"; + "dfrac" = dontDistribute super."dfrac"; + "dfsbuild" = dontDistribute super."dfsbuild"; + "dgim" = dontDistribute super."dgim"; + "dgs" = dontDistribute super."dgs"; + "dia-base" = dontDistribute super."dia-base"; + "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-canvas" = dontDistribute super."diagrams-canvas"; + "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; + "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-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"; + "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; + "dicom" = dontDistribute super."dicom"; + "dictparser" = dontDistribute super."dictparser"; + "diet" = dontDistribute super."diet"; + "diff-parse" = dontDistribute super."diff-parse"; + "diffarray" = dontDistribute super."diffarray"; + "diffcabal" = dontDistribute super."diffcabal"; + "diffdump" = dontDistribute super."diffdump"; + "digamma" = dontDistribute super."digamma"; + "digest-pure" = dontDistribute super."digest-pure"; + "digestive-bootstrap" = dontDistribute super."digestive-bootstrap"; + "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze"; + "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; + "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; + "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; + "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty"; + "digestive-functors-snap" = dontDistribute super."digestive-functors-snap"; + "digit" = dontDistribute super."digit"; + "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; + "dimensional-tf" = dontDistribute super."dimensional-tf"; + "dingo-core" = dontDistribute super."dingo-core"; + "dingo-example" = dontDistribute super."dingo-example"; + "dingo-widgets" = dontDistribute super."dingo-widgets"; + "diophantine" = dontDistribute super."diophantine"; + "diplomacy" = dontDistribute super."diplomacy"; + "diplomacy-server" = dontDistribute super."diplomacy-server"; + "direct-binary-files" = dontDistribute super."direct-binary-files"; + "direct-daemonize" = dontDistribute super."direct-daemonize"; + "direct-fastcgi" = dontDistribute super."direct-fastcgi"; + "direct-http" = dontDistribute super."direct-http"; + "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; + "direct-plugins" = dontDistribute super."direct-plugins"; + "directed-cubical" = dontDistribute super."directed-cubical"; + "directory-layout" = dontDistribute super."directory-layout"; + "dirfiles" = dontDistribute super."dirfiles"; + "dirstream" = dontDistribute super."dirstream"; + "disassembler" = dontDistribute super."disassembler"; + "discordian-calendar" = dontDistribute super."discordian-calendar"; + "discount" = dontDistribute super."discount"; + "discrete-space-map" = dontDistribute super."discrete-space-map"; + "discrimination" = dontDistribute super."discrimination"; + "disjoint-set" = dontDistribute super."disjoint-set"; + "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; + "dist-upload" = dontDistribute super."dist-upload"; + "distributed-process" = dontDistribute super."distributed-process"; + "distributed-process-async" = dontDistribute super."distributed-process-async"; + "distributed-process-azure" = dontDistribute super."distributed-process-azure"; + "distributed-process-client-server" = dontDistribute super."distributed-process-client-server"; + "distributed-process-execution" = dontDistribute super."distributed-process-execution"; + "distributed-process-extras" = dontDistribute super."distributed-process-extras"; + "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; + "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; + "distributed-process-platform" = dontDistribute super."distributed-process-platform"; + "distributed-process-registry" = dontDistribute super."distributed-process-registry"; + "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet"; + "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor"; + "distributed-process-task" = dontDistribute super."distributed-process-task"; + "distributed-process-tests" = dontDistribute super."distributed-process-tests"; + "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; + "distributed-static" = dontDistribute super."distributed-static"; + "distribution" = dontDistribute super."distribution"; + "distribution-plot" = dontDistribute super."distribution-plot"; + "diversity" = dontDistribute super."diversity"; + "djinn" = dontDistribute super."djinn"; + "djinn-th" = dontDistribute super."djinn-th"; + "dnscache" = dontDistribute super."dnscache"; + "dnsrbl" = dontDistribute super."dnsrbl"; + "dnssd" = dontDistribute super."dnssd"; + "doc-review" = dontDistribute super."doc-review"; + "doccheck" = dontDistribute super."doccheck"; + "docidx" = dontDistribute super."docidx"; + "docker" = dontDistribute super."docker"; + "dockercook" = dontDistribute super."dockercook"; + "docopt" = dontDistribute super."docopt"; + "doctest-discover" = dontDistribute super."doctest-discover"; + "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; + "doctest-prop" = dontDistribute super."doctest-prop"; + "dom-lt" = dontDistribute super."dom-lt"; + "dom-selector" = dontDistribute super."dom-selector"; + "domain-auth" = dontDistribute super."domain-auth"; + "dominion" = dontDistribute super."dominion"; + "domplate" = dontDistribute super."domplate"; + "dot2graphml" = dontDistribute super."dot2graphml"; + "dotenv" = dontDistribute super."dotenv"; + "dotfs" = dontDistribute super."dotfs"; + "dotgen" = dontDistribute super."dotgen"; + "dove" = dontDistribute super."dove"; + "dow" = dontDistribute super."dow"; + "download" = dontDistribute super."download"; + "download-curl" = dontDistribute super."download-curl"; + "download-media-content" = dontDistribute super."download-media-content"; + "dozenal" = dontDistribute super."dozenal"; + "dozens" = dontDistribute super."dozens"; + "dph-base" = dontDistribute super."dph-base"; + "dph-examples" = dontDistribute super."dph-examples"; + "dph-lifted-base" = dontDistribute super."dph-lifted-base"; + "dph-lifted-copy" = dontDistribute super."dph-lifted-copy"; + "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg"; + "dph-par" = dontDistribute super."dph-par"; + "dph-prim-interface" = dontDistribute super."dph-prim-interface"; + "dph-prim-par" = dontDistribute super."dph-prim-par"; + "dph-prim-seq" = dontDistribute super."dph-prim-seq"; + "dph-seq" = dontDistribute super."dph-seq"; + "dpkg" = dontDistribute super."dpkg"; + "drClickOn" = dontDistribute super."drClickOn"; + "draw-poker" = dontDistribute super."draw-poker"; + "drawille" = dontDistribute super."drawille"; + "drifter" = dontDistribute super."drifter"; + "drifter-postgresql" = dontDistribute super."drifter-postgresql"; + "dropbox-sdk" = dontDistribute super."dropbox-sdk"; + "dropsolve" = dontDistribute super."dropsolve"; + "ds-kanren" = dontDistribute super."ds-kanren"; + "dsh-sql" = dontDistribute super."dsh-sql"; + "dsmc" = dontDistribute super."dsmc"; + "dsmc-tools" = dontDistribute super."dsmc-tools"; + "dson" = dontDistribute super."dson"; + "dson-parsec" = dontDistribute super."dson-parsec"; + "dsp" = dontDistribute super."dsp"; + "dstring" = dontDistribute super."dstring"; + "dtab" = dontDistribute super."dtab"; + "dtd" = dontDistribute super."dtd"; + "dtd-text" = dontDistribute super."dtd-text"; + "dtd-types" = dontDistribute super."dtd-types"; + "dtrace" = dontDistribute super."dtrace"; + "dtw" = dontDistribute super."dtw"; + "dump" = dontDistribute super."dump"; + "duplo" = dontDistribute super."duplo"; + "dvda" = dontDistribute super."dvda"; + "dvdread" = dontDistribute super."dvdread"; + "dvi-processing" = dontDistribute super."dvi-processing"; + "dvorak" = dontDistribute super."dvorak"; + "dwarf" = dontDistribute super."dwarf"; + "dwarf-el" = dontDistribute super."dwarf-el"; + "dwarfadt" = dontDistribute super."dwarfadt"; + "dx9base" = dontDistribute super."dx9base"; + "dx9d3d" = dontDistribute super."dx9d3d"; + "dx9d3dx" = dontDistribute super."dx9d3dx"; + "dynamic-cabal" = dontDistribute super."dynamic-cabal"; + "dynamic-graph" = dontDistribute super."dynamic-graph"; + "dynamic-linker-template" = dontDistribute super."dynamic-linker-template"; + "dynamic-loader" = dontDistribute super."dynamic-loader"; + "dynamic-mvector" = dontDistribute super."dynamic-mvector"; + "dynamic-object" = dontDistribute super."dynamic-object"; + "dynamic-plot" = dontDistribute super."dynamic-plot"; + "dynamic-pp" = dontDistribute super."dynamic-pp"; + "dynamic-state" = dontDistribute super."dynamic-state"; + "dynobud" = dontDistribute super."dynobud"; + "dyre" = dontDistribute super."dyre"; + "dzen-utils" = dontDistribute super."dzen-utils"; + "eager-sockets" = dontDistribute super."eager-sockets"; + "easy-api" = dontDistribute super."easy-api"; + "easyjson" = dontDistribute super."easyjson"; + "easyplot" = dontDistribute super."easyplot"; + "easyrender" = dontDistribute super."easyrender"; + "ebeats" = dontDistribute super."ebeats"; + "ebnf-bff" = dontDistribute super."ebnf-bff"; + "ec2-signature" = dontDistribute super."ec2-signature"; + "ecdsa" = dontDistribute super."ecdsa"; + "ecma262" = dontDistribute super."ecma262"; + "ecu" = dontDistribute super."ecu"; + "ed25519" = dontDistribute super."ed25519"; + "ed25519-donna" = dontDistribute super."ed25519-donna"; + "eddie" = dontDistribute super."eddie"; + "edenmodules" = dontDistribute super."edenmodules"; + "edenskel" = dontDistribute super."edenskel"; + "edentv" = dontDistribute super."edentv"; + "edge" = dontDistribute super."edge"; + "edit-distance-vector" = dontDistribute super."edit-distance-vector"; + "edit-lenses" = dontDistribute super."edit-lenses"; + "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; + "editable" = dontDistribute super."editable"; + "editline" = dontDistribute super."editline"; + "effect-monad" = dontDistribute super."effect-monad"; + "effective-aspects" = dontDistribute super."effective-aspects"; + "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; + "effects" = dontDistribute super."effects"; + "effects-parser" = dontDistribute super."effects-parser"; + "effin" = dontDistribute super."effin"; + "egison" = dontDistribute super."egison"; + "egison-quote" = dontDistribute super."egison-quote"; + "egison-tutorial" = dontDistribute super."egison-tutorial"; + "ehaskell" = dontDistribute super."ehaskell"; + "ehs" = dontDistribute super."ehs"; + "eibd-client-simple" = dontDistribute super."eibd-client-simple"; + "eigen" = dontDistribute super."eigen"; + "either-unwrap" = dontDistribute super."either-unwrap"; + "eithers" = dontDistribute super."eithers"; + "ekg" = dontDistribute super."ekg"; + "ekg-bosun" = dontDistribute super."ekg-bosun"; + "ekg-carbon" = dontDistribute super."ekg-carbon"; + "ekg-json" = dontDistribute super."ekg-json"; + "ekg-log" = dontDistribute super."ekg-log"; + "ekg-push" = dontDistribute super."ekg-push"; + "ekg-rrd" = dontDistribute super."ekg-rrd"; + "ekg-statsd" = dontDistribute super."ekg-statsd"; + "electrum-mnemonic" = dontDistribute super."electrum-mnemonic"; + "elerea" = dontDistribute super."elerea"; + "elerea-examples" = dontDistribute super."elerea-examples"; + "elerea-sdl" = dontDistribute super."elerea-sdl"; + "elevator" = dontDistribute super."elevator"; + "elf" = dontDistribute super."elf"; + "elm-bridge" = dontDistribute super."elm-bridge"; + "elm-build-lib" = dontDistribute super."elm-build-lib"; + "elm-compiler" = dontDistribute super."elm-compiler"; + "elm-get" = dontDistribute super."elm-get"; + "elm-init" = dontDistribute super."elm-init"; + "elm-make" = dontDistribute super."elm-make"; + "elm-package" = dontDistribute super."elm-package"; + "elm-reactor" = dontDistribute super."elm-reactor"; + "elm-repl" = dontDistribute super."elm-repl"; + "elm-server" = dontDistribute super."elm-server"; + "elm-yesod" = dontDistribute super."elm-yesod"; + "elocrypt" = dontDistribute super."elocrypt"; + "emacs-keys" = dontDistribute super."emacs-keys"; + "email" = dontDistribute super."email"; + "email-header" = dontDistribute super."email-header"; + "email-postmark" = dontDistribute super."email-postmark"; + "email-validator" = dontDistribute super."email-validator"; + "embeddock" = dontDistribute super."embeddock"; + "embeddock-example" = dontDistribute super."embeddock-example"; + "embroidery" = dontDistribute super."embroidery"; + "emgm" = dontDistribute super."emgm"; + "empty" = dontDistribute super."empty"; + "encoding" = dontDistribute super."encoding"; + "endo" = dontDistribute super."endo"; + "engine-io-snap" = dontDistribute super."engine-io-snap"; + "engine-io-wai" = dontDistribute super."engine-io-wai"; + "engine-io-yesod" = dontDistribute super."engine-io-yesod"; + "engineering-units" = dontDistribute super."engineering-units"; + "enumerable" = dontDistribute super."enumerable"; + "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-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"; + "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; + "ersatz" = dontDistribute super."ersatz"; + "ersatz-toysat" = dontDistribute super."ersatz-toysat"; + "ert" = dontDistribute super."ert"; + "esotericbot" = dontDistribute super."esotericbot"; + "ess" = dontDistribute super."ess"; + "estimator" = dontDistribute super."estimator"; + "estimators" = dontDistribute super."estimators"; + "estreps" = dontDistribute super."estreps"; + "etcd" = dontDistribute super."etcd"; + "eternal" = dontDistribute super."eternal"; + "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell"; + "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db"; + "ethereum-rlp" = dontDistribute super."ethereum-rlp"; + "ety" = dontDistribute super."ety"; + "euler" = dontDistribute super."euler"; + "euphoria" = dontDistribute super."euphoria"; + "eurofxref" = dontDistribute super."eurofxref"; + "event-driven" = dontDistribute super."event-driven"; + "event-handlers" = dontDistribute super."event-handlers"; + "event-list" = dontDistribute super."event-list"; + "event-monad" = dontDistribute super."event-monad"; + "eventloop" = dontDistribute super."eventloop"; + "eventstore" = dontDistribute super."eventstore"; + "every-bit-counts" = dontDistribute super."every-bit-counts"; + "ewe" = dontDistribute super."ewe"; + "ex-pool" = dontDistribute super."ex-pool"; + "exact-combinatorics" = dontDistribute super."exact-combinatorics"; + "exact-pi" = dontDistribute super."exact-pi"; + "exception-mailer" = dontDistribute super."exception-mailer"; + "exception-monads-fd" = dontDistribute super."exception-monads-fd"; + "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "exherbo-cabal" = dontDistribute super."exherbo-cabal"; + "exif" = dontDistribute super."exif"; + "exinst" = dontDistribute super."exinst"; + "exinst-aeson" = dontDistribute super."exinst-aeson"; + "exinst-bytes" = dontDistribute super."exinst-bytes"; + "exinst-deepseq" = dontDistribute super."exinst-deepseq"; + "exinst-hashable" = dontDistribute super."exinst-hashable"; + "exists" = dontDistribute super."exists"; + "exp-pairs" = dontDistribute super."exp-pairs"; + "expand" = dontDistribute super."expand"; + "expat-enumerator" = dontDistribute super."expat-enumerator"; + "expiring-mvar" = dontDistribute super."expiring-mvar"; + "explain" = dontDistribute super."explain"; + "explicit-determinant" = dontDistribute super."explicit-determinant"; + "explicit-exception" = dontDistribute super."explicit-exception"; + "explicit-iomodes" = dontDistribute super."explicit-iomodes"; + "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring"; + "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text"; + "explicit-sharing" = dontDistribute super."explicit-sharing"; + "explore" = dontDistribute super."explore"; + "exposed-containers" = dontDistribute super."exposed-containers"; + "expression-parser" = dontDistribute super."expression-parser"; + "extcore" = dontDistribute super."extcore"; + "extemp" = dontDistribute super."extemp"; + "extended-categories" = dontDistribute super."extended-categories"; + "extended-reals" = dontDistribute super."extended-reals"; + "extensible" = dontDistribute super."extensible"; + "extensible-data" = dontDistribute super."extensible-data"; + "extensible-effects" = dontDistribute super."extensible-effects"; + "external-sort" = dontDistribute super."external-sort"; + "extractelf" = dontDistribute super."extractelf"; + "ez-couch" = dontDistribute super."ez-couch"; + "faceted" = dontDistribute super."faceted"; + "factory" = dontDistribute super."factory"; + "factual-api" = dontDistribute super."factual-api"; + "fad" = dontDistribute super."fad"; + "failable-list" = dontDistribute super."failable-list"; + "failure" = dontDistribute super."failure"; + "fair-predicates" = dontDistribute super."fair-predicates"; + "faker" = dontDistribute super."faker"; + "falling-turnip" = dontDistribute super."falling-turnip"; + "fallingblocks" = dontDistribute super."fallingblocks"; + "family-tree" = dontDistribute super."family-tree"; + "farmhash" = dontDistribute super."farmhash"; + "fast-digits" = dontDistribute super."fast-digits"; + "fast-math" = dontDistribute super."fast-math"; + "fast-tags" = dontDistribute super."fast-tags"; + "fast-tagsoup" = dontDistribute super."fast-tagsoup"; + "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only"; + "fasta" = dontDistribute super."fasta"; + "fastbayes" = dontDistribute super."fastbayes"; + "fastcgi" = dontDistribute super."fastcgi"; + "fastedit" = dontDistribute super."fastedit"; + "fastirc" = dontDistribute super."fastirc"; + "fault-tree" = dontDistribute super."fault-tree"; + "fay-geoposition" = dontDistribute super."fay-geoposition"; + "fay-hsx" = dontDistribute super."fay-hsx"; + "fay-ref" = dontDistribute super."fay-ref"; + "fb" = doDistribute super."fb_1_0_11"; + "fca" = dontDistribute super."fca"; + "fcd" = dontDistribute super."fcd"; + "fckeditor" = dontDistribute super."fckeditor"; + "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; + "fdo-trash" = dontDistribute super."fdo-trash"; + "fec" = dontDistribute super."fec"; + "fedora-packages" = dontDistribute super."fedora-packages"; + "feed-cli" = dontDistribute super."feed-cli"; + "feed-collect" = dontDistribute super."feed-collect"; + "feed-crawl" = dontDistribute super."feed-crawl"; + "feed-translator" = dontDistribute super."feed-translator"; + "feed2lj" = dontDistribute super."feed2lj"; + "feed2twitter" = dontDistribute super."feed2twitter"; + "feldspar-compiler" = dontDistribute super."feldspar-compiler"; + "feldspar-language" = dontDistribute super."feldspar-language"; + "feldspar-signal" = dontDistribute super."feldspar-signal"; + "fen2s" = dontDistribute super."fen2s"; + "fences" = dontDistribute super."fences"; + "fenfire" = dontDistribute super."fenfire"; + "fez-conf" = dontDistribute super."fez-conf"; + "ffeed" = dontDistribute super."ffeed"; + "fficxx" = dontDistribute super."fficxx"; + "fficxx-runtime" = dontDistribute super."fficxx-runtime"; + "ffmpeg-light" = dontDistribute super."ffmpeg-light"; + "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; + "fft" = dontDistribute super."fft"; + "fftwRaw" = dontDistribute super."fftwRaw"; + "fgl-arbitrary" = dontDistribute super."fgl-arbitrary"; + "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; + "fgl-visualize" = dontDistribute super."fgl-visualize"; + "fibon" = dontDistribute super."fibon"; + "fibonacci" = dontDistribute super."fibonacci"; + "fields" = dontDistribute super."fields"; + "fields-json" = dontDistribute super."fields-json"; + "fieldwise" = dontDistribute super."fieldwise"; + "fig" = dontDistribute super."fig"; + "file-collection" = dontDistribute super."file-collection"; + "file-command-qq" = dontDistribute super."file-command-qq"; + "filecache" = dontDistribute super."filecache"; + "filediff" = dontDistribute super."filediff"; + "filepath-io-access" = dontDistribute super."filepath-io-access"; + "filepather" = dontDistribute super."filepather"; + "filestore" = dontDistribute super."filestore"; + "filesystem-conduit" = dontDistribute super."filesystem-conduit"; + "filesystem-enumerator" = dontDistribute super."filesystem-enumerator"; + "filesystem-trees" = dontDistribute super."filesystem-trees"; + "filtrable" = dontDistribute super."filtrable"; + "final" = dontDistribute super."final"; + "find-conduit" = dontDistribute super."find-conduit"; + "fingertree-tf" = dontDistribute super."fingertree-tf"; + "finite-field" = dontDistribute super."finite-field"; + "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-mcmc" = dontDistribute super."flat-mcmc"; + "flexible-time" = dontDistribute super."flexible-time"; + "flexible-unlit" = dontDistribute super."flexible-unlit"; + "flexiwrap" = dontDistribute super."flexiwrap"; + "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck"; + "flickr" = dontDistribute super."flickr"; + "flippers" = dontDistribute super."flippers"; + "flite" = dontDistribute super."flite"; + "flo" = dontDistribute super."flo"; + "float-binstring" = dontDistribute super."float-binstring"; + "floating-bits" = dontDistribute super."floating-bits"; + "floatshow" = dontDistribute super."floatshow"; + "flow2dot" = dontDistribute super."flow2dot"; + "flowdock-api" = dontDistribute super."flowdock-api"; + "flowdock-rest" = dontDistribute super."flowdock-rest"; + "flower" = dontDistribute super."flower"; + "flowlocks-framework" = dontDistribute super."flowlocks-framework"; + "flowsim" = dontDistribute super."flowsim"; + "fltkhs" = dontDistribute super."fltkhs"; + "fluent-logger" = dontDistribute super."fluent-logger"; + "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; + "fluidsynth" = dontDistribute super."fluidsynth"; + "fmark" = dontDistribute super."fmark"; + "fold-debounce" = dontDistribute super."fold-debounce"; + "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; + "foldl-incremental" = dontDistribute super."foldl-incremental"; + "foldl-transduce" = dontDistribute super."foldl-transduce"; + "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; + "folds" = dontDistribute super."folds"; + "folds-common" = dontDistribute super."folds-common"; + "follower" = dontDistribute super."follower"; + "foma" = dontDistribute super."foma"; + "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6"; + "foo" = dontDistribute super."foo"; + "for-free" = dontDistribute super."for-free"; + "forbidden-fruit" = dontDistribute super."forbidden-fruit"; + "fordo" = dontDistribute super."fordo"; + "forecast-io" = dontDistribute super."forecast-io"; + "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric"; + "foreign-var" = dontDistribute super."foreign-var"; + "forger" = dontDistribute super."forger"; + "forkable-monad" = dontDistribute super."forkable-monad"; + "formal" = dontDistribute super."formal"; + "format" = dontDistribute super."format"; + "format-status" = dontDistribute super."format-status"; + "formattable" = dontDistribute super."formattable"; + "forml" = dontDistribute super."forml"; + "formlets" = dontDistribute super."formlets"; + "formlets-hsp" = dontDistribute super."formlets-hsp"; + "forth-hll" = dontDistribute super."forth-hll"; + "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-functors" = dontDistribute super."free-functors"; + "free-game" = dontDistribute super."free-game"; + "free-http" = dontDistribute super."free-http"; + "free-operational" = dontDistribute super."free-operational"; + "free-theorems" = dontDistribute super."free-theorems"; + "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples"; + "free-theorems-seq" = dontDistribute super."free-theorems-seq"; + "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui"; + "free-theorems-webui" = dontDistribute super."free-theorems-webui"; + "freekick2" = dontDistribute super."freekick2"; + "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"; + "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"; + "funcmp" = dontDistribute super."funcmp"; + "function-combine" = dontDistribute super."function-combine"; + "function-instances-algebra" = dontDistribute super."function-instances-algebra"; + "functional-arrow" = dontDistribute super."functional-arrow"; + "functor-apply" = dontDistribute super."functor-apply"; + "functor-combo" = dontDistribute super."functor-combo"; + "functor-infix" = dontDistribute super."functor-infix"; + "functor-monadic" = dontDistribute super."functor-monadic"; + "functorm" = dontDistribute super."functorm"; + "functors" = dontDistribute super."functors"; + "funion" = dontDistribute super."funion"; + "funpat" = dontDistribute super."funpat"; + "funsat" = dontDistribute super."funsat"; + "fusion" = dontDistribute super."fusion"; + "futun" = dontDistribute super."futun"; + "future" = dontDistribute super."future"; + "future-resource" = dontDistribute super."future-resource"; + "fuzzy" = dontDistribute super."fuzzy"; + "fuzzy-timings" = dontDistribute super."fuzzy-timings"; + "fuzzytime" = dontDistribute super."fuzzytime"; + "fwgl" = dontDistribute super."fwgl"; + "fwgl-glfw" = dontDistribute super."fwgl-glfw"; + "fwgl-javascript" = dontDistribute super."fwgl-javascript"; + "g-npm" = dontDistribute super."g-npm"; + "gact" = dontDistribute super."gact"; + "game-of-life" = dontDistribute super."game-of-life"; + "game-probability" = dontDistribute super."game-probability"; + "game-tree" = dontDistribute super."game-tree"; + "gameclock" = dontDistribute super."gameclock"; + "gamma" = dontDistribute super."gamma"; + "gang-of-threads" = dontDistribute super."gang-of-threads"; + "garepinoh" = dontDistribute super."garepinoh"; + "garsia-wachs" = dontDistribute super."garsia-wachs"; + "gbu" = dontDistribute super."gbu"; + "gc" = dontDistribute super."gc"; + "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai"; + "gconf" = dontDistribute super."gconf"; + "gdiff" = dontDistribute super."gdiff"; + "gdiff-ig" = dontDistribute super."gdiff-ig"; + "gdiff-th" = dontDistribute super."gdiff-th"; + "gearbox" = dontDistribute super."gearbox"; + "geek" = dontDistribute super."geek"; + "geek-server" = dontDistribute super."geek-server"; + "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"; + "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"; + "geocalc" = dontDistribute super."geocalc"; + "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-dup" = dontDistribute super."ghc-dup"; + "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; + "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; + "ghc-exactprint" = dontDistribute super."ghc-exactprint"; + "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; + "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; + "ghc-heap-view" = dontDistribute super."ghc-heap-view"; + "ghc-imported-from" = dontDistribute super."ghc-imported-from"; + "ghc-make" = dontDistribute super."ghc-make"; + "ghc-man-completion" = dontDistribute super."ghc-man-completion"; + "ghc-mod" = dontDistribute super."ghc-mod"; + "ghc-parmake" = dontDistribute super."ghc-parmake"; + "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; + "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; + "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph"; + "ghc-server" = dontDistribute super."ghc-server"; + "ghc-simple" = dontDistribute super."ghc-simple"; + "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; + "ghc-syb" = dontDistribute super."ghc-syb"; + "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; + "ghc-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"; + "gimlh" = dontDistribute super."gimlh"; + "ginger" = dontDistribute super."ginger"; + "ginsu" = dontDistribute super."ginsu"; + "gipeda" = doDistribute super."gipeda_0_1_2_1"; + "gist" = dontDistribute super."gist"; + "git-all" = dontDistribute super."git-all"; + "git-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-monitor" = dontDistribute super."git-monitor"; + "git-object" = dontDistribute super."git-object"; + "git-repair" = dontDistribute super."git-repair"; + "git-sanity" = dontDistribute super."git-sanity"; + "git-vogue" = dontDistribute super."git-vogue"; + "gitcache" = dontDistribute super."gitcache"; + "gitdo" = dontDistribute super."gitdo"; + "github" = dontDistribute super."github"; + "github-backup" = dontDistribute super."github-backup"; + "github-post-receive" = dontDistribute super."github-post-receive"; + "github-types" = dontDistribute super."github-types"; + "github-utils" = dontDistribute super."github-utils"; + "github-webhook-handler" = dontDistribute super."github-webhook-handler"; + "github-webhook-handler-snap" = dontDistribute super."github-webhook-handler-snap"; + "gitignore" = dontDistribute super."gitignore"; + "gitit" = dontDistribute super."gitit"; + "gitlib-cmdline" = dontDistribute super."gitlib-cmdline"; + "gitlib-cross" = dontDistribute super."gitlib-cross"; + "gitlib-s3" = dontDistribute super."gitlib-s3"; + "gitlib-sample" = dontDistribute super."gitlib-sample"; + "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gl-capture" = dontDistribute super."gl-capture"; + "glade" = dontDistribute super."glade"; + "gladexml-accessor" = dontDistribute super."gladexml-accessor"; + "glambda" = dontDistribute super."glambda"; + "glapp" = dontDistribute super."glapp"; + "glasso" = dontDistribute super."glasso"; + "glider-nlp" = dontDistribute super."glider-nlp"; + "glintcollider" = dontDistribute super."glintcollider"; + "gll" = dontDistribute super."gll"; + "global" = dontDistribute super."global"; + "global-config" = dontDistribute super."global-config"; + "global-lock" = dontDistribute super."global-lock"; + "global-variables" = dontDistribute super."global-variables"; + "glome-hs" = dontDistribute super."glome-hs"; + "gloss" = dontDistribute super."gloss"; + "gloss-accelerate" = dontDistribute super."gloss-accelerate"; + "gloss-algorithms" = dontDistribute super."gloss-algorithms"; + "gloss-banana" = dontDistribute super."gloss-banana"; + "gloss-devil" = dontDistribute super."gloss-devil"; + "gloss-examples" = dontDistribute super."gloss-examples"; + "gloss-game" = dontDistribute super."gloss-game"; + "gloss-juicy" = dontDistribute super."gloss-juicy"; + "gloss-raster" = dontDistribute super."gloss-raster"; + "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate"; + "gloss-rendering" = dontDistribute super."gloss-rendering"; + "gloss-sodium" = dontDistribute super."gloss-sodium"; + "glpk-hs" = dontDistribute super."glpk-hs"; + "glue" = dontDistribute super."glue"; + "glue-common" = dontDistribute super."glue-common"; + "glue-core" = dontDistribute super."glue-core"; + "glue-ekg" = dontDistribute super."glue-ekg"; + "glue-example" = dontDistribute super."glue-example"; + "gluturtle" = dontDistribute super."gluturtle"; + "gmap" = dontDistribute super."gmap"; + "gmndl" = dontDistribute super."gmndl"; + "gnome-desktop" = dontDistribute super."gnome-desktop"; + "gnome-keyring" = dontDistribute super."gnome-keyring"; + "gnomevfs" = dontDistribute super."gnomevfs"; + "gnuplot" = dontDistribute super."gnuplot"; + "goa" = dontDistribute super."goa"; + "goatee" = dontDistribute super."goatee"; + "goatee-gtk" = dontDistribute super."goatee-gtk"; + "gofer-prelude" = dontDistribute super."gofer-prelude"; + "google-cloud" = dontDistribute super."google-cloud"; + "google-dictionary" = dontDistribute super."google-dictionary"; + "google-drive" = dontDistribute super."google-drive"; + "google-html5-slide" = dontDistribute super."google-html5-slide"; + "google-mail-filters" = dontDistribute super."google-mail-filters"; + "google-oauth2" = dontDistribute super."google-oauth2"; + "google-search" = dontDistribute super."google-search"; + "google-translate" = dontDistribute super."google-translate"; + "googleplus" = dontDistribute super."googleplus"; + "googlepolyline" = dontDistribute super."googlepolyline"; + "gopherbot" = dontDistribute super."gopherbot"; + "gpah" = dontDistribute super."gpah"; + "gpcsets" = dontDistribute super."gpcsets"; + "gpolyline" = dontDistribute super."gpolyline"; + "gps" = dontDistribute super."gps"; + "gps2htmlReport" = dontDistribute super."gps2htmlReport"; + "gpx-conduit" = dontDistribute super."gpx-conduit"; + "graceful" = dontDistribute super."graceful"; + "grammar-combinators" = dontDistribute super."grammar-combinators"; + "grapefruit-examples" = dontDistribute super."grapefruit-examples"; + "grapefruit-frp" = dontDistribute super."grapefruit-frp"; + "grapefruit-records" = dontDistribute super."grapefruit-records"; + "grapefruit-ui" = dontDistribute super."grapefruit-ui"; + "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; + "graph-generators" = dontDistribute super."graph-generators"; + "graph-matchings" = dontDistribute super."graph-matchings"; + "graph-rewriting" = dontDistribute super."graph-rewriting"; + "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl"; + "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl"; + "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope"; + "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout"; + "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski"; + "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies"; + "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs"; + "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww"; + "graph-serialize" = dontDistribute super."graph-serialize"; + "graph-utils" = dontDistribute super."graph-utils"; + "graph-visit" = dontDistribute super."graph-visit"; + "graphbuilder" = dontDistribute super."graphbuilder"; + "graphene" = dontDistribute super."graphene"; + "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators"; + "graphics-formats-collada" = dontDistribute super."graphics-formats-collada"; + "graphicsFormats" = dontDistribute super."graphicsFormats"; + "graphicstools" = dontDistribute super."graphicstools"; + "graphmod" = dontDistribute super."graphmod"; + "graphql" = dontDistribute super."graphql"; + "graphtype" = dontDistribute super."graphtype"; + "graphviz" = dontDistribute super."graphviz"; + "gray-code" = dontDistribute super."gray-code"; + "gray-extended" = dontDistribute super."gray-extended"; + "greencard" = dontDistribute super."greencard"; + "greencard-lib" = dontDistribute super."greencard-lib"; + "greg-client" = dontDistribute super."greg-client"; + "grid" = dontDistribute super."grid"; + "gridland" = dontDistribute super."gridland"; + "grm" = dontDistribute super."grm"; + "groom" = dontDistribute super."groom"; + "groundhog-inspector" = dontDistribute super."groundhog-inspector"; + "group-with" = dontDistribute super."group-with"; + "groupoid" = dontDistribute super."groupoid"; + "gruff" = dontDistribute super."gruff"; + "gruff-examples" = dontDistribute super."gruff-examples"; + "gsc-weighting" = dontDistribute super."gsc-weighting"; + "gsl-random" = dontDistribute super."gsl-random"; + "gsl-random-fu" = dontDistribute super."gsl-random-fu"; + "gsmenu" = dontDistribute super."gsmenu"; + "gstreamer" = dontDistribute super."gstreamer"; + "gt-tools" = dontDistribute super."gt-tools"; + "gtfs" = dontDistribute super."gtfs"; + "gtk-helpers" = dontDistribute super."gtk-helpers"; + "gtk-jsinput" = dontDistribute super."gtk-jsinput"; + "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore"; + "gtk-mac-integration" = dontDistribute super."gtk-mac-integration"; + "gtk-serialized-event" = dontDistribute super."gtk-serialized-event"; + "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view"; + "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; + "gtk-toy" = dontDistribute super."gtk-toy"; + "gtk-traymanager" = dontDistribute super."gtk-traymanager"; + "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; + "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; + "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; + "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk"; + "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext"; + "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2"; + "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; + "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; + "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; + "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; + "gtkglext" = dontDistribute super."gtkglext"; + "gtkimageview" = dontDistribute super."gtkimageview"; + "gtkrsync" = dontDistribute super."gtkrsync"; + "gtksourceview2" = dontDistribute super."gtksourceview2"; + "gtksourceview3" = dontDistribute super."gtksourceview3"; + "guarded-rewriting" = dontDistribute super."guarded-rewriting"; + "guess-combinator" = dontDistribute super."guess-combinator"; + "gulcii" = dontDistribute super."gulcii"; + "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; + "gyah-bin" = dontDistribute super."gyah-bin"; + "h-booru" = dontDistribute super."h-booru"; + "h-gpgme" = dontDistribute super."h-gpgme"; + "h2048" = dontDistribute super."h2048"; + "hArduino" = dontDistribute super."hArduino"; + "hBDD" = dontDistribute super."hBDD"; + "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD"; + "hBDD-CUDD" = dontDistribute super."hBDD-CUDD"; + "hCsound" = dontDistribute super."hCsound"; + "hDFA" = dontDistribute super."hDFA"; + "hF2" = dontDistribute super."hF2"; + "hGelf" = dontDistribute super."hGelf"; + "hLLVM" = dontDistribute super."hLLVM"; + "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = dontDistribute super."hOpenPGP"; + "hPDB-examples" = dontDistribute super."hPDB-examples"; + "hPushover" = dontDistribute super."hPushover"; + "hR" = dontDistribute super."hR"; + "hRESP" = dontDistribute super."hRESP"; + "hS3" = dontDistribute super."hS3"; + "hSimpleDB" = dontDistribute super."hSimpleDB"; + "hTalos" = dontDistribute super."hTalos"; + "hTensor" = dontDistribute super."hTensor"; + "hVOIDP" = dontDistribute super."hVOIDP"; + "hXmixer" = dontDistribute super."hXmixer"; + "haar" = dontDistribute super."haar"; + "hacanon-light" = dontDistribute super."hacanon-light"; + "hack" = dontDistribute super."hack"; + "hack-contrib" = dontDistribute super."hack-contrib"; + "hack-contrib-press" = dontDistribute super."hack-contrib-press"; + "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack"; + "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi"; + "hack-handler-cgi" = dontDistribute super."hack-handler-cgi"; + "hack-handler-epoll" = dontDistribute super."hack-handler-epoll"; + "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp"; + "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi"; + "hack-handler-happstack" = dontDistribute super."hack-handler-happstack"; + "hack-handler-hyena" = dontDistribute super."hack-handler-hyena"; + "hack-handler-kibro" = dontDistribute super."hack-handler-kibro"; + "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver"; + "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath"; + "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession"; + "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip"; + "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp"; + "hack2" = dontDistribute super."hack2"; + "hack2-contrib" = dontDistribute super."hack2-contrib"; + "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra"; + "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server"; + "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http"; + "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server"; + "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; + "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; + "hackage-diff" = dontDistribute super."hackage-diff"; + "hackage-plot" = dontDistribute super."hackage-plot"; + "hackage-proxy" = dontDistribute super."hackage-proxy"; + "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; + "hackage-security" = dontDistribute super."hackage-security"; + "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP"; + "hackage-server" = dontDistribute super."hackage-server"; + "hackage-sparks" = dontDistribute super."hackage-sparks"; + "hackage2hwn" = dontDistribute super."hackage2hwn"; + "hackage2twitter" = dontDistribute super."hackage2twitter"; + "hackager" = dontDistribute super."hackager"; + "hackernews" = dontDistribute super."hackernews"; + "hackertyper" = dontDistribute super."hackertyper"; + "hackmanager" = dontDistribute super."hackmanager"; + "hackport" = dontDistribute super."hackport"; + "hactor" = dontDistribute super."hactor"; + "hactors" = dontDistribute super."hactors"; + "haddock" = dontDistribute super."haddock"; + "haddock-leksah" = dontDistribute super."haddock-leksah"; + "haddocset" = dontDistribute super."haddocset"; + "hadoop-formats" = dontDistribute super."hadoop-formats"; + "hadoop-rpc" = dontDistribute super."hadoop-rpc"; + "hadoop-tools" = dontDistribute super."hadoop-tools"; + "haeredes" = dontDistribute super."haeredes"; + "haggis" = dontDistribute super."haggis"; + "haha" = dontDistribute super."haha"; + "hailgun" = dontDistribute super."hailgun"; + "hailgun-send" = dontDistribute super."hailgun-send"; + "hails" = dontDistribute super."hails"; + "hails-bin" = dontDistribute super."hails-bin"; + "hairy" = dontDistribute super."hairy"; + "hakaru" = dontDistribute super."hakaru"; + "hake" = dontDistribute super."hake"; + "hakismet" = dontDistribute super."hakismet"; + "hako" = dontDistribute super."hako"; + "hakyll-R" = dontDistribute super."hakyll-R"; + "hakyll-agda" = dontDistribute super."hakyll-agda"; + "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; + "hakyll-contrib" = dontDistribute super."hakyll-contrib"; + "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation"; + "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links"; + "hakyll-convert" = dontDistribute super."hakyll-convert"; + "hakyll-elm" = dontDistribute super."hakyll-elm"; + "hakyll-sass" = dontDistribute super."hakyll-sass"; + "halberd" = dontDistribute super."halberd"; + "halfs" = dontDistribute super."halfs"; + "halipeto" = dontDistribute super."halipeto"; + "halive" = dontDistribute super."halive"; + "halma" = dontDistribute super."halma"; + "haltavista" = dontDistribute super."haltavista"; + "hamid" = dontDistribute super."hamid"; + "hampp" = dontDistribute super."hampp"; + "hamtmap" = dontDistribute super."hamtmap"; + "hamusic" = dontDistribute super."hamusic"; + "handa-gdata" = dontDistribute super."handa-gdata"; + "handa-geodata" = dontDistribute super."handa-geodata"; + "handle-like" = dontDistribute super."handle-like"; + "handsy" = dontDistribute super."handsy"; + "hangman" = dontDistribute super."hangman"; + "hannahci" = dontDistribute super."hannahci"; + "hans" = dontDistribute super."hans"; + "hans-pcap" = dontDistribute super."hans-pcap"; + "hans-pfq" = dontDistribute super."hans-pfq"; + "hapistrano" = dontDistribute super."hapistrano"; + "happindicator" = dontDistribute super."happindicator"; + "happindicator3" = dontDistribute super."happindicator3"; + "happraise" = dontDistribute super."happraise"; + "happs-hsp" = dontDistribute super."happs-hsp"; + "happs-hsp-template" = dontDistribute super."happs-hsp-template"; + "happs-tutorial" = dontDistribute super."happs-tutorial"; + "happstack" = dontDistribute super."happstack"; + "happstack-auth" = dontDistribute super."happstack-auth"; + "happstack-authenticate" = dontDistribute super."happstack-authenticate"; + "happstack-clientsession" = dontDistribute super."happstack-clientsession"; + "happstack-contrib" = dontDistribute super."happstack-contrib"; + "happstack-data" = dontDistribute super."happstack-data"; + "happstack-dlg" = dontDistribute super."happstack-dlg"; + "happstack-facebook" = dontDistribute super."happstack-facebook"; + "happstack-fastcgi" = dontDistribute super."happstack-fastcgi"; + "happstack-fay" = dontDistribute super."happstack-fay"; + "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax"; + "happstack-foundation" = dontDistribute super."happstack-foundation"; + "happstack-hamlet" = dontDistribute super."happstack-hamlet"; + "happstack-heist" = dontDistribute super."happstack-heist"; + "happstack-helpers" = dontDistribute super."happstack-helpers"; + "happstack-hsp" = dontDistribute super."happstack-hsp"; + "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate"; + "happstack-ixset" = dontDistribute super."happstack-ixset"; + "happstack-jmacro" = dontDistribute super."happstack-jmacro"; + "happstack-lite" = dontDistribute super."happstack-lite"; + "happstack-monad-peel" = dontDistribute super."happstack-monad-peel"; + "happstack-plugins" = dontDistribute super."happstack-plugins"; + "happstack-server-tls" = dontDistribute super."happstack-server-tls"; + "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite"; + "happstack-state" = dontDistribute super."happstack-state"; + "happstack-static-routing" = dontDistribute super."happstack-static-routing"; + "happstack-util" = dontDistribute super."happstack-util"; + "happstack-yui" = dontDistribute super."happstack-yui"; + "happy-meta" = dontDistribute super."happy-meta"; + "happybara" = dontDistribute super."happybara"; + "happybara-webkit" = dontDistribute super."happybara-webkit"; + "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; + "har" = dontDistribute super."har"; + "harchive" = dontDistribute super."harchive"; + "hark" = dontDistribute super."hark"; + "harmony" = dontDistribute super."harmony"; + "haroonga" = dontDistribute super."haroonga"; + "haroonga-httpd" = dontDistribute super."haroonga-httpd"; + "harp" = dontDistribute super."harp"; + "harpy" = dontDistribute super."harpy"; + "has" = dontDistribute super."has"; + "has-th" = dontDistribute super."has-th"; + "hascal" = dontDistribute super."hascal"; + "hascat" = dontDistribute super."hascat"; + "hascat-lib" = dontDistribute super."hascat-lib"; + "hascat-setup" = dontDistribute super."hascat-setup"; + "hascat-system" = dontDistribute super."hascat-system"; + "hash" = dontDistribute super."hash"; + "hashable-generics" = dontDistribute super."hashable-generics"; + "hashable-time" = dontDistribute super."hashable-time"; + "hashabler" = dontDistribute super."hashabler"; + "hashed-storage" = dontDistribute super."hashed-storage"; + "hashids" = dontDistribute super."hashids"; + "hashring" = dontDistribute super."hashring"; + "hashtables-plus" = dontDistribute super."hashtables-plus"; + "hasim" = dontDistribute super."hasim"; + "hask" = dontDistribute super."hask"; + "hask-home" = dontDistribute super."hask-home"; + "haskades" = dontDistribute super."haskades"; + "haskakafka" = dontDistribute super."haskakafka"; + "haskanoid" = dontDistribute super."haskanoid"; + "haskarrow" = dontDistribute super."haskarrow"; + "haskbot-core" = dontDistribute super."haskbot-core"; + "haskdeep" = dontDistribute super."haskdeep"; + "haskdogs" = dontDistribute super."haskdogs"; + "haskeem" = dontDistribute super."haskeem"; + "haskeline" = doDistribute super."haskeline_0_7_2_1"; + "haskeline-class" = dontDistribute super."haskeline-class"; + "haskell-aliyun" = dontDistribute super."haskell-aliyun"; + "haskell-awk" = dontDistribute super."haskell-awk"; + "haskell-bcrypt" = dontDistribute super."haskell-bcrypt"; + "haskell-brainfuck" = dontDistribute super."haskell-brainfuck"; + "haskell-cnc" = dontDistribute super."haskell-cnc"; + "haskell-coffee" = dontDistribute super."haskell-coffee"; + "haskell-compression" = dontDistribute super."haskell-compression"; + "haskell-course-preludes" = dontDistribute super."haskell-course-preludes"; + "haskell-docs" = dontDistribute super."haskell-docs"; + "haskell-formatter" = dontDistribute super."haskell-formatter"; + "haskell-ftp" = dontDistribute super."haskell-ftp"; + "haskell-generate" = dontDistribute super."haskell-generate"; + "haskell-in-space" = dontDistribute super."haskell-in-space"; + "haskell-modbus" = dontDistribute super."haskell-modbus"; + "haskell-mpi" = dontDistribute super."haskell-mpi"; + "haskell-openflow" = dontDistribute super."haskell-openflow"; + "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter"; + "haskell-platform-test" = dontDistribute super."haskell-platform-test"; + "haskell-plot" = dontDistribute super."haskell-plot"; + "haskell-qrencode" = dontDistribute super."haskell-qrencode"; + "haskell-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-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-crypto" = dontDistribute super."haskoin-crypto"; + "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-postgres" = doDistribute super."hasql-postgres_0_10_5"; + "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; + "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"; + "hat" = dontDistribute super."hat"; + "hatex-guide" = dontDistribute super."hatex-guide"; + "hath" = dontDistribute super."hath"; + "hatt" = dontDistribute super."hatt"; + "haverer" = dontDistribute super."haverer"; + "hawitter" = dontDistribute super."hawitter"; + "haxl" = dontDistribute super."haxl"; + "haxl-facebook" = dontDistribute super."haxl-facebook"; + "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_1"; + "haxr-th" = dontDistribute super."haxr-th"; + "haxy" = dontDistribute super."haxy"; + "hayland" = dontDistribute super."hayland"; + "hayoo-cli" = dontDistribute super."hayoo-cli"; + "hback" = dontDistribute super."hback"; + "hbayes" = dontDistribute super."hbayes"; + "hbb" = dontDistribute super."hbb"; + "hbcd" = dontDistribute super."hbcd"; + "hbeat" = dontDistribute super."hbeat"; + "hblas" = dontDistribute super."hblas"; + "hblock" = dontDistribute super."hblock"; + "hbro" = dontDistribute super."hbro"; + "hbro-contrib" = dontDistribute super."hbro-contrib"; + "hburg" = dontDistribute super."hburg"; + "hcc" = dontDistribute super."hcc"; + "hcg-minus" = dontDistribute super."hcg-minus"; + "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo"; + "hcheat" = dontDistribute super."hcheat"; + "hchesslib" = dontDistribute super."hchesslib"; + "hcltest" = dontDistribute super."hcltest"; + "hcron" = dontDistribute super."hcron"; + "hcube" = dontDistribute super."hcube"; + "hcwiid" = dontDistribute super."hcwiid"; + "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix"; + "hdbc-aeson" = dontDistribute super."hdbc-aeson"; + "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore"; + "hdbc-tuple" = dontDistribute super."hdbc-tuple"; + "hdbi" = dontDistribute super."hdbi"; + "hdbi-conduit" = dontDistribute super."hdbi-conduit"; + "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; + "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; + "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdf" = dontDistribute super."hdf"; + "hdigest" = dontDistribute super."hdigest"; + "hdirect" = dontDistribute super."hdirect"; + "hdis86" = dontDistribute super."hdis86"; + "hdiscount" = dontDistribute super."hdiscount"; + "hdm" = dontDistribute super."hdm"; + "hdph" = dontDistribute super."hdph"; + "hdph-closure" = dontDistribute super."hdph-closure"; + "headergen" = dontDistribute super."headergen"; + "heapsort" = dontDistribute super."heapsort"; + "hecc" = dontDistribute super."hecc"; + "hedis-config" = dontDistribute super."hedis-config"; + "hedis-monadic" = dontDistribute super."hedis-monadic"; + "hedis-pile" = dontDistribute super."hedis-pile"; + "hedis-simple" = dontDistribute super."hedis-simple"; + "hedis-tags" = dontDistribute super."hedis-tags"; + "hedn" = dontDistribute super."hedn"; + "hein" = dontDistribute super."hein"; + "heist-aeson" = dontDistribute super."heist-aeson"; + "heist-async" = dontDistribute super."heist-async"; + "helics" = dontDistribute super."helics"; + "helics-wai" = dontDistribute super."helics-wai"; + "helisp" = dontDistribute super."helisp"; + "helium" = dontDistribute super."helium"; + "hell" = dontDistribute super."hell"; + "hellage" = dontDistribute super."hellage"; + "hellnet" = dontDistribute super."hellnet"; + "hello" = dontDistribute super."hello"; + "helm" = dontDistribute super."helm"; + "help-esb" = dontDistribute super."help-esb"; + "hemkay" = dontDistribute super."hemkay"; + "hemkay-core" = dontDistribute super."hemkay-core"; + "hemokit" = dontDistribute super."hemokit"; + "hen" = dontDistribute super."hen"; + "henet" = dontDistribute super."henet"; + "hepevt" = dontDistribute super."hepevt"; + "her-lexer" = dontDistribute super."her-lexer"; + "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; + "herbalizer" = dontDistribute super."herbalizer"; + "hermit" = dontDistribute super."hermit"; + "hermit-syb" = dontDistribute super."hermit-syb"; + "heroku" = dontDistribute super."heroku"; + "heroku-persistent" = dontDistribute super."heroku-persistent"; + "herringbone" = dontDistribute super."herringbone"; + "herringbone-embed" = dontDistribute super."herringbone-embed"; + "herringbone-wai" = dontDistribute super."herringbone-wai"; + "hesql" = dontDistribute super."hesql"; + "hetero-map" = dontDistribute super."hetero-map"; + "hetris" = dontDistribute super."hetris"; + "heukarya" = dontDistribute super."heukarya"; + "hevolisa" = dontDistribute super."hevolisa"; + "hevolisa-dph" = dontDistribute super."hevolisa-dph"; + "hexdump" = dontDistribute super."hexdump"; + "hexif" = dontDistribute super."hexif"; + "hexpat-iteratee" = dontDistribute super."hexpat-iteratee"; + "hexpat-lens" = dontDistribute super."hexpat-lens"; + "hexpat-pickle" = dontDistribute super."hexpat-pickle"; + "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic"; + "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup"; + "hexpr" = dontDistribute super."hexpr"; + "hexquote" = dontDistribute super."hexquote"; + "heyefi" = dontDistribute super."heyefi"; + "hfann" = dontDistribute super."hfann"; + "hfd" = dontDistribute super."hfd"; + "hfiar" = dontDistribute super."hfiar"; + "hfoil" = dontDistribute super."hfoil"; + "hfov" = dontDistribute super."hfov"; + "hfractal" = dontDistribute super."hfractal"; + "hfusion" = dontDistribute super."hfusion"; + "hg-buildpackage" = dontDistribute super."hg-buildpackage"; + "hgal" = dontDistribute super."hgal"; + "hgalib" = dontDistribute super."hgalib"; + "hgdbmi" = dontDistribute super."hgdbmi"; + "hgearman" = dontDistribute super."hgearman"; + "hgen" = dontDistribute super."hgen"; + "hgeometric" = dontDistribute super."hgeometric"; + "hgeometry" = dontDistribute super."hgeometry"; + "hgettext" = dontDistribute super."hgettext"; + "hgithub" = dontDistribute super."hgithub"; + "hgl-example" = dontDistribute super."hgl-example"; + "hgom" = dontDistribute super."hgom"; + "hgopher" = dontDistribute super."hgopher"; + "hgrib" = dontDistribute super."hgrib"; + "hharp" = dontDistribute super."hharp"; + "hi" = dontDistribute super."hi"; + "hiccup" = dontDistribute super."hiccup"; + "hichi" = dontDistribute super."hichi"; + "hidapi" = dontDistribute super."hidapi"; + "hieraclus" = dontDistribute super."hieraclus"; + "hierarchical-clustering" = dontDistribute super."hierarchical-clustering"; + "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams"; + "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions"; + "hierarchy" = dontDistribute super."hierarchy"; + "hiernotify" = dontDistribute super."hiernotify"; + "highWaterMark" = dontDistribute super."highWaterMark"; + "higher-leveldb" = dontDistribute super."higher-leveldb"; + "higherorder" = dontDistribute super."higherorder"; + "highlight-versions" = dontDistribute super."highlight-versions"; + "highlighter" = dontDistribute super."highlighter"; + "highlighter2" = dontDistribute super."highlighter2"; + "hills" = dontDistribute super."hills"; + "himerge" = dontDistribute super."himerge"; + "himg" = dontDistribute super."himg"; + "himpy" = dontDistribute super."himpy"; + "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; + "hinduce-classifier" = dontDistribute super."hinduce-classifier"; + "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; + "hinduce-examples" = dontDistribute super."hinduce-examples"; + "hinduce-missingh" = dontDistribute super."hinduce-missingh"; + "hinquire" = dontDistribute super."hinquire"; + "hinstaller" = dontDistribute super."hinstaller"; + "hint-server" = dontDistribute super."hint-server"; + "hinvaders" = dontDistribute super."hinvaders"; + "hinze-streams" = dontDistribute super."hinze-streams"; + "hipbot" = dontDistribute super."hipbot"; + "hipe" = dontDistribute super."hipe"; + "hips" = dontDistribute super."hips"; + "hircules" = dontDistribute super."hircules"; + "hirt" = dontDistribute super."hirt"; + "hissmetrics" = dontDistribute super."hissmetrics"; + "hist-pl" = dontDistribute super."hist-pl"; + "hist-pl-dawg" = dontDistribute super."hist-pl-dawg"; + "hist-pl-fusion" = dontDistribute super."hist-pl-fusion"; + "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon"; + "hist-pl-lmf" = dontDistribute super."hist-pl-lmf"; + "hist-pl-transliter" = dontDistribute super."hist-pl-transliter"; + "hist-pl-types" = dontDistribute super."hist-pl-types"; + "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; + "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; + "historian" = dontDistribute super."historian"; + "hjcase" = dontDistribute super."hjcase"; + "hjpath" = dontDistribute super."hjpath"; + "hjs" = dontDistribute super."hjs"; + "hjson" = dontDistribute super."hjson"; + "hjson-query" = dontDistribute super."hjson-query"; + "hjsonpointer" = dontDistribute super."hjsonpointer"; + "hjsonschema" = dontDistribute super."hjsonschema"; + "hlatex" = dontDistribute super."hlatex"; + "hlbfgsb" = dontDistribute super."hlbfgsb"; + "hlcm" = dontDistribute super."hlcm"; + "hledger-chart" = dontDistribute super."hledger-chart"; + "hledger-diff" = dontDistribute super."hledger-diff"; + "hledger-interest" = dontDistribute super."hledger-interest"; + "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-special" = dontDistribute super."hmatrix-special"; + "hmatrix-static" = dontDistribute super."hmatrix-static"; + "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc"; + "hmatrix-syntax" = dontDistribute super."hmatrix-syntax"; + "hmatrix-tests" = dontDistribute super."hmatrix-tests"; + "hmeap" = dontDistribute super."hmeap"; + "hmeap-utils" = dontDistribute super."hmeap-utils"; + "hmemdb" = dontDistribute super."hmemdb"; + "hmenu" = dontDistribute super."hmenu"; + "hmidi" = dontDistribute super."hmidi"; + "hmk" = dontDistribute super."hmk"; + "hmm" = dontDistribute super."hmm"; + "hmm-hmatrix" = dontDistribute super."hmm-hmatrix"; + "hmp3" = dontDistribute super."hmp3"; + "hmpfr" = dontDistribute super."hmpfr"; + "hmt" = dontDistribute super."hmt"; + "hmt-diagrams" = dontDistribute super."hmt-diagrams"; + "hmumps" = dontDistribute super."hmumps"; + "hnetcdf" = dontDistribute super."hnetcdf"; + "hnix" = dontDistribute super."hnix"; + "hnn" = dontDistribute super."hnn"; + "hnop" = dontDistribute super."hnop"; + "ho-rewriting" = dontDistribute super."ho-rewriting"; + "hoauth" = dontDistribute super."hoauth"; + "hob" = dontDistribute super."hob"; + "hobbes" = dontDistribute super."hobbes"; + "hobbits" = dontDistribute super."hobbits"; + "hoe" = dontDistribute super."hoe"; + "hofix-mtl" = dontDistribute super."hofix-mtl"; + "hog" = dontDistribute super."hog"; + "hogg" = dontDistribute super."hogg"; + "hogre" = dontDistribute super."hogre"; + "hogre-examples" = dontDistribute super."hogre-examples"; + "hois" = dontDistribute super."hois"; + "hoist-error" = dontDistribute super."hoist-error"; + "hold-em" = dontDistribute super."hold-em"; + "hole" = dontDistribute super."hole"; + "holey-format" = dontDistribute super."holey-format"; + "homeomorphic" = dontDistribute super."homeomorphic"; + "hommage" = dontDistribute super."hommage"; + "hommage-ds" = dontDistribute super."hommage-ds"; + "homplexity" = dontDistribute super."homplexity"; + "honi" = dontDistribute super."honi"; + "honk" = dontDistribute super."honk"; + "hoobuddy" = dontDistribute super."hoobuddy"; + "hood" = dontDistribute super."hood"; + "hood-off" = dontDistribute super."hood-off"; + "hood2" = dontDistribute super."hood2"; + "hoodie" = dontDistribute super."hoodie"; + "hoodle" = dontDistribute super."hoodle"; + "hoodle-builder" = dontDistribute super."hoodle-builder"; + "hoodle-core" = dontDistribute super."hoodle-core"; + "hoodle-extra" = dontDistribute super."hoodle-extra"; + "hoodle-parser" = dontDistribute super."hoodle-parser"; + "hoodle-publish" = dontDistribute super."hoodle-publish"; + "hoodle-render" = dontDistribute super."hoodle-render"; + "hoodle-types" = dontDistribute super."hoodle-types"; + "hoogle-index" = dontDistribute super."hoogle-index"; + "hooks-dir" = dontDistribute super."hooks-dir"; + "hoovie" = dontDistribute super."hoovie"; + "hopencc" = dontDistribute super."hopencc"; + "hopencl" = dontDistribute super."hopencl"; + "hopenpgp-tools" = dontDistribute super."hopenpgp-tools"; + "hopenssl" = dontDistribute super."hopenssl"; + "hopfield" = dontDistribute super."hopfield"; + "hopfield-networks" = dontDistribute super."hopfield-networks"; + "hopfli" = dontDistribute super."hopfli"; + "hops" = dontDistribute super."hops"; + "hoq" = dontDistribute super."hoq"; + "horizon" = dontDistribute super."horizon"; + "hosc" = dontDistribute super."hosc"; + "hosc-json" = dontDistribute super."hosc-json"; + "hosc-utils" = dontDistribute super."hosc-utils"; + "hosts-server" = dontDistribute super."hosts-server"; + "hothasktags" = dontDistribute super."hothasktags"; + "hotswap" = dontDistribute super."hotswap"; + "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing"; + "hp2any-core" = dontDistribute super."hp2any-core"; + "hp2any-graph" = dontDistribute super."hp2any-graph"; + "hp2any-manager" = dontDistribute super."hp2any-manager"; + "hp2html" = dontDistribute super."hp2html"; + "hp2pretty" = dontDistribute super."hp2pretty"; + "hpack" = dontDistribute super."hpack"; + "hpaco" = dontDistribute super."hpaco"; + "hpaco-lib" = dontDistribute super."hpaco-lib"; + "hpage" = dontDistribute super."hpage"; + "hpapi" = dontDistribute super."hpapi"; + "hpaste" = dontDistribute super."hpaste"; + "hpasteit" = dontDistribute super."hpasteit"; + "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0"; + "hpc-strobe" = dontDistribute super."hpc-strobe"; + "hpc-tracer" = dontDistribute super."hpc-tracer"; + "hplayground" = dontDistribute super."hplayground"; + "hplaylist" = dontDistribute super."hplaylist"; + "hpodder" = dontDistribute super."hpodder"; + "hpp" = dontDistribute super."hpp"; + "hpqtypes" = dontDistribute super."hpqtypes"; + "hprotoc-fork" = dontDistribute super."hprotoc-fork"; + "hps" = dontDistribute super."hps"; + "hps-cairo" = dontDistribute super."hps-cairo"; + "hps-kmeans" = dontDistribute super."hps-kmeans"; + "hpuz" = dontDistribute super."hpuz"; + "hpygments" = dontDistribute super."hpygments"; + "hpylos" = dontDistribute super."hpylos"; + "hpyrg" = dontDistribute super."hpyrg"; + "hquantlib" = dontDistribute super."hquantlib"; + "hquery" = dontDistribute super."hquery"; + "hranker" = dontDistribute super."hranker"; + "hreader" = dontDistribute super."hreader"; + "hricket" = dontDistribute super."hricket"; + "hruby" = dontDistribute super."hruby"; + "hs-GeoIP" = dontDistribute super."hs-GeoIP"; + "hs-blake2" = dontDistribute super."hs-blake2"; + "hs-captcha" = dontDistribute super."hs-captcha"; + "hs-carbon" = dontDistribute super."hs-carbon"; + "hs-carbon-examples" = dontDistribute super."hs-carbon-examples"; + "hs-cdb" = dontDistribute super."hs-cdb"; + "hs-dotnet" = dontDistribute super."hs-dotnet"; + "hs-duktape" = dontDistribute super."hs-duktape"; + "hs-excelx" = dontDistribute super."hs-excelx"; + "hs-ffmpeg" = dontDistribute super."hs-ffmpeg"; + "hs-fltk" = dontDistribute super."hs-fltk"; + "hs-gchart" = dontDistribute super."hs-gchart"; + "hs-gen-iface" = dontDistribute super."hs-gen-iface"; + "hs-gizapp" = dontDistribute super."hs-gizapp"; + "hs-inspector" = dontDistribute super."hs-inspector"; + "hs-java" = dontDistribute super."hs-java"; + "hs-json-rpc" = dontDistribute super."hs-json-rpc"; + "hs-logo" = dontDistribute super."hs-logo"; + "hs-mesos" = dontDistribute super."hs-mesos"; + "hs-nombre-generator" = dontDistribute super."hs-nombre-generator"; + "hs-pgms" = dontDistribute super."hs-pgms"; + "hs-php-session" = dontDistribute super."hs-php-session"; + "hs-pkg-config" = dontDistribute super."hs-pkg-config"; + "hs-pkpass" = dontDistribute super."hs-pkpass"; + "hs-re" = dontDistribute super."hs-re"; + "hs-scrape" = dontDistribute super."hs-scrape"; + "hs-twitter" = dontDistribute super."hs-twitter"; + "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver"; + "hs-vcard" = dontDistribute super."hs-vcard"; + "hs2048" = dontDistribute super."hs2048"; + "hs2bf" = dontDistribute super."hs2bf"; + "hs2dot" = dontDistribute super."hs2dot"; + "hsConfigure" = dontDistribute super."hsConfigure"; + "hsSqlite3" = dontDistribute super."hsSqlite3"; + "hsXenCtrl" = dontDistribute super."hsXenCtrl"; + "hsay" = dontDistribute super."hsay"; + "hsb2hs" = dontDistribute super."hsb2hs"; + "hsbackup" = dontDistribute super."hsbackup"; + "hsbencher" = dontDistribute super."hsbencher"; + "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed"; + "hsbencher-fusion" = dontDistribute super."hsbencher-fusion"; + "hsc2hs" = dontDistribute super."hsc2hs"; + "hsc3" = dontDistribute super."hsc3"; + "hsc3-auditor" = dontDistribute super."hsc3-auditor"; + "hsc3-cairo" = dontDistribute super."hsc3-cairo"; + "hsc3-data" = dontDistribute super."hsc3-data"; + "hsc3-db" = dontDistribute super."hsc3-db"; + "hsc3-dot" = dontDistribute super."hsc3-dot"; + "hsc3-forth" = dontDistribute super."hsc3-forth"; + "hsc3-graphs" = dontDistribute super."hsc3-graphs"; + "hsc3-lang" = dontDistribute super."hsc3-lang"; + "hsc3-lisp" = dontDistribute super."hsc3-lisp"; + "hsc3-plot" = dontDistribute super."hsc3-plot"; + "hsc3-process" = dontDistribute super."hsc3-process"; + "hsc3-rec" = dontDistribute super."hsc3-rec"; + "hsc3-rw" = dontDistribute super."hsc3-rw"; + "hsc3-server" = dontDistribute super."hsc3-server"; + "hsc3-sf" = dontDistribute super."hsc3-sf"; + "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile"; + "hsc3-unsafe" = dontDistribute super."hsc3-unsafe"; + "hsc3-utils" = dontDistribute super."hsc3-utils"; + "hscamwire" = dontDistribute super."hscamwire"; + "hscassandra" = dontDistribute super."hscassandra"; + "hscd" = dontDistribute super."hscd"; + "hsclock" = dontDistribute super."hsclock"; + "hscope" = dontDistribute super."hscope"; + "hscrtmpl" = dontDistribute super."hscrtmpl"; + "hscuid" = dontDistribute super."hscuid"; + "hscurses" = dontDistribute super."hscurses"; + "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex"; + "hsdev" = dontDistribute super."hsdev"; + "hsdif" = dontDistribute super."hsdif"; + "hsdip" = dontDistribute super."hsdip"; + "hsdns" = dontDistribute super."hsdns"; + "hsdns-cache" = dontDistribute super."hsdns-cache"; + "hsemail-ns" = dontDistribute super."hsemail-ns"; + "hsenv" = dontDistribute super."hsenv"; + "hserv" = dontDistribute super."hserv"; + "hset" = dontDistribute super."hset"; + "hsexif" = dontDistribute super."hsexif"; + "hsfacter" = dontDistribute super."hsfacter"; + "hsfcsh" = dontDistribute super."hsfcsh"; + "hsfilt" = dontDistribute super."hsfilt"; + "hsgnutls" = dontDistribute super."hsgnutls"; + "hsgnutls-yj" = dontDistribute super."hsgnutls-yj"; + "hsgsom" = dontDistribute super."hsgsom"; + "hsgtd" = dontDistribute super."hsgtd"; + "hsharc" = dontDistribute super."hsharc"; + "hsilop" = dontDistribute super."hsilop"; + "hsimport" = dontDistribute super."hsimport"; + "hsini" = dontDistribute super."hsini"; + "hskeleton" = dontDistribute super."hskeleton"; + "hslackbuilder" = dontDistribute super."hslackbuilder"; + "hslibsvm" = dontDistribute super."hslibsvm"; + "hslinks" = dontDistribute super."hslinks"; + "hslogger-reader" = dontDistribute super."hslogger-reader"; + "hslogger-template" = dontDistribute super."hslogger-template"; + "hslogger4j" = dontDistribute super."hslogger4j"; + "hslogstash" = dontDistribute super."hslogstash"; + "hsmagick" = dontDistribute super."hsmagick"; + "hsmisc" = dontDistribute super."hsmisc"; + "hsmtpclient" = dontDistribute super."hsmtpclient"; + "hsndfile" = dontDistribute super."hsndfile"; + "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector"; + "hsndfile-vector" = dontDistribute super."hsndfile-vector"; + "hsnock" = dontDistribute super."hsnock"; + "hsnoise" = dontDistribute super."hsnoise"; + "hsns" = dontDistribute super."hsns"; + "hsnsq" = dontDistribute super."hsnsq"; + "hsntp" = dontDistribute super."hsntp"; + "hsoptions" = dontDistribute super."hsoptions"; + "hsp" = dontDistribute super."hsp"; + "hsp-cgi" = dontDistribute super."hsp-cgi"; + "hsparklines" = dontDistribute super."hsparklines"; + "hsparql" = dontDistribute super."hsparql"; + "hspear" = dontDistribute super."hspear"; + "hspec" = doDistribute super."hspec_2_1_10"; + "hspec-checkers" = dontDistribute super."hspec-checkers"; + "hspec-core" = doDistribute super."hspec-core_2_1_10"; + "hspec-discover" = doDistribute super."hspec-discover_2_1_10"; + "hspec-expectations" = doDistribute super."hspec-expectations_0_7_1"; + "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens"; + "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted"; + "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty"; + "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff"; + "hspec-experimental" = dontDistribute super."hspec-experimental"; + "hspec-laws" = dontDistribute super."hspec-laws"; + "hspec-meta" = doDistribute super."hspec-meta_2_1_7"; + "hspec-monad-control" = dontDistribute super."hspec-monad-control"; + "hspec-server" = dontDistribute super."hspec-server"; + "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; + "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0"; + "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0"; + "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; + "hspec-test-framework" = dontDistribute super."hspec-test-framework"; + "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; + "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec2" = dontDistribute super."hspec2"; + "hspr-sh" = dontDistribute super."hspr-sh"; + "hspread" = dontDistribute super."hspread"; + "hspresent" = dontDistribute super."hspresent"; + "hsprocess" = dontDistribute super."hsprocess"; + "hsql" = dontDistribute super."hsql"; + "hsql-mysql" = dontDistribute super."hsql-mysql"; + "hsql-odbc" = dontDistribute super."hsql-odbc"; + "hsql-postgresql" = dontDistribute super."hsql-postgresql"; + "hsql-sqlite3" = dontDistribute super."hsql-sqlite3"; + "hsqml" = dontDistribute super."hsqml"; + "hsqml-datamodel" = dontDistribute super."hsqml-datamodel"; + "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl"; + "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris"; + "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes"; + "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; + "hsqml-morris" = dontDistribute super."hsqml-morris"; + "hsreadability" = dontDistribute super."hsreadability"; + "hsshellscript" = dontDistribute super."hsshellscript"; + "hssourceinfo" = dontDistribute super."hssourceinfo"; + "hssqlppp" = dontDistribute super."hssqlppp"; + "hstats" = dontDistribute super."hstats"; + "hstest" = dontDistribute super."hstest"; + "hstidy" = dontDistribute super."hstidy"; + "hstorchat" = dontDistribute super."hstorchat"; + "hstradeking" = dontDistribute super."hstradeking"; + "hstyle" = dontDistribute super."hstyle"; + "hstzaar" = dontDistribute super."hstzaar"; + "hsubconvert" = dontDistribute super."hsubconvert"; + "hsverilog" = dontDistribute super."hsverilog"; + "hswip" = dontDistribute super."hswip"; + "hsx" = dontDistribute super."hsx"; + "hsx-jmacro" = dontDistribute super."hsx-jmacro"; + "hsx-xhtml" = dontDistribute super."hsx-xhtml"; + "hsx2hs" = dontDistribute super."hsx2hs"; + "hsyscall" = dontDistribute super."hsyscall"; + "hszephyr" = dontDistribute super."hszephyr"; + "htags" = dontDistribute super."htags"; + "htar" = dontDistribute super."htar"; + "htiled" = dontDistribute super."htiled"; + "htime" = dontDistribute super."htime"; + "html-email-validate" = dontDistribute super."html-email-validate"; + "html-entities" = dontDistribute super."html-entities"; + "html-kure" = dontDistribute super."html-kure"; + "html-minimalist" = dontDistribute super."html-minimalist"; + "html-rules" = dontDistribute super."html-rules"; + "html-tokenizer" = dontDistribute super."html-tokenizer"; + "html-truncate" = dontDistribute super."html-truncate"; + "html2hamlet" = dontDistribute super."html2hamlet"; + "html5-entity" = dontDistribute super."html5-entity"; + "htodo" = dontDistribute super."htodo"; + "htoml" = dontDistribute super."htoml"; + "htrace" = dontDistribute super."htrace"; + "hts" = dontDistribute super."hts"; + "htsn" = dontDistribute super."htsn"; + "htsn-common" = dontDistribute super."htsn-common"; + "htsn-import" = dontDistribute super."htsn-import"; + "http-accept" = dontDistribute super."http-accept"; + "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client-auth" = dontDistribute super."http-client-auth"; + "http-client-conduit" = dontDistribute super."http-client-conduit"; + "http-client-lens" = dontDistribute super."http-client-lens"; + "http-client-multipart" = dontDistribute super."http-client-multipart"; + "http-client-openssl" = dontDistribute super."http-client-openssl"; + "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; + "http-client-streams" = dontDistribute super."http-client-streams"; + "http-conduit-browser" = dontDistribute super."http-conduit-browser"; + "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; + "http-encodings" = dontDistribute super."http-encodings"; + "http-enumerator" = dontDistribute super."http-enumerator"; + "http-kit" = dontDistribute super."http-kit"; + "http-link-header" = dontDistribute super."http-link-header"; + "http-listen" = dontDistribute super."http-listen"; + "http-monad" = dontDistribute super."http-monad"; + "http-proxy" = dontDistribute super."http-proxy"; + "http-querystring" = dontDistribute super."http-querystring"; + "http-server" = dontDistribute super."http-server"; + "http-shed" = dontDistribute super."http-shed"; + "http-test" = dontDistribute super."http-test"; + "http-wget" = dontDistribute super."http-wget"; + "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"; + "huffman" = dontDistribute super."huffman"; + "hugs2yc" = dontDistribute super."hugs2yc"; + "hulk" = dontDistribute super."hulk"; + "human-readable-duration" = dontDistribute super."human-readable-duration"; + "hums" = dontDistribute super."hums"; + "hunch" = dontDistribute super."hunch"; + "hunit-gui" = dontDistribute super."hunit-gui"; + "hunit-parsec" = dontDistribute super."hunit-parsec"; + "hunit-rematch" = dontDistribute super."hunit-rematch"; + "hunp" = dontDistribute super."hunp"; + "hunt-searchengine" = dontDistribute super."hunt-searchengine"; + "hunt-server" = dontDistribute super."hunt-server"; + "hunt-server-cli" = dontDistribute super."hunt-server-cli"; + "hurdle" = dontDistribute super."hurdle"; + "husk-scheme" = dontDistribute super."husk-scheme"; + "husk-scheme-libs" = dontDistribute super."husk-scheme-libs"; + "husky" = dontDistribute super."husky"; + "hutton" = dontDistribute super."hutton"; + "huttons-razor" = dontDistribute super."huttons-razor"; + "huzzy" = dontDistribute super."huzzy"; + "hvect" = doDistribute super."hvect_0_2_0_0"; + "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; + "hws" = dontDistribute super."hws"; + "hwsl2" = dontDistribute super."hwsl2"; + "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector"; + "hwsl2-reducers" = dontDistribute super."hwsl2-reducers"; + "hx" = dontDistribute super."hx"; + "hxmppc" = dontDistribute super."hxmppc"; + "hxournal" = dontDistribute super."hxournal"; + "hxt-binary" = dontDistribute super."hxt-binary"; + "hxt-cache" = dontDistribute super."hxt-cache"; + "hxt-extras" = dontDistribute super."hxt-extras"; + "hxt-filter" = dontDistribute super."hxt-filter"; + "hxt-xpath" = dontDistribute super."hxt-xpath"; + "hxt-xslt" = dontDistribute super."hxt-xslt"; + "hxthelper" = dontDistribute super."hxthelper"; + "hxweb" = dontDistribute super."hxweb"; + "hyahtzee" = dontDistribute super."hyahtzee"; + "hyakko" = dontDistribute super."hyakko"; + "hybrid" = dontDistribute super."hybrid"; + "hybrid-vectors" = dontDistribute super."hybrid-vectors"; + "hydra-hs" = dontDistribute super."hydra-hs"; + "hydra-print" = dontDistribute super."hydra-print"; + "hydrogen" = dontDistribute super."hydrogen"; + "hydrogen-cli" = dontDistribute super."hydrogen-cli"; + "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args"; + "hydrogen-data" = dontDistribute super."hydrogen-data"; + "hydrogen-multimap" = dontDistribute super."hydrogen-multimap"; + "hydrogen-parsing" = dontDistribute super."hydrogen-parsing"; + "hydrogen-prelude" = dontDistribute super."hydrogen-prelude"; + "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec"; + "hydrogen-syntax" = dontDistribute super."hydrogen-syntax"; + "hydrogen-util" = dontDistribute super."hydrogen-util"; + "hydrogen-version" = dontDistribute super."hydrogen-version"; + "hyena" = dontDistribute super."hyena"; + "hylolib" = dontDistribute super."hylolib"; + "hylotab" = dontDistribute super."hylotab"; + "hyloutils" = dontDistribute super."hyloutils"; + "hyperdrive" = dontDistribute super."hyperdrive"; + "hyperfunctions" = dontDistribute super."hyperfunctions"; + "hyperpublic" = dontDistribute super."hyperpublic"; + "hyphenate" = dontDistribute super."hyphenate"; + "hypher" = dontDistribute super."hypher"; + "hzk" = dontDistribute super."hzk"; + "hzulip" = dontDistribute super."hzulip"; + "i18n" = dontDistribute super."i18n"; + "iCalendar" = dontDistribute super."iCalendar"; + "iException" = dontDistribute super."iException"; + "iap-verifier" = dontDistribute super."iap-verifier"; + "ib-api" = dontDistribute super."ib-api"; + "iban" = dontDistribute super."iban"; + "iconv" = dontDistribute super."iconv"; + "ideas" = dontDistribute super."ideas"; + "ideas-math" = dontDistribute super."ideas-math"; + "idempotent" = dontDistribute super."idempotent"; + "identifiers" = dontDistribute super."identifiers"; + "idiii" = dontDistribute super."idiii"; + "idna" = dontDistribute super."idna"; + "idna2008" = dontDistribute super."idna2008"; + "idris" = dontDistribute super."idris"; + "ieee" = dontDistribute super."ieee"; + "ieee-utils" = dontDistribute super."ieee-utils"; + "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix"; + "ieee754-parser" = dontDistribute super."ieee754-parser"; + "ifcxt" = dontDistribute super."ifcxt"; + "iff" = dontDistribute super."iff"; + "ifscs" = dontDistribute super."ifscs"; + "ig" = dontDistribute super."ig"; + "ige-mac-integration" = dontDistribute super."ige-mac-integration"; + "igraph" = dontDistribute super."igraph"; + "igrf" = dontDistribute super."igrf"; + "ihaskell" = doDistribute super."ihaskell_0_6_5_0"; + "ihaskell-display" = dontDistribute super."ihaskell-display"; + "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r"; + "ihaskell-parsec" = dontDistribute super."ihaskell-parsec"; + "ihaskell-plot" = dontDistribute super."ihaskell-plot"; + "ihaskell-widgets" = dontDistribute super."ihaskell-widgets"; + "ihttp" = dontDistribute super."ihttp"; + "illuminate" = dontDistribute super."illuminate"; + "image-type" = dontDistribute super."image-type"; + "imagefilters" = dontDistribute super."imagefilters"; + "imagemagick" = dontDistribute super."imagemagick"; + "imagepaste" = dontDistribute super."imagepaste"; + "imapget" = dontDistribute super."imapget"; + "imbib" = dontDistribute super."imbib"; + "imgurder" = dontDistribute super."imgurder"; + "imm" = dontDistribute super."imm"; + "imparse" = dontDistribute super."imparse"; + "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"; + "infer-upstream" = dontDistribute super."infer-upstream"; + "infernu" = dontDistribute super."infernu"; + "infinite-search" = dontDistribute super."infinite-search"; + "infinity" = dontDistribute super."infinity"; + "infix" = dontDistribute super."infix"; + "inflist" = dontDistribute super."inflist"; + "influxdb" = dontDistribute super."influxdb"; + "informative" = dontDistribute super."informative"; + "inilist" = dontDistribute super."inilist"; + "inject" = dontDistribute super."inject"; + "inject-function" = dontDistribute super."inject-function"; + "inline-c" = dontDistribute super."inline-c"; + "inline-c-cpp" = dontDistribute super."inline-c-cpp"; + "inline-c-win32" = dontDistribute super."inline-c-win32"; + "inline-r" = dontDistribute super."inline-r"; + "inquire" = dontDistribute super."inquire"; + "inserts" = dontDistribute super."inserts"; + "inspection-proxy" = dontDistribute super."inspection-proxy"; + "instant-aeson" = dontDistribute super."instant-aeson"; + "instant-bytes" = dontDistribute super."instant-bytes"; + "instant-deepseq" = dontDistribute super."instant-deepseq"; + "instant-generics" = dontDistribute super."instant-generics"; + "instant-hashable" = dontDistribute super."instant-hashable"; + "instant-zipper" = dontDistribute super."instant-zipper"; + "instinct" = dontDistribute super."instinct"; + "instrument-chord" = dontDistribute super."instrument-chord"; + "int-cast" = dontDistribute super."int-cast"; + "integer-pure" = dontDistribute super."integer-pure"; + "intel-aes" = dontDistribute super."intel-aes"; + "interchangeable" = dontDistribute super."interchangeable"; + "interleavableGen" = dontDistribute super."interleavableGen"; + "interleavableIO" = dontDistribute super."interleavableIO"; + "interleave" = dontDistribute super."interleave"; + "interlude" = dontDistribute super."interlude"; + "intern" = dontDistribute super."intern"; + "internetmarke" = dontDistribute super."internetmarke"; + "interpol" = dontDistribute super."interpol"; + "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; + "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; + "interpolation" = dontDistribute super."interpolation"; + "intricacy" = dontDistribute super."intricacy"; + "intset" = dontDistribute super."intset"; + "invertible-syntax" = dontDistribute super."invertible-syntax"; + "io-capture" = dontDistribute super."io-capture"; + "io-reactive" = dontDistribute super."io-reactive"; + "io-region" = dontDistribute super."io-region"; + "io-storage" = dontDistribute super."io-storage"; + "io-streams-http" = dontDistribute super."io-streams-http"; + "io-throttle" = dontDistribute super."io-throttle"; + "ioctl" = dontDistribute super."ioctl"; + "ioref-stable" = dontDistribute super."ioref-stable"; + "iothread" = dontDistribute super."iothread"; + "iotransaction" = dontDistribute super."iotransaction"; + "ip-quoter" = dontDistribute super."ip-quoter"; + "ipatch" = dontDistribute super."ipatch"; + "ipc" = dontDistribute super."ipc"; + "ipcvar" = dontDistribute super."ipcvar"; + "ipopt-hs" = dontDistribute super."ipopt-hs"; + "ipprint" = dontDistribute super."ipprint"; + "iproute" = doDistribute super."iproute_1_5_0"; + "iptables-helpers" = dontDistribute super."iptables-helpers"; + "iptadmin" = dontDistribute super."iptadmin"; + "ipython-kernel" = doDistribute super."ipython-kernel_0_6_1_3"; + "irc" = dontDistribute super."irc"; + "irc-bytestring" = dontDistribute super."irc-bytestring"; + "irc-client" = dontDistribute super."irc-client"; + "irc-colors" = dontDistribute super."irc-colors"; + "irc-conduit" = dontDistribute super."irc-conduit"; + "irc-core" = dontDistribute super."irc-core"; + "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-fun-bot" = dontDistribute super."irc-fun-bot"; + "irc-fun-client" = dontDistribute super."irc-fun-client"; + "irc-fun-color" = dontDistribute super."irc-fun-color"; + "irc-fun-messages" = dontDistribute super."irc-fun-messages"; + "ircbot" = dontDistribute super."ircbot"; + "ircbouncer" = dontDistribute super."ircbouncer"; + "ireal" = dontDistribute super."ireal"; + "iron-mq" = dontDistribute super."iron-mq"; + "ironforge" = dontDistribute super."ironforge"; + "is" = dontDistribute super."is"; + "isdicom" = dontDistribute super."isdicom"; + "isevaluated" = dontDistribute super."isevaluated"; + "isiz" = dontDistribute super."isiz"; + "ismtp" = dontDistribute super."ismtp"; + "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps"; + "iso8601-time" = dontDistribute super."iso8601-time"; + "isohunt" = dontDistribute super."isohunt"; + "itanium-abi" = dontDistribute super."itanium-abi"; + "iter-stats" = dontDistribute super."iter-stats"; + "iterIO" = dontDistribute super."iterIO"; + "iteratee" = dontDistribute super."iteratee"; + "iteratee-compress" = dontDistribute super."iteratee-compress"; + "iteratee-mtl" = dontDistribute super."iteratee-mtl"; + "iteratee-parsec" = dontDistribute super."iteratee-parsec"; + "iteratee-stm" = dontDistribute super."iteratee-stm"; + "iterio-server" = dontDistribute super."iterio-server"; + "ivar-simple" = dontDistribute super."ivar-simple"; + "ivor" = dontDistribute super."ivor"; + "ivory" = dontDistribute super."ivory"; + "ivory-backend-c" = dontDistribute super."ivory-backend-c"; + "ivory-bitdata" = dontDistribute super."ivory-bitdata"; + "ivory-examples" = dontDistribute super."ivory-examples"; + "ivory-hw" = dontDistribute super."ivory-hw"; + "ivory-opts" = dontDistribute super."ivory-opts"; + "ivory-quickcheck" = dontDistribute super."ivory-quickcheck"; + "ivory-stdlib" = dontDistribute super."ivory-stdlib"; + "ivy-web" = dontDistribute super."ivy-web"; + "ix-shapable" = dontDistribute super."ix-shapable"; + "ixdopp" = dontDistribute super."ixdopp"; + "ixmonad" = dontDistribute super."ixmonad"; + "ixset" = dontDistribute super."ixset"; + "ixset-typed" = dontDistribute super."ixset-typed"; + "iyql" = dontDistribute super."iyql"; + "j2hs" = dontDistribute super."j2hs"; + "ja-base-extra" = dontDistribute super."ja-base-extra"; + "jack" = dontDistribute super."jack"; + "jack-bindings" = dontDistribute super."jack-bindings"; + "jackminimix" = dontDistribute super."jackminimix"; + "jacobi-roots" = dontDistribute super."jacobi-roots"; + "jail" = dontDistribute super."jail"; + "jailbreak-cabal" = dontDistribute super."jailbreak-cabal"; + "jalaali" = dontDistribute super."jalaali"; + "jalla" = dontDistribute super."jalla"; + "jammittools" = dontDistribute super."jammittools"; + "jarfind" = dontDistribute super."jarfind"; + "java-bridge" = dontDistribute super."java-bridge"; + "java-bridge-extras" = dontDistribute super."java-bridge-extras"; + "java-character" = dontDistribute super."java-character"; + "java-reflect" = dontDistribute super."java-reflect"; + "javasf" = dontDistribute super."javasf"; + "javav" = dontDistribute super."javav"; + "jcdecaux-vls" = dontDistribute super."jcdecaux-vls"; + "jdi" = dontDistribute super."jdi"; + "jespresso" = dontDistribute super."jespresso"; + "jobqueue" = dontDistribute super."jobqueue"; + "join" = dontDistribute super."join"; + "joinlist" = dontDistribute super."joinlist"; + "jonathanscard" = dontDistribute super."jonathanscard"; + "jort" = dontDistribute super."jort"; + "jose" = dontDistribute super."jose"; + "jpeg" = dontDistribute super."jpeg"; + "js-good-parts" = dontDistribute super."js-good-parts"; + "jsaddle" = dontDistribute super."jsaddle"; + "jsaddle-hello" = dontDistribute super."jsaddle-hello"; + "jsc" = dontDistribute super."jsc"; + "jsmw" = dontDistribute super."jsmw"; + "json-assertions" = dontDistribute super."json-assertions"; + "json-autotype" = doDistribute super."json-autotype_1_0_7"; + "json-b" = dontDistribute super."json-b"; + "json-enumerator" = dontDistribute super."json-enumerator"; + "json-extra" = dontDistribute super."json-extra"; + "json-fu" = dontDistribute super."json-fu"; + "json-litobj" = dontDistribute super."json-litobj"; + "json-python" = dontDistribute super."json-python"; + "json-qq" = dontDistribute super."json-qq"; + "json-rpc" = dontDistribute super."json-rpc"; + "json-rpc-client" = dontDistribute super."json-rpc-client"; + "json-rpc-server" = dontDistribute super."json-rpc-server"; + "json-sop" = dontDistribute super."json-sop"; + "json-state" = dontDistribute super."json-state"; + "json-stream" = dontDistribute super."json-stream"; + "json-togo" = dontDistribute super."json-togo"; + "json-tools" = dontDistribute super."json-tools"; + "json-types" = dontDistribute super."json-types"; + "json2" = dontDistribute super."json2"; + "json2-hdbc" = dontDistribute super."json2-hdbc"; + "json2-types" = dontDistribute super."json2-types"; + "json2yaml" = dontDistribute super."json2yaml"; + "jsonresume" = dontDistribute super."jsonresume"; + "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit"; + "jsonschema-gen" = dontDistribute super."jsonschema-gen"; + "jsonsql" = dontDistribute super."jsonsql"; + "jsontsv" = dontDistribute super."jsontsv"; + "jspath" = dontDistribute super."jspath"; + "judy" = dontDistribute super."judy"; + "jukebox" = dontDistribute super."jukebox"; + "jumpthefive" = dontDistribute super."jumpthefive"; + "jvm-parser" = dontDistribute super."jvm-parser"; + "kademlia" = dontDistribute super."kademlia"; + "kafka-client" = dontDistribute super."kafka-client"; + "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = dontDistribute super."kansas-comet"; + "kansas-lava" = dontDistribute super."kansas-lava"; + "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; + "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; + "kansas-lava-shake" = dontDistribute super."kansas-lava-shake"; + "karakuri" = dontDistribute super."karakuri"; + "karver" = dontDistribute super."karver"; + "katt" = dontDistribute super."katt"; + "kbq-gu" = dontDistribute super."kbq-gu"; + "kd-tree" = dontDistribute super."kd-tree"; + "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra"; + "keera-callbacks" = dontDistribute super."keera-callbacks"; + "keera-hails-i18n" = dontDistribute super."keera-hails-i18n"; + "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller"; + "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk"; + "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel"; + "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel"; + "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config"; + "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk"; + "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view"; + "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk"; + "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs"; + "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk"; + "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network"; + "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; + "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; + "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; + "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; + "keera-posture" = dontDistribute super."keera-posture"; + "keiretsu" = dontDistribute super."keiretsu"; + "kevin" = dontDistribute super."kevin"; + "keyed" = dontDistribute super."keyed"; + "keyring" = dontDistribute super."keyring"; + "keystore" = dontDistribute super."keystore"; + "keyvaluehash" = dontDistribute super."keyvaluehash"; + "keyword-args" = dontDistribute super."keyword-args"; + "kibro" = dontDistribute super."kibro"; + "kicad-data" = dontDistribute super."kicad-data"; + "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser"; + "kickchan" = dontDistribute super."kickchan"; + "kif-parser" = dontDistribute super."kif-parser"; + "kinds" = dontDistribute super."kinds"; + "kit" = dontDistribute super."kit"; + "kmeans-par" = dontDistribute super."kmeans-par"; + "kmeans-vector" = dontDistribute super."kmeans-vector"; + "knots" = dontDistribute super."knots"; + "koellner-phonetic" = dontDistribute super."koellner-phonetic"; + "kontrakcja-templates" = dontDistribute super."kontrakcja-templates"; + "korfu" = dontDistribute super."korfu"; + "kqueue" = dontDistribute super."kqueue"; + "kraken" = dontDistribute super."kraken"; + "krpc" = dontDistribute super."krpc"; + "ks-test" = dontDistribute super."ks-test"; + "ktx" = dontDistribute super."ktx"; + "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate"; + "kyotocabinet" = dontDistribute super."kyotocabinet"; + "l-bfgs-b" = dontDistribute super."l-bfgs-b"; + "labeled-graph" = dontDistribute super."labeled-graph"; + "labeled-tree" = dontDistribute super."labeled-tree"; + "laborantin-hs" = dontDistribute super."laborantin-hs"; + "labyrinth" = dontDistribute super."labyrinth"; + "labyrinth-server" = dontDistribute super."labyrinth-server"; + "lackey" = dontDistribute super."lackey"; + "lagrangian" = dontDistribute super."lagrangian"; + "laika" = dontDistribute super."laika"; + "lambda-ast" = dontDistribute super."lambda-ast"; + "lambda-bridge" = dontDistribute super."lambda-bridge"; + "lambda-canvas" = dontDistribute super."lambda-canvas"; + "lambda-devs" = dontDistribute super."lambda-devs"; + "lambda-options" = dontDistribute super."lambda-options"; + "lambda-placeholders" = dontDistribute super."lambda-placeholders"; + "lambda-toolbox" = dontDistribute super."lambda-toolbox"; + "lambda2js" = dontDistribute super."lambda2js"; + "lambdaBase" = dontDistribute super."lambdaBase"; + "lambdaFeed" = dontDistribute super."lambdaFeed"; + "lambdaLit" = dontDistribute super."lambdaLit"; + "lambdabot-utils" = dontDistribute super."lambdabot-utils"; + "lambdacat" = dontDistribute super."lambdacat"; + "lambdacms-core" = dontDistribute super."lambdacms-core"; + "lambdacms-media" = dontDistribute super."lambdacms-media"; + "lambdacube" = dontDistribute super."lambdacube"; + "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; + "lambdacube-core" = dontDistribute super."lambdacube-core"; + "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; + "lambdacube-engine" = dontDistribute super."lambdacube-engine"; + "lambdacube-examples" = dontDistribute super."lambdacube-examples"; + "lambdacube-gl" = dontDistribute super."lambdacube-gl"; + "lambdacube-samples" = dontDistribute super."lambdacube-samples"; + "lambdatwit" = dontDistribute super."lambdatwit"; + "lambdiff" = dontDistribute super."lambdiff"; + "lame-tester" = dontDistribute super."lame-tester"; + "language-asn1" = dontDistribute super."language-asn1"; + "language-bash" = dontDistribute super."language-bash"; + "language-boogie" = dontDistribute super."language-boogie"; + "language-c-comments" = dontDistribute super."language-c-comments"; + "language-c-inline" = dontDistribute super."language-c-inline"; + "language-cil" = dontDistribute super."language-cil"; + "language-css" = dontDistribute super."language-css"; + "language-dot" = dontDistribute super."language-dot"; + "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis"; + "language-eiffel" = dontDistribute super."language-eiffel"; + "language-fortran" = dontDistribute super."language-fortran"; + "language-gcl" = dontDistribute super."language-gcl"; + "language-go" = dontDistribute super."language-go"; + "language-guess" = dontDistribute super."language-guess"; + "language-java-classfile" = dontDistribute super."language-java-classfile"; + "language-kort" = dontDistribute super."language-kort"; + "language-lua" = dontDistribute super."language-lua"; + "language-lua-qq" = dontDistribute super."language-lua-qq"; + "language-lua2" = dontDistribute super."language-lua2"; + "language-mixal" = dontDistribute super."language-mixal"; + "language-nix" = dontDistribute super."language-nix"; + "language-objc" = dontDistribute super."language-objc"; + "language-openscad" = dontDistribute super."language-openscad"; + "language-pig" = dontDistribute super."language-pig"; + "language-puppet" = dontDistribute super."language-puppet"; + "language-python" = dontDistribute super."language-python"; + "language-python-colour" = dontDistribute super."language-python-colour"; + "language-python-test" = dontDistribute super."language-python-test"; + "language-qux" = dontDistribute super."language-qux"; + "language-sh" = dontDistribute super."language-sh"; + "language-slice" = dontDistribute super."language-slice"; + "language-spelling" = dontDistribute super."language-spelling"; + "language-sqlite" = dontDistribute super."language-sqlite"; + "language-thrift" = dontDistribute super."language-thrift"; + "language-typescript" = dontDistribute super."language-typescript"; + "language-vhdl" = dontDistribute super."language-vhdl"; + "lat" = dontDistribute super."lat"; + "latest-npm-version" = dontDistribute super."latest-npm-version"; + "latex" = dontDistribute super."latex"; + "lattices" = doDistribute super."lattices_1_3"; + "launchpad-control" = dontDistribute super."launchpad-control"; + "lax" = dontDistribute super."lax"; + "layers" = dontDistribute super."layers"; + "layers-game" = dontDistribute super."layers-game"; + "layout" = dontDistribute super."layout"; + "layout-bootstrap" = dontDistribute super."layout-bootstrap"; + "lazy-io" = dontDistribute super."lazy-io"; + "lazyarray" = dontDistribute super."lazyarray"; + "lazyio" = dontDistribute super."lazyio"; + "lazysplines" = dontDistribute super."lazysplines"; + "lbfgs" = dontDistribute super."lbfgs"; + "lcs" = dontDistribute super."lcs"; + "lda" = dontDistribute super."lda"; + "ldap-client" = dontDistribute super."ldap-client"; + "ldif" = dontDistribute super."ldif"; + "leaf" = dontDistribute super."leaf"; + "leaky" = dontDistribute super."leaky"; + "leankit-api" = dontDistribute super."leankit-api"; + "leapseconds-announced" = dontDistribute super."leapseconds-announced"; + "learn" = dontDistribute super."learn"; + "learn-physics" = dontDistribute super."learn-physics"; + "learn-physics-examples" = dontDistribute super."learn-physics-examples"; + "learning-hmm" = dontDistribute super."learning-hmm"; + "leetify" = dontDistribute super."leetify"; + "leksah" = dontDistribute super."leksah"; + "leksah-server" = dontDistribute super."leksah-server"; + "lendingclub" = dontDistribute super."lendingclub"; + "lens-datetime" = dontDistribute super."lens-datetime"; + "lens-properties" = dontDistribute super."lens-properties"; + "lens-regex" = dontDistribute super."lens-regex"; + "lens-sop" = dontDistribute super."lens-sop"; + "lens-text-encoding" = dontDistribute super."lens-text-encoding"; + "lens-time" = dontDistribute super."lens-time"; + "lens-tutorial" = dontDistribute super."lens-tutorial"; + "lenses" = dontDistribute super."lenses"; + "lensref" = dontDistribute super."lensref"; + "lentil" = dontDistribute super."lentil"; + "level-monad" = dontDistribute super."level-monad"; + "leveldb-haskell" = dontDistribute super."leveldb-haskell"; + "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork"; + "levmar" = dontDistribute super."levmar"; + "levmar-chart" = dontDistribute super."levmar-chart"; + "lgtk" = dontDistribute super."lgtk"; + "lha" = dontDistribute super."lha"; + "lhae" = dontDistribute super."lhae"; + "lhc" = dontDistribute super."lhc"; + "lhe" = dontDistribute super."lhe"; + "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl"; + "lhs2html" = dontDistribute super."lhs2html"; + "lhslatex" = dontDistribute super."lhslatex"; + "libGenI" = dontDistribute super."libGenI"; + "libarchive-conduit" = dontDistribute super."libarchive-conduit"; + "libconfig" = dontDistribute super."libconfig"; + "libcspm" = dontDistribute super."libcspm"; + "libexpect" = dontDistribute super."libexpect"; + "libffi" = dontDistribute super."libffi"; + "libgraph" = dontDistribute super."libgraph"; + "libhbb" = dontDistribute super."libhbb"; + "libjenkins" = dontDistribute super."libjenkins"; + "liblastfm" = dontDistribute super."liblastfm"; + "liblinear-enumerator" = dontDistribute super."liblinear-enumerator"; + "libltdl" = dontDistribute super."libltdl"; + "libmpd" = dontDistribute super."libmpd"; + "libnvvm" = dontDistribute super."libnvvm"; + "liboleg" = dontDistribute super."liboleg"; + "libpafe" = dontDistribute super."libpafe"; + "libpq" = dontDistribute super."libpq"; + "librandomorg" = dontDistribute super."librandomorg"; + "libravatar" = dontDistribute super."libravatar"; + "libssh2" = dontDistribute super."libssh2"; + "libssh2-conduit" = dontDistribute super."libssh2-conduit"; + "libstackexchange" = dontDistribute super."libstackexchange"; + "libsystemd-daemon" = dontDistribute super."libsystemd-daemon"; + "libsystemd-journal" = dontDistribute super."libsystemd-journal"; + "libtagc" = dontDistribute super."libtagc"; + "libvirt-hs" = dontDistribute super."libvirt-hs"; + "libvorbis" = dontDistribute super."libvorbis"; + "libxml" = dontDistribute super."libxml"; + "libxml-enumerator" = dontDistribute super."libxml-enumerator"; + "libxslt" = dontDistribute super."libxslt"; + "life" = dontDistribute super."life"; + "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-algebra-cblas" = dontDistribute super."linear-algebra-cblas"; + "linear-circuit" = dontDistribute super."linear-circuit"; + "linear-grammar" = dontDistribute super."linear-grammar"; + "linear-maps" = dontDistribute super."linear-maps"; + "linear-opengl" = dontDistribute super."linear-opengl"; + "linear-vect" = dontDistribute super."linear-vect"; + "linearEqSolver" = dontDistribute super."linearEqSolver"; + "linearscan" = dontDistribute super."linearscan"; + "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; + "linebreak" = dontDistribute super."linebreak"; + "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; + "linkchk" = dontDistribute super."linkchk"; + "linkcore" = dontDistribute super."linkcore"; + "linkedhashmap" = dontDistribute super."linkedhashmap"; + "linklater" = dontDistribute super."linklater"; + "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"; + "listlike-instances" = dontDistribute super."listlike-instances"; + "lists" = dontDistribute super."lists"; + "listsafe" = dontDistribute super."listsafe"; + "lit" = dontDistribute super."lit"; + "literals" = dontDistribute super."literals"; + "live-sequencer" = dontDistribute super."live-sequencer"; + "ll-picosat" = dontDistribute super."ll-picosat"; + "llrbtree" = dontDistribute super."llrbtree"; + "llsd" = dontDistribute super."llsd"; + "llvm" = dontDistribute super."llvm"; + "llvm-analysis" = dontDistribute super."llvm-analysis"; + "llvm-base" = dontDistribute super."llvm-base"; + "llvm-base-types" = dontDistribute super."llvm-base-types"; + "llvm-base-util" = dontDistribute super."llvm-base-util"; + "llvm-data-interop" = dontDistribute super."llvm-data-interop"; + "llvm-extra" = dontDistribute super."llvm-extra"; + "llvm-ffi" = dontDistribute super."llvm-ffi"; + "llvm-general" = dontDistribute super."llvm-general"; + "llvm-general-pure" = dontDistribute super."llvm-general-pure"; + "llvm-general-quote" = dontDistribute super."llvm-general-quote"; + "llvm-ht" = dontDistribute super."llvm-ht"; + "llvm-pkg-config" = dontDistribute super."llvm-pkg-config"; + "llvm-pretty" = dontDistribute super."llvm-pretty"; + "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser"; + "llvm-tf" = dontDistribute super."llvm-tf"; + "llvm-tools" = dontDistribute super."llvm-tools"; + "lmdb" = dontDistribute super."lmdb"; + "load-env" = dontDistribute super."load-env"; + "loadavg" = dontDistribute super."loadavg"; + "local-address" = dontDistribute super."local-address"; + "local-search" = dontDistribute super."local-search"; + "located-base" = dontDistribute super."located-base"; + "locators" = dontDistribute super."locators"; + "loch" = dontDistribute super."loch"; + "lock-file" = dontDistribute super."lock-file"; + "lockfree-queue" = dontDistribute super."lockfree-queue"; + "log" = dontDistribute super."log"; + "log-effect" = dontDistribute super."log-effect"; + "log2json" = dontDistribute super."log2json"; + "logfloat" = dontDistribute super."logfloat"; + "logger" = dontDistribute super."logger"; + "logging" = dontDistribute super."logging"; + "logging-facade-journald" = dontDistribute super."logging-facade-journald"; + "logic-TPTP" = dontDistribute super."logic-TPTP"; + "logic-classes" = dontDistribute super."logic-classes"; + "logicst" = dontDistribute super."logicst"; + "logsink" = dontDistribute super."logsink"; + "lojban" = dontDistribute super."lojban"; + "lojbanParser" = dontDistribute super."lojbanParser"; + "lojbanXiragan" = dontDistribute super."lojbanXiragan"; + "lojysamban" = dontDistribute super."lojysamban"; + "loli" = dontDistribute super."loli"; + "lookup-tables" = dontDistribute super."lookup-tables"; + "loop" = doDistribute super."loop_0_2_0"; + "loop-effin" = dontDistribute super."loop-effin"; + "loop-while" = dontDistribute super."loop-while"; + "loops" = dontDistribute super."loops"; + "loopy" = dontDistribute super."loopy"; + "lord" = dontDistribute super."lord"; + "lorem" = dontDistribute super."lorem"; + "loris" = dontDistribute super."loris"; + "loshadka" = dontDistribute super."loshadka"; + "lostcities" = dontDistribute super."lostcities"; + "lowgl" = dontDistribute super."lowgl"; + "ls-usb" = dontDistribute super."ls-usb"; + "lscabal" = dontDistribute super."lscabal"; + "lss" = dontDistribute super."lss"; + "lsystem" = dontDistribute super."lsystem"; + "ltk" = dontDistribute super."ltk"; + "ltl" = dontDistribute super."ltl"; + "lua-bytecode" = dontDistribute super."lua-bytecode"; + "luachunk" = dontDistribute super."luachunk"; + "luautils" = dontDistribute super."luautils"; + "lub" = dontDistribute super."lub"; + "lucid-foundation" = dontDistribute super."lucid-foundation"; + "lucienne" = dontDistribute super."lucienne"; + "luhn" = dontDistribute super."luhn"; + "lui" = dontDistribute super."lui"; + "luka" = dontDistribute super."luka"; + "luminance" = dontDistribute super."luminance"; + "luminance-samples" = dontDistribute super."luminance-samples"; + "lushtags" = dontDistribute super."lushtags"; + "luthor" = dontDistribute super."luthor"; + "lvish" = dontDistribute super."lvish"; + "lvmlib" = dontDistribute super."lvmlib"; + "lvmrun" = dontDistribute super."lvmrun"; + "lxc" = dontDistribute super."lxc"; + "lye" = dontDistribute super."lye"; + "lz4" = dontDistribute super."lz4"; + "lzma" = dontDistribute super."lzma"; + "lzma-clib" = dontDistribute super."lzma-clib"; + "lzma-enumerator" = dontDistribute super."lzma-enumerator"; + "lzma-streams" = dontDistribute super."lzma-streams"; + "maam" = dontDistribute super."maam"; + "mac" = dontDistribute super."mac"; + "maccatcher" = dontDistribute super."maccatcher"; + "machinecell" = dontDistribute super."machinecell"; + "machines-zlib" = dontDistribute super."machines-zlib"; + "macho" = dontDistribute super."macho"; + "maclight" = dontDistribute super."maclight"; + "macosx-make-standalone" = dontDistribute super."macosx-make-standalone"; + "mage" = dontDistribute super."mage"; + "magico" = dontDistribute super."magico"; + "magma" = dontDistribute super."magma"; + "mahoro" = dontDistribute super."mahoro"; + "maid" = dontDistribute super."maid"; + "mailbox-count" = dontDistribute super."mailbox-count"; + "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe"; + "mailgun" = dontDistribute super."mailgun"; + "majordomo" = dontDistribute super."majordomo"; + "majority" = dontDistribute super."majority"; + "make-hard-links" = dontDistribute super."make-hard-links"; + "make-package" = dontDistribute super."make-package"; + "makedo" = dontDistribute super."makedo"; + "manatee" = dontDistribute super."manatee"; + "manatee-all" = dontDistribute super."manatee-all"; + "manatee-anything" = dontDistribute super."manatee-anything"; + "manatee-browser" = dontDistribute super."manatee-browser"; + "manatee-core" = dontDistribute super."manatee-core"; + "manatee-curl" = dontDistribute super."manatee-curl"; + "manatee-editor" = dontDistribute super."manatee-editor"; + "manatee-filemanager" = dontDistribute super."manatee-filemanager"; + "manatee-imageviewer" = dontDistribute super."manatee-imageviewer"; + "manatee-ircclient" = dontDistribute super."manatee-ircclient"; + "manatee-mplayer" = dontDistribute super."manatee-mplayer"; + "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer"; + "manatee-processmanager" = dontDistribute super."manatee-processmanager"; + "manatee-reader" = dontDistribute super."manatee-reader"; + "manatee-template" = dontDistribute super."manatee-template"; + "manatee-terminal" = dontDistribute super."manatee-terminal"; + "manatee-welcome" = dontDistribute super."manatee-welcome"; + "mancala" = dontDistribute super."mancala"; + "mandrill" = doDistribute super."mandrill_0_3_0_0"; + "mandulia" = dontDistribute super."mandulia"; + "mangopay" = doDistribute super."mangopay_1_11_4"; + "manifolds" = dontDistribute super."manifolds"; + "marionetta" = dontDistribute super."marionetta"; + "markdown-kate" = dontDistribute super."markdown-kate"; + "markdown-pap" = dontDistribute super."markdown-pap"; + "markdown-unlit" = dontDistribute super."markdown-unlit"; + "markdown2svg" = dontDistribute super."markdown2svg"; + "marked-pretty" = dontDistribute super."marked-pretty"; + "markov" = dontDistribute super."markov"; + "markov-chain" = dontDistribute super."markov-chain"; + "markov-processes" = dontDistribute super."markov-processes"; + "markup-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"; + "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"; + "mdcat" = dontDistribute super."mdcat"; + "mdo" = dontDistribute super."mdo"; + "mecab" = dontDistribute super."mecab"; + "mecha" = dontDistribute super."mecha"; + "mediawiki" = dontDistribute super."mediawiki"; + "mediawiki2latex" = dontDistribute super."mediawiki2latex"; + "meep" = dontDistribute super."meep"; + "mega-sdist" = dontDistribute super."mega-sdist"; + "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_7"; + "memscript" = dontDistribute super."memscript"; + "mersenne-random" = dontDistribute super."mersenne-random"; + "messente" = dontDistribute super."messente"; + "meta-misc" = dontDistribute super."meta-misc"; + "meta-par" = dontDistribute super."meta-par"; + "meta-par-accelerate" = dontDistribute super."meta-par-accelerate"; + "metadata" = dontDistribute super."metadata"; + "metamorphic" = dontDistribute super."metamorphic"; + "metaplug" = dontDistribute super."metaplug"; + "metric" = dontDistribute super."metric"; + "metricsd-client" = dontDistribute super."metricsd-client"; + "metronome" = dontDistribute super."metronome"; + "mfsolve" = dontDistribute super."mfsolve"; + "mgeneric" = dontDistribute super."mgeneric"; + "mi" = dontDistribute super."mi"; + "microbench" = dontDistribute super."microbench"; + "microformats2-parser" = dontDistribute super."microformats2-parser"; + "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_2_0_0"; + "microlens-each" = dontDistribute super."microlens-each"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0"; + "microlens-platform" = dontDistribute super."microlens-platform"; + "microlens-th" = doDistribute super."microlens-th_0_2_1_1"; + "microtimer" = dontDistribute super."microtimer"; + "mida" = dontDistribute super."mida"; + "midi" = dontDistribute super."midi"; + "midi-alsa" = dontDistribute super."midi-alsa"; + "midi-music-box" = dontDistribute super."midi-music-box"; + "midi-util" = dontDistribute super."midi-util"; + "midimory" = dontDistribute super."midimory"; + "midisurface" = dontDistribute super."midisurface"; + "mighttpd" = dontDistribute super."mighttpd"; + "mighttpd2" = dontDistribute super."mighttpd2"; + "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"; + "minimal-configuration" = dontDistribute super."minimal-configuration"; + "minimorph" = dontDistribute super."minimorph"; + "minimung" = dontDistribute super."minimung"; + "minions" = dontDistribute super."minions"; + "minioperational" = dontDistribute super."minioperational"; + "miniplex" = dontDistribute super."miniplex"; + "minirotate" = dontDistribute super."minirotate"; + "minisat" = dontDistribute super."minisat"; + "ministg" = dontDistribute super."ministg"; + "miniutter" = dontDistribute super."miniutter"; + "minst-idx" = dontDistribute super."minst-idx"; + "mirror-tweet" = dontDistribute super."mirror-tweet"; + "missing-py2" = dontDistribute super."missing-py2"; + "mix-arrows" = dontDistribute super."mix-arrows"; + "mixed-strategies" = dontDistribute super."mixed-strategies"; + "mkbndl" = dontDistribute super."mkbndl"; + "mkcabal" = dontDistribute super."mkcabal"; + "ml-w" = dontDistribute super."ml-w"; + "mlist" = dontDistribute super."mlist"; + "mmtl" = dontDistribute super."mmtl"; + "mmtl-base" = dontDistribute super."mmtl-base"; + "moan" = dontDistribute super."moan"; + "modbus-tcp" = dontDistribute super."modbus-tcp"; + "modelicaparser" = dontDistribute super."modelicaparser"; + "modsplit" = dontDistribute super."modsplit"; + "modular-arithmetic" = dontDistribute super."modular-arithmetic"; + "modular-prelude" = dontDistribute super."modular-prelude"; + "modular-prelude-classy" = dontDistribute super."modular-prelude-classy"; + "module-management" = dontDistribute super."module-management"; + "modulespection" = dontDistribute super."modulespection"; + "modulo" = dontDistribute super."modulo"; + "moe" = dontDistribute super."moe"; + "moesocks" = dontDistribute super."moesocks"; + "mohws" = dontDistribute super."mohws"; + "mole" = dontDistribute super."mole"; + "monad-abort-fd" = dontDistribute super."monad-abort-fd"; + "monad-atom" = dontDistribute super."monad-atom"; + "monad-atom-simple" = dontDistribute super."monad-atom-simple"; + "monad-bool" = dontDistribute super."monad-bool"; + "monad-classes" = dontDistribute super."monad-classes"; + "monad-codec" = dontDistribute super."monad-codec"; + "monad-exception" = dontDistribute super."monad-exception"; + "monad-fork" = dontDistribute super."monad-fork"; + "monad-gen" = dontDistribute super."monad-gen"; + "monad-interleave" = dontDistribute super."monad-interleave"; + "monad-levels" = dontDistribute super."monad-levels"; + "monad-loops-stm" = dontDistribute super."monad-loops-stm"; + "monad-lrs" = dontDistribute super."monad-lrs"; + "monad-memo" = dontDistribute super."monad-memo"; + "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; + "monad-open" = dontDistribute super."monad-open"; + "monad-ox" = dontDistribute super."monad-ox"; + "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; + "monad-param" = dontDistribute super."monad-param"; + "monad-ran" = dontDistribute super."monad-ran"; + "monad-resumption" = dontDistribute super."monad-resumption"; + "monad-state" = dontDistribute super."monad-state"; + "monad-statevar" = dontDistribute super."monad-statevar"; + "monad-stlike-io" = dontDistribute super."monad-stlike-io"; + "monad-stlike-stm" = dontDistribute super."monad-stlike-stm"; + "monad-supply" = dontDistribute super."monad-supply"; + "monad-task" = dontDistribute super."monad-task"; + "monad-time" = dontDistribute super."monad-time"; + "monad-tx" = dontDistribute super."monad-tx"; + "monad-unify" = dontDistribute super."monad-unify"; + "monad-wrap" = dontDistribute super."monad-wrap"; + "monadIO" = dontDistribute super."monadIO"; + "monadLib-compose" = dontDistribute super."monadLib-compose"; + "monadacme" = dontDistribute super."monadacme"; + "monadbi" = dontDistribute super."monadbi"; + "monadfibre" = dontDistribute super."monadfibre"; + "monadiccp" = dontDistribute super."monadiccp"; + "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; + "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; + "monadlist" = dontDistribute super."monadlist"; + "monadloc" = dontDistribute super."monadloc"; + "monadloc-pp" = dontDistribute super."monadloc-pp"; + "monadplus" = dontDistribute super."monadplus"; + "monads-fd" = dontDistribute super."monads-fd"; + "monadtransform" = dontDistribute super."monadtransform"; + "monarch" = dontDistribute super."monarch"; + "mongodb-queue" = dontDistribute super."mongodb-queue"; + "mongrel2-handler" = dontDistribute super."mongrel2-handler"; + "monitor" = dontDistribute super."monitor"; + "mono-foldable" = dontDistribute super."mono-foldable"; + "monoid-owns" = dontDistribute super."monoid-owns"; + "monoid-record" = dontDistribute super."monoid-record"; + "monoid-statistics" = dontDistribute super."monoid-statistics"; + "monoid-transformer" = dontDistribute super."monoid-transformer"; + "monoidplus" = dontDistribute super."monoidplus"; + "monoids" = dontDistribute super."monoids"; + "monomorphic" = dontDistribute super."monomorphic"; + "montage" = dontDistribute super."montage"; + "montage-client" = dontDistribute super."montage-client"; + "monte-carlo" = dontDistribute super."monte-carlo"; + "moo" = dontDistribute super."moo"; + "moonshine" = dontDistribute super."moonshine"; + "morfette" = dontDistribute super."morfette"; + "morfeusz" = dontDistribute super."morfeusz"; + "morte" = dontDistribute super."morte"; + "mosaico-lib" = dontDistribute super."mosaico-lib"; + "mount" = dontDistribute super."mount"; + "mp" = dontDistribute super."mp"; + "mp3decoder" = dontDistribute super."mp3decoder"; + "mpdmate" = dontDistribute super."mpdmate"; + "mpppc" = dontDistribute super."mpppc"; + "mpretty" = dontDistribute super."mpretty"; + "mprover" = dontDistribute super."mprover"; + "mps" = dontDistribute super."mps"; + "mpvguihs" = dontDistribute super."mpvguihs"; + "mqtt-hs" = dontDistribute super."mqtt-hs"; + "ms" = dontDistribute super."ms"; + "msgpack" = dontDistribute super."msgpack"; + "msgpack-aeson" = dontDistribute super."msgpack-aeson"; + "msgpack-idl" = dontDistribute super."msgpack-idl"; + "msgpack-rpc" = dontDistribute super."msgpack-rpc"; + "msu" = dontDistribute super."msu"; + "mtgoxapi" = dontDistribute super."mtgoxapi"; + "mtl-c" = dontDistribute super."mtl-c"; + "mtl-evil-instances" = dontDistribute super."mtl-evil-instances"; + "mtl-tf" = dontDistribute super."mtl-tf"; + "mtl-unleashed" = dontDistribute super."mtl-unleashed"; + "mtlparse" = dontDistribute super."mtlparse"; + "mtlx" = dontDistribute super."mtlx"; + "mtp" = dontDistribute super."mtp"; + "mtree" = dontDistribute super."mtree"; + "mucipher" = dontDistribute super."mucipher"; + "mudbath" = dontDistribute super."mudbath"; + "muesli" = dontDistribute super."muesli"; + "multext-east-msd" = dontDistribute super."multext-east-msd"; + "multi-cabal" = dontDistribute super."multi-cabal"; + "multifocal" = dontDistribute super."multifocal"; + "multihash" = dontDistribute super."multihash"; + "multipart-names" = dontDistribute super."multipart-names"; + "multipass" = dontDistribute super."multipass"; + "multiplate" = dontDistribute super."multiplate"; + "multiplate-simplified" = dontDistribute super."multiplate-simplified"; + "multiplicity" = dontDistribute super."multiplicity"; + "multirec" = dontDistribute super."multirec"; + "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; + "multirec-binary" = dontDistribute super."multirec-binary"; + "multiset-comb" = dontDistribute super."multiset-comb"; + "multisetrewrite" = dontDistribute super."multisetrewrite"; + "multistate" = dontDistribute super."multistate"; + "muon" = dontDistribute super."muon"; + "murder" = dontDistribute super."murder"; + "murmur3" = dontDistribute super."murmur3"; + "murmurhash3" = dontDistribute super."murmurhash3"; + "music-articulation" = dontDistribute super."music-articulation"; + "music-diatonic" = dontDistribute super."music-diatonic"; + "music-dynamics" = dontDistribute super."music-dynamics"; + "music-dynamics-literal" = dontDistribute super."music-dynamics-literal"; + "music-graphics" = dontDistribute super."music-graphics"; + "music-parts" = dontDistribute super."music-parts"; + "music-pitch" = dontDistribute super."music-pitch"; + "music-pitch-literal" = dontDistribute super."music-pitch-literal"; + "music-preludes" = dontDistribute super."music-preludes"; + "music-score" = dontDistribute super."music-score"; + "music-sibelius" = dontDistribute super."music-sibelius"; + "music-suite" = dontDistribute super."music-suite"; + "music-util" = dontDistribute super."music-util"; + "musicbrainz-email" = dontDistribute super."musicbrainz-email"; + "musicxml" = dontDistribute super."musicxml"; + "musicxml2" = dontDistribute super."musicxml2"; + "mustache" = dontDistribute super."mustache"; + "mustache-haskell" = dontDistribute super."mustache-haskell"; + "mustache2hs" = dontDistribute super."mustache2hs"; + "mutable-iter" = dontDistribute super."mutable-iter"; + "mute-unmute" = dontDistribute super."mute-unmute"; + "mvc" = dontDistribute super."mvc"; + "mvc-updates" = dontDistribute super."mvc-updates"; + "mvclient" = dontDistribute super."mvclient"; + "mwc-random-monad" = dontDistribute super."mwc-random-monad"; + "myTestlll" = dontDistribute super."myTestlll"; + "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; + "myo" = dontDistribute super."myo"; + "mysnapsession" = dontDistribute super."mysnapsession"; + "mysnapsession-example" = dontDistribute super."mysnapsession-example"; + "mysql-effect" = dontDistribute super."mysql-effect"; + "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; + "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mzv" = dontDistribute super."mzv"; + "n-m" = dontDistribute super."n-m"; + "nagios-check" = dontDistribute super."nagios-check"; + "nagios-perfdata" = dontDistribute super."nagios-perfdata"; + "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg"; + "named-formlet" = dontDistribute super."named-formlet"; + "named-lock" = dontDistribute super."named-lock"; + "named-records" = dontDistribute super."named-records"; + "namelist" = dontDistribute super."namelist"; + "names" = dontDistribute super."names"; + "names-th" = dontDistribute super."names-th"; + "nano-cryptr" = dontDistribute super."nano-cryptr"; + "nano-hmac" = dontDistribute super."nano-hmac"; + "nano-md5" = dontDistribute super."nano-md5"; + "nanoAgda" = dontDistribute super."nanoAgda"; + "nanocurses" = dontDistribute super."nanocurses"; + "nanomsg" = dontDistribute super."nanomsg"; + "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; + "nanoparsec" = dontDistribute super."nanoparsec"; + "narc" = dontDistribute super."narc"; + "nat" = dontDistribute super."nat"; + "nationstates" = doDistribute super."nationstates_0_2_0_3"; + "nats-queue" = dontDistribute super."nats-queue"; + "natural-number" = dontDistribute super."natural-number"; + "natural-numbers" = dontDistribute super."natural-numbers"; + "natural-sort" = dontDistribute super."natural-sort"; + "natural-transformation" = dontDistribute super."natural-transformation"; + "naturalcomp" = dontDistribute super."naturalcomp"; + "naturals" = dontDistribute super."naturals"; + "naver-translate" = dontDistribute super."naver-translate"; + "nbt" = dontDistribute super."nbt"; + "nc-indicators" = dontDistribute super."nc-indicators"; + "ncurses" = dontDistribute super."ncurses"; + "neat" = dontDistribute super."neat"; + "needle" = dontDistribute super."needle"; + "neet" = dontDistribute super."neet"; + "nehe-tuts" = dontDistribute super."nehe-tuts"; + "neil" = dontDistribute super."neil"; + "neither" = dontDistribute super."neither"; + "nemesis" = dontDistribute super."nemesis"; + "nemesis-titan" = dontDistribute super."nemesis-titan"; + "nerf" = dontDistribute super."nerf"; + "nero" = dontDistribute super."nero"; + "nero-wai" = dontDistribute super."nero-wai"; + "nero-warp" = dontDistribute super."nero-warp"; + "nested-routes" = dontDistribute super."nested-routes"; + "nested-sets" = dontDistribute super."nested-sets"; + "nestedmap" = dontDistribute super."nestedmap"; + "net-concurrent" = dontDistribute super."net-concurrent"; + "netclock" = dontDistribute super."netclock"; + "netcore" = dontDistribute super."netcore"; + "netlines" = dontDistribute super."netlines"; + "netlink" = dontDistribute super."netlink"; + "netlist" = dontDistribute super."netlist"; + "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl"; + "netpbm" = dontDistribute super."netpbm"; + "netrc" = dontDistribute super."netrc"; + "netspec" = dontDistribute super."netspec"; + "netstring-enumerator" = dontDistribute super."netstring-enumerator"; + "nettle" = dontDistribute super."nettle"; + "nettle-frp" = dontDistribute super."nettle-frp"; + "nettle-netkit" = dontDistribute super."nettle-netkit"; + "nettle-openflow" = dontDistribute super."nettle-openflow"; + "netwire" = dontDistribute super."netwire"; + "netwire-input" = dontDistribute super."netwire-input"; + "netwire-input-glfw" = dontDistribute super."netwire-input-glfw"; + "network-address" = dontDistribute super."network-address"; + "network-api-support" = dontDistribute super."network-api-support"; + "network-bitcoin" = dontDistribute super."network-bitcoin"; + "network-builder" = dontDistribute super."network-builder"; + "network-bytestring" = dontDistribute super."network-bytestring"; + "network-conduit" = dontDistribute super."network-conduit"; + "network-connection" = dontDistribute super."network-connection"; + "network-data" = dontDistribute super."network-data"; + "network-dbus" = dontDistribute super."network-dbus"; + "network-dns" = dontDistribute super."network-dns"; + "network-enumerator" = dontDistribute super."network-enumerator"; + "network-fancy" = dontDistribute super."network-fancy"; + "network-house" = dontDistribute super."network-house"; + "network-interfacerequest" = dontDistribute super."network-interfacerequest"; + "network-ip" = dontDistribute super."network-ip"; + "network-metrics" = dontDistribute super."network-metrics"; + "network-minihttp" = dontDistribute super."network-minihttp"; + "network-msg" = dontDistribute super."network-msg"; + "network-netpacket" = dontDistribute super."network-netpacket"; + "network-pgi" = dontDistribute super."network-pgi"; + "network-rpca" = dontDistribute super."network-rpca"; + "network-server" = dontDistribute super."network-server"; + "network-service" = dontDistribute super."network-service"; + "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr"; + "network-simple-tls" = dontDistribute super."network-simple-tls"; + "network-socket-options" = dontDistribute super."network-socket-options"; + "network-stream" = dontDistribute super."network-stream"; + "network-topic-models" = dontDistribute super."network-topic-models"; + "network-transport-amqp" = dontDistribute super."network-transport-amqp"; + "network-transport-inmemory" = dontDistribute super."network-transport-inmemory"; + "network-transport-tcp" = dontDistribute super."network-transport-tcp"; + "network-transport-tests" = dontDistribute super."network-transport-tests"; + "network-transport-zeromq" = dontDistribute super."network-transport-zeromq"; + "network-uri-static" = dontDistribute super."network-uri-static"; + "network-wai-router" = dontDistribute super."network-wai-router"; + "network-websocket" = dontDistribute super."network-websocket"; + "networked-game" = dontDistribute super."networked-game"; + "newports" = dontDistribute super."newports"; + "newsynth" = dontDistribute super."newsynth"; + "newt" = dontDistribute super."newt"; + "newtype-deriving" = dontDistribute super."newtype-deriving"; + "newtype-th" = dontDistribute super."newtype-th"; + "newtyper" = dontDistribute super."newtyper"; + "nextstep-plist" = dontDistribute super."nextstep-plist"; + "nf" = dontDistribute super."nf"; + "ngrams-loader" = dontDistribute super."ngrams-loader"; + "nibblestring" = dontDistribute super."nibblestring"; + "nicify" = dontDistribute super."nicify"; + "nicify-lib" = dontDistribute super."nicify-lib"; + "nicovideo-translator" = dontDistribute super."nicovideo-translator"; + "nikepub" = dontDistribute super."nikepub"; + "nimber" = dontDistribute super."nimber"; + "nitro" = dontDistribute super."nitro"; + "nix-paths" = dontDistribute super."nix-paths"; + "nixfromnpm" = dontDistribute super."nixfromnpm"; + "nixos-types" = dontDistribute super."nixos-types"; + "nkjp" = dontDistribute super."nkjp"; + "nlp-scores" = dontDistribute super."nlp-scores"; + "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts"; + "nm" = dontDistribute super."nm"; + "nme" = dontDistribute super."nme"; + "nntp" = dontDistribute super."nntp"; + "no-role-annots" = dontDistribute super."no-role-annots"; + "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"; + "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-tools" = dontDistribute super."numeric-tools"; + "numericpeano" = dontDistribute super."numericpeano"; + "nums" = dontDistribute super."nums"; + "numtype-dk" = dontDistribute super."numtype-dk"; + "numtype-tf" = dontDistribute super."numtype-tf"; + "nurbs" = dontDistribute super."nurbs"; + "nvim-hs" = dontDistribute super."nvim-hs"; + "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib"; + "nyan" = dontDistribute super."nyan"; + "nylas" = dontDistribute super."nylas"; + "nymphaea" = dontDistribute super."nymphaea"; + "oauthenticated" = dontDistribute super."oauthenticated"; + "obdd" = dontDistribute super."obdd"; + "oberon0" = dontDistribute super."oberon0"; + "obj" = dontDistribute super."obj"; + "objectid" = dontDistribute super."objectid"; + "observable-sharing" = dontDistribute super."observable-sharing"; + "octohat" = dontDistribute super."octohat"; + "octopus" = dontDistribute super."octopus"; + "oculus" = dontDistribute super."oculus"; + "off-simple" = dontDistribute super."off-simple"; + "ofx" = dontDistribute super."ofx"; + "ohloh-hs" = dontDistribute super."ohloh-hs"; + "oi" = dontDistribute super."oi"; + "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"; + "oo-prototypes" = dontDistribute super."oo-prototypes"; + "opaleye-classy" = dontDistribute super."opaleye-classy"; + "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; + "open-browser" = dontDistribute super."open-browser"; + "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"; + "opencv-raw" = dontDistribute super."opencv-raw"; + "opendatatable" = dontDistribute super."opendatatable"; + "openexchangerates" = dontDistribute super."openexchangerates"; + "openflow" = dontDistribute super."openflow"; + "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"; + "opml" = dontDistribute super."opml"; + "opml-conduit" = dontDistribute super."opml-conduit"; + "opn" = dontDistribute super."opn"; + "optimal-blocks" = dontDistribute super."optimal-blocks"; + "optimization" = dontDistribute super."optimization"; + "optimusprime" = dontDistribute super."optimusprime"; + "optional" = dontDistribute super."optional"; + "options-time" = dontDistribute super."options-time"; + "optparse-declarative" = dontDistribute super."optparse-declarative"; + "orc" = dontDistribute super."orc"; + "orchestrate" = dontDistribute super."orchestrate"; + "orchid" = dontDistribute super."orchid"; + "orchid-demo" = dontDistribute super."orchid-demo"; + "ord-adhoc" = dontDistribute super."ord-adhoc"; + "order-maintenance" = dontDistribute super."order-maintenance"; + "order-statistics" = dontDistribute super."order-statistics"; + "ordered" = dontDistribute super."ordered"; + "orders" = dontDistribute super."orders"; + "ordrea" = dontDistribute super."ordrea"; + "organize-imports" = dontDistribute super."organize-imports"; + "orgmode" = dontDistribute super."orgmode"; + "orgmode-parse" = dontDistribute super."orgmode-parse"; + "origami" = dontDistribute super."origami"; + "os-release" = dontDistribute super."os-release"; + "osc" = dontDistribute super."osc"; + "osm-download" = dontDistribute super."osm-download"; + "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"; + "packunused" = dontDistribute super."packunused"; + "pacman-memcache" = dontDistribute super."pacman-memcache"; + "padKONTROL" = dontDistribute super."padKONTROL"; + "pagarme" = dontDistribute super."pagarme"; + "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; + "palindromes" = dontDistribute super."palindromes"; + "pam" = dontDistribute super."pam"; + "panda" = dontDistribute super."panda"; + "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_3_1"; + "pandoc-crossref" = dontDistribute super."pandoc-crossref"; + "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; + "pandoc-lens" = dontDistribute super."pandoc-lens"; + "pandoc-placetable" = dontDistribute super."pandoc-placetable"; + "pandoc-types" = doDistribute super."pandoc-types_1_12_4_5"; + "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-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"; + "parsergen" = dontDistribute super."parsergen"; + "parsestar" = dontDistribute super."parsestar"; + "parsimony" = dontDistribute super."parsimony"; + "partial" = dontDistribute super."partial"; + "partial-isomorphisms" = dontDistribute super."partial-isomorphisms"; + "partial-lens" = dontDistribute super."partial-lens"; + "partial-uri" = dontDistribute super."partial-uri"; + "partly" = dontDistribute super."partly"; + "passage" = dontDistribute super."passage"; + "passwords" = dontDistribute super."passwords"; + "pastis" = dontDistribute super."pastis"; + "pasty" = dontDistribute super."pasty"; + "patch-combinators" = dontDistribute super."patch-combinators"; + "patch-image" = dontDistribute super."patch-image"; + "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" = dontDistribute super."pcap"; + "pcap-conduit" = dontDistribute super."pcap-conduit"; + "pcap-enumerator" = dontDistribute super."pcap-enumerator"; + "pcd-loader" = dontDistribute super."pcd-loader"; + "pcf" = dontDistribute super."pcf"; + "pcg-random" = dontDistribute super."pcg-random"; + "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5"; + "pcre-less" = dontDistribute super."pcre-less"; + "pcre-light-extra" = dontDistribute super."pcre-light-extra"; + "pcre-utils" = dontDistribute super."pcre-utils"; + "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content"; + "pdf-toolbox-core" = dontDistribute super."pdf-toolbox-core"; + "pdf-toolbox-document" = dontDistribute super."pdf-toolbox-document"; + "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; + "pdf2line" = dontDistribute super."pdf2line"; + "pdfsplit" = dontDistribute super."pdfsplit"; + "pdynload" = dontDistribute super."pdynload"; + "peakachu" = dontDistribute super."peakachu"; + "peano" = dontDistribute super."peano"; + "peano-inf" = dontDistribute super."peano-inf"; + "pec" = dontDistribute super."pec"; + "pecoff" = dontDistribute super."pecoff"; + "peg" = dontDistribute super."peg"; + "peggy" = dontDistribute super."peggy"; + "pell" = dontDistribute super."pell"; + "penn-treebank" = dontDistribute super."penn-treebank"; + "penny" = dontDistribute super."penny"; + "penny-bin" = dontDistribute super."penny-bin"; + "penny-lib" = dontDistribute super."penny-lib"; + "peparser" = dontDistribute super."peparser"; + "perceptron" = dontDistribute super."perceptron"; + "perdure" = dontDistribute super."perdure"; + "period" = dontDistribute super."period"; + "perm" = dontDistribute super."perm"; + "permutation" = dontDistribute super."permutation"; + "permute" = dontDistribute super."permute"; + "persist2er" = dontDistribute super."persist2er"; + "persistable-record" = dontDistribute super."persistable-record"; + "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-map" = dontDistribute super."persistent-map"; + "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; + "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-protobuf" = dontDistribute super."persistent-protobuf"; + "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; + "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-vector" = dontDistribute super."persistent-vector"; + "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; + "persona" = dontDistribute super."persona"; + "persona-idp" = dontDistribute super."persona-idp"; + "pesca" = dontDistribute super."pesca"; + "peyotls" = dontDistribute super."peyotls"; + "peyotls-codec" = dontDistribute super."peyotls-codec"; + "pez" = dontDistribute super."pez"; + "pg-harness" = dontDistribute super."pg-harness"; + "pg-harness-client" = dontDistribute super."pg-harness-client"; + "pg-harness-server" = dontDistribute super."pg-harness-server"; + "pgdl" = dontDistribute super."pgdl"; + "pgm" = dontDistribute super."pgm"; + "pgp-wordlist" = dontDistribute super."pgp-wordlist"; + "pgsql-simple" = dontDistribute super."pgsql-simple"; + "pgstream" = dontDistribute super."pgstream"; + "phasechange" = dontDistribute super."phasechange"; + "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-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-csv" = dontDistribute super."pipes-csv"; + "pipes-errors" = dontDistribute super."pipes-errors"; + "pipes-extra" = dontDistribute super."pipes-extra"; + "pipes-extras" = dontDistribute super."pipes-extras"; + "pipes-files" = dontDistribute super."pipes-files"; + "pipes-interleave" = dontDistribute super."pipes-interleave"; + "pipes-mongodb" = dontDistribute super."pipes-mongodb"; + "pipes-network-tls" = dontDistribute super."pipes-network-tls"; + "pipes-p2p" = dontDistribute super."pipes-p2p"; + "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; + "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; + "pipes-rt" = dontDistribute super."pipes-rt"; + "pipes-shell" = dontDistribute super."pipes-shell"; + "pipes-vector" = dontDistribute super."pipes-vector"; + "pipes-websockets" = dontDistribute super."pipes-websockets"; + "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; + "pipes-zlib" = dontDistribute super."pipes-zlib"; + "pisigma" = dontDistribute super."pisigma"; + "pit" = dontDistribute super."pit"; + "pkcs1" = dontDistribute super."pkcs1"; + "pkcs7" = dontDistribute super."pkcs7"; + "pkggraph" = dontDistribute super."pkggraph"; + "pktree" = dontDistribute super."pktree"; + "plailude" = dontDistribute super."plailude"; + "planar-graph" = dontDistribute super."planar-graph"; + "plat" = dontDistribute super."plat"; + "playlists" = dontDistribute super."playlists"; + "plist" = dontDistribute super."plist"; + "plivo" = dontDistribute super."plivo"; + "plot-gtk-ui" = dontDistribute super."plot-gtk-ui"; + "plot-lab" = dontDistribute super."plot-lab"; + "plotfont" = dontDistribute super."plotfont"; + "plotserver-api" = dontDistribute super."plotserver-api"; + "plugins" = dontDistribute super."plugins"; + "plugins-auto" = dontDistribute super."plugins-auto"; + "plugins-multistage" = dontDistribute super."plugins-multistage"; + "plumbers" = dontDistribute super."plumbers"; + "ply-loader" = dontDistribute super."ply-loader"; + "png-file" = dontDistribute super."png-file"; + "pngload" = dontDistribute super."pngload"; + "pngload-fixed" = dontDistribute super."pngload-fixed"; + "pnm" = dontDistribute super."pnm"; + "pocket-dns" = dontDistribute super."pocket-dns"; + "pointedlist" = dontDistribute super."pointedlist"; + "pointfree" = dontDistribute super."pointfree"; + "pointful" = dontDistribute super."pointful"; + "pointless-fun" = dontDistribute super."pointless-fun"; + "pointless-haskell" = dontDistribute super."pointless-haskell"; + "pointless-lenses" = dontDistribute super."pointless-lenses"; + "pointless-rewrite" = dontDistribute super."pointless-rewrite"; + "poker-eval" = dontDistribute super."poker-eval"; + "pokitdok" = dontDistribute super."pokitdok"; + "polar" = dontDistribute super."polar"; + "polar-shader" = dontDistribute super."polar-shader"; + "polh-lexicon" = dontDistribute super."polh-lexicon"; + "polimorf" = dontDistribute super."polimorf"; + "poll" = dontDistribute super."poll"; + "polyToMonoid" = dontDistribute super."polyToMonoid"; + "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-config" = dontDistribute super."postgresql-config"; + "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; + "postgresql-cube" = dontDistribute super."postgresql-cube"; + "postgresql-orm" = dontDistribute super."postgresql-orm"; + "postgresql-query" = dontDistribute super."postgresql-query"; + "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; + "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; + "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; + "postgresql-typed" = dontDistribute super."postgresql-typed"; + "postgrest" = dontDistribute super."postgrest"; + "postie" = dontDistribute super."postie"; + "postmark" = dontDistribute super."postmark"; + "postmaster" = dontDistribute super."postmaster"; + "potato-tool" = dontDistribute super."potato-tool"; + "potrace" = dontDistribute super."potrace"; + "potrace-diagrams" = dontDistribute super."potrace-diagrams"; + "powermate" = dontDistribute super."powermate"; + "powerpc" = dontDistribute super."powerpc"; + "ppm" = dontDistribute super."ppm"; + "pqc" = dontDistribute super."pqc"; + "pqueue-mtl" = dontDistribute super."pqueue-mtl"; + "practice-room" = dontDistribute super."practice-room"; + "precis" = dontDistribute super."precis"; + "pred-trie" = doDistribute super."pred-trie_0_2_0"; + "predicates" = dontDistribute super."predicates"; + "prednote-test" = dontDistribute super."prednote-test"; + "prefork" = dontDistribute super."prefork"; + "pregame" = dontDistribute super."pregame"; + "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"; + "primitive" = doDistribute super."primitive_0_6"; + "primula-board" = dontDistribute super."primula-board"; + "primula-bot" = dontDistribute super."primula-bot"; + "printf-mauke" = dontDistribute super."printf-mauke"; + "printxosd" = dontDistribute super."printxosd"; + "priority-queue" = dontDistribute super."priority-queue"; + "priority-sync" = dontDistribute super."priority-sync"; + "privileged-concurrency" = dontDistribute super."privileged-concurrency"; + "prizm" = dontDistribute super."prizm"; + "probability" = dontDistribute super."probability"; + "probable" = dontDistribute super."probable"; + "proc" = dontDistribute super."proc"; + "process-conduit" = dontDistribute super."process-conduit"; + "process-iterio" = dontDistribute super."process-iterio"; + "process-leksah" = dontDistribute super."process-leksah"; + "process-listlike" = dontDistribute super."process-listlike"; + "process-progress" = dontDistribute super."process-progress"; + "process-qq" = dontDistribute super."process-qq"; + "process-streaming" = dontDistribute super."process-streaming"; + "processing" = dontDistribute super."processing"; + "processor-creative-kit" = dontDistribute super."processor-creative-kit"; + "procrastinating-structure" = dontDistribute super."procrastinating-structure"; + "procrastinating-variable" = dontDistribute super."procrastinating-variable"; + "procstat" = dontDistribute super."procstat"; + "proctest" = dontDistribute super."proctest"; + "prof2dot" = dontDistribute super."prof2dot"; + "prof2pretty" = dontDistribute super."prof2pretty"; + "profiteur" = dontDistribute super."profiteur"; + "progress" = dontDistribute super."progress"; + "progressbar" = dontDistribute super."progressbar"; + "progression" = dontDistribute super."progression"; + "progressive" = dontDistribute super."progressive"; + "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; + "projection" = dontDistribute super."projection"; + "prolog" = dontDistribute super."prolog"; + "prolog-graph" = dontDistribute super."prolog-graph"; + "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; + "promise" = dontDistribute super."promise"; + "promises" = dontDistribute super."promises"; + "prompt" = dontDistribute super."prompt"; + "propane" = dontDistribute super."propane"; + "propellor" = dontDistribute super."propellor"; + "properties" = dontDistribute super."properties"; + "property-list" = dontDistribute super."property-list"; + "proplang" = dontDistribute super."proplang"; + "props" = dontDistribute super."props"; + "prosper" = dontDistribute super."prosper"; + "proteaaudio" = dontDistribute super."proteaaudio"; + "protobuf" = dontDistribute super."protobuf"; + "protobuf-native" = dontDistribute super."protobuf-native"; + "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; + "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "proton-haskell" = dontDistribute super."proton-haskell"; + "prototype" = dontDistribute super."prototype"; + "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; + "proxy-kindness" = dontDistribute super."proxy-kindness"; + "psc-ide" = dontDistribute super."psc-ide"; + "pseudo-boolean" = dontDistribute super."pseudo-boolean"; + "pseudo-trie" = dontDistribute super."pseudo-trie"; + "pseudomacros" = dontDistribute super."pseudomacros"; + "pub" = dontDistribute super."pub"; + "publicsuffix" = dontDistribute super."publicsuffix"; + "publicsuffixlist" = dontDistribute super."publicsuffixlist"; + "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate"; + "pubnub" = dontDistribute super."pubnub"; + "pubsub" = dontDistribute super."pubsub"; + "puffytools" = dontDistribute super."puffytools"; + "pugixml" = dontDistribute super."pugixml"; + "pugs-DrIFT" = dontDistribute super."pugs-DrIFT"; + "pugs-HsSyck" = dontDistribute super."pugs-HsSyck"; + "pugs-compat" = dontDistribute super."pugs-compat"; + "pugs-hsregex" = dontDistribute super."pugs-hsregex"; + "pulse-simple" = dontDistribute super."pulse-simple"; + "punkt" = dontDistribute super."punkt"; + "punycode" = dontDistribute super."punycode"; + "puppetresources" = dontDistribute super."puppetresources"; + "pure-cdb" = dontDistribute super."pure-cdb"; + "pure-fft" = dontDistribute super."pure-fft"; + "pure-priority-queue" = dontDistribute super."pure-priority-queue"; + "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests"; + "pure-zlib" = dontDistribute super."pure-zlib"; + "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast"; + "push-notify" = dontDistribute super."push-notify"; + "push-notify-ccs" = dontDistribute super."push-notify-ccs"; + "push-notify-general" = dontDistribute super."push-notify-general"; + "pusher-haskell" = dontDistribute super."pusher-haskell"; + "pusher-http-haskell" = dontDistribute super."pusher-http-haskell"; + "pushme" = dontDistribute super."pushme"; + "putlenses" = dontDistribute super."putlenses"; + "puzzle-draw" = dontDistribute super."puzzle-draw"; + "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline"; + "pvd" = dontDistribute super."pvd"; + "pwstore-cli" = dontDistribute super."pwstore-cli"; + "pwstore-purehaskell" = dontDistribute super."pwstore-purehaskell"; + "pxsl-tools" = dontDistribute super."pxsl-tools"; + "pyffi" = dontDistribute super."pyffi"; + "pyfi" = dontDistribute super."pyfi"; + "python-pickle" = dontDistribute super."python-pickle"; + "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; + "qd" = dontDistribute super."qd"; + "qd-vec" = dontDistribute super."qd-vec"; + "qhull-simple" = dontDistribute super."qhull-simple"; + "qrcode" = dontDistribute super."qrcode"; + "quadratic-irrational" = dontDistribute super."quadratic-irrational"; + "quantfin" = dontDistribute super."quantfin"; + "quantities" = dontDistribute super."quantities"; + "quantum-arrow" = dontDistribute super."quantum-arrow"; + "qudb" = dontDistribute super."qudb"; + "quenya-verb" = dontDistribute super."quenya-verb"; + "querystring-pickle" = dontDistribute super."querystring-pickle"; + "questioner" = dontDistribute super."questioner"; + "queue" = dontDistribute super."queue"; + "queuelike" = dontDistribute super."queuelike"; + "quick-generator" = dontDistribute super."quick-generator"; + "quickcheck-poly" = dontDistribute super."quickcheck-poly"; + "quickcheck-properties" = dontDistribute super."quickcheck-properties"; + "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; + "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad"; + "quickcheck-regex" = dontDistribute super."quickcheck-regex"; + "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng"; + "quickcheck-rematch" = dontDistribute super."quickcheck-rematch"; + "quickcheck-script" = dontDistribute super."quickcheck-script"; + "quickcheck-simple" = dontDistribute super."quickcheck-simple"; + "quickcheck-text" = dontDistribute super."quickcheck-text"; + "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver"; + "quicklz" = dontDistribute super."quicklz"; + "quickpull" = dontDistribute super."quickpull"; + "quickset" = dontDistribute super."quickset"; + "quickspec" = dontDistribute super."quickspec"; + "quicktest" = dontDistribute super."quicktest"; + "quickwebapp" = dontDistribute super."quickwebapp"; + "quiver" = dontDistribute super."quiver"; + "quiver-bytestring" = dontDistribute super."quiver-bytestring"; + "quiver-cell" = dontDistribute super."quiver-cell"; + "quiver-csv" = dontDistribute super."quiver-csv"; + "quiver-enumerator" = dontDistribute super."quiver-enumerator"; + "quiver-http" = dontDistribute super."quiver-http"; + "quoridor-hs" = dontDistribute super."quoridor-hs"; + "qux" = dontDistribute super."qux"; + "rabocsv2qif" = dontDistribute super."rabocsv2qif"; + "rad" = dontDistribute super."rad"; + "radian" = dontDistribute super."radian"; + "radium" = dontDistribute super."radium"; + "radium-formula-parser" = dontDistribute super."radium-formula-parser"; + "radix" = dontDistribute super."radix"; + "rados-haskell" = dontDistribute super."rados-haskell"; + "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; + "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rake" = dontDistribute super."rake"; + "rakhana" = dontDistribute super."rakhana"; + "ralist" = dontDistribute super."ralist"; + "rallod" = dontDistribute super."rallod"; + "raml" = dontDistribute super."raml"; + "rand-vars" = dontDistribute super."rand-vars"; + "randfile" = dontDistribute super."randfile"; + "random-access-list" = dontDistribute super."random-access-list"; + "random-derive" = dontDistribute super."random-derive"; + "random-eff" = dontDistribute super."random-eff"; + "random-effin" = dontDistribute super."random-effin"; + "random-extras" = dontDistribute super."random-extras"; + "random-hypergeometric" = dontDistribute super."random-hypergeometric"; + "random-stream" = dontDistribute super."random-stream"; + "randomgen" = dontDistribute super."randomgen"; + "randproc" = dontDistribute super."randproc"; + "randsolid" = dontDistribute super."randsolid"; + "range-set-list" = dontDistribute super."range-set-list"; + "range-space" = dontDistribute super."range-space"; + "rangemin" = dontDistribute super."rangemin"; + "ranges" = dontDistribute super."ranges"; + "rank1dynamic" = dontDistribute super."rank1dynamic"; + "rascal" = dontDistribute super."rascal"; + "rate-limit" = dontDistribute super."rate-limit"; + "ratio-int" = dontDistribute super."ratio-int"; + "raven-haskell" = dontDistribute super."raven-haskell"; + "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "rawstring-qm" = dontDistribute super."rawstring-qm"; + "razom-text-util" = dontDistribute super."razom-text-util"; + "rbr" = dontDistribute super."rbr"; + "rclient" = dontDistribute super."rclient"; + "rcu" = dontDistribute super."rcu"; + "rdf4h" = dontDistribute super."rdf4h"; + "rdioh" = dontDistribute super."rdioh"; + "rdtsc" = dontDistribute super."rdtsc"; + "rdtsc-enolan" = dontDistribute super."rdtsc-enolan"; + "re2" = dontDistribute super."re2"; + "react-flux" = dontDistribute super."react-flux"; + "react-haskell" = dontDistribute super."react-haskell"; + "reaction-logic" = dontDistribute super."reaction-logic"; + "reactive" = dontDistribute super."reactive"; + "reactive-bacon" = dontDistribute super."reactive-bacon"; + "reactive-balsa" = dontDistribute super."reactive-balsa"; + "reactive-banana" = dontDistribute super."reactive-banana"; + "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; + "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; + "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; + "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; + "reactive-glut" = dontDistribute super."reactive-glut"; + "reactive-haskell" = dontDistribute super."reactive-haskell"; + "reactive-io" = dontDistribute super."reactive-io"; + "reactive-thread" = dontDistribute super."reactive-thread"; + "reactor" = dontDistribute super."reactor"; + "read-bounded" = dontDistribute super."read-bounded"; + "readable" = dontDistribute super."readable"; + "readline" = dontDistribute super."readline"; + "readline-statevar" = dontDistribute super."readline-statevar"; + "readpyc" = dontDistribute super."readpyc"; + "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; + "reasonable-lens" = dontDistribute super."reasonable-lens"; + "reasonable-operational" = dontDistribute super."reasonable-operational"; + "recaptcha" = dontDistribute super."recaptcha"; + "record" = dontDistribute super."record"; + "record-aeson" = dontDistribute super."record-aeson"; + "record-gl" = dontDistribute super."record-gl"; + "record-preprocessor" = dontDistribute super."record-preprocessor"; + "record-syntax" = dontDistribute super."record-syntax"; + "records" = dontDistribute super."records"; + "records-th" = dontDistribute super."records-th"; + "recursion-schemes" = dontDistribute super."recursion-schemes"; + "recursive-line-count" = dontDistribute super."recursive-line-count"; + "redHandlers" = dontDistribute super."redHandlers"; + "reddit" = dontDistribute super."reddit"; + "redis" = dontDistribute super."redis"; + "redis-hs" = dontDistribute super."redis-hs"; + "redis-job-queue" = dontDistribute super."redis-job-queue"; + "redis-simple" = dontDistribute super."redis-simple"; + "redo" = dontDistribute super."redo"; + "reducers" = doDistribute super."reducers_3_10_3_2"; + "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-dom" = dontDistribute super."reflex-dom"; + "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; + "reflex-gloss" = dontDistribute super."reflex-gloss"; + "reform" = dontDistribute super."reform"; + "reform-blaze" = dontDistribute super."reform-blaze"; + "reform-hamlet" = dontDistribute super."reform-hamlet"; + "reform-happstack" = dontDistribute super."reform-happstack"; + "reform-hsp" = dontDistribute super."reform-hsp"; + "regex-applicative-text" = dontDistribute super."regex-applicative-text"; + "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; + "regex-deriv" = dontDistribute super."regex-deriv"; + "regex-dfa" = dontDistribute super."regex-dfa"; + "regex-easy" = dontDistribute super."regex-easy"; + "regex-genex" = dontDistribute super."regex-genex"; + "regex-parsec" = dontDistribute super."regex-parsec"; + "regex-pderiv" = dontDistribute super."regex-pderiv"; + "regex-posix-unittest" = dontDistribute super."regex-posix-unittest"; + "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes"; + "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter"; + "regex-tdfa-text" = dontDistribute super."regex-tdfa-text"; + "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest"; + "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8"; + "regex-tre" = dontDistribute super."regex-tre"; + "regex-xmlschema" = dontDistribute super."regex-xmlschema"; + "regexchar" = dontDistribute super."regexchar"; + "regexdot" = dontDistribute super."regexdot"; + "regexp-tries" = dontDistribute super."regexp-tries"; + "regexpr" = dontDistribute super."regexpr"; + "regexpr-symbolic" = dontDistribute super."regexpr-symbolic"; + "regexqq" = dontDistribute super."regexqq"; + "regional-pointers" = dontDistribute super."regional-pointers"; + "regions" = dontDistribute super."regions"; + "regions-monadsfd" = dontDistribute super."regions-monadsfd"; + "regions-monadstf" = dontDistribute super."regions-monadstf"; + "regions-mtl" = dontDistribute super."regions-mtl"; + "regress" = dontDistribute super."regress"; + "regular" = dontDistribute super."regular"; + "regular-extras" = dontDistribute super."regular-extras"; + "regular-web" = dontDistribute super."regular-web"; + "regular-xmlpickler" = dontDistribute super."regular-xmlpickler"; + "reheat" = dontDistribute super."reheat"; + "rehoo" = dontDistribute super."rehoo"; + "rei" = dontDistribute super."rei"; + "reified-records" = dontDistribute super."reified-records"; + "reify" = dontDistribute super."reify"; + "reinterpret-cast" = dontDistribute super."reinterpret-cast"; + "relacion" = dontDistribute super."relacion"; + "relation" = dontDistribute super."relation"; + "relational-postgresql8" = dontDistribute super."relational-postgresql8"; + "relational-query" = dontDistribute super."relational-query"; + "relational-query-HDBC" = dontDistribute super."relational-query-HDBC"; + "relational-record" = dontDistribute super."relational-record"; + "relational-record-examples" = dontDistribute super."relational-record-examples"; + "relational-schemas" = dontDistribute super."relational-schemas"; + "relative-date" = dontDistribute super."relative-date"; + "relit" = dontDistribute super."relit"; + "rematch" = dontDistribute super."rematch"; + "rematch-text" = dontDistribute super."rematch-text"; + "remote" = dontDistribute super."remote"; + "remote-debugger" = dontDistribute super."remote-debugger"; + "remotion" = dontDistribute super."remotion"; + "renderable" = dontDistribute super."renderable"; + "reord" = dontDistribute super."reord"; + "reorderable" = dontDistribute super."reorderable"; + "repa-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"; + "resolve-trivial-conflicts" = dontDistribute super."resolve-trivial-conflicts"; + "resource-effect" = dontDistribute super."resource-effect"; + "resource-embed" = dontDistribute super."resource-embed"; + "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; + "resource-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" = dontDistribute super."rethinkdb"; + "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"; + "riak" = dontDistribute super."riak"; + "riak-protobuf" = dontDistribute super."riak-protobuf"; + "richreports" = dontDistribute super."richreports"; + "riemann" = dontDistribute super."riemann"; + "riff" = dontDistribute super."riff"; + "ring-buffer" = dontDistribute super."ring-buffer"; + "riot" = dontDistribute super."riot"; + "ripple" = dontDistribute super."ripple"; + "ripple-federation" = dontDistribute super."ripple-federation"; + "risc386" = dontDistribute super."risc386"; + "rivers" = dontDistribute super."rivers"; + "rivet" = dontDistribute super."rivet"; + "rivet-core" = dontDistribute super."rivet-core"; + "rivet-migration" = dontDistribute super."rivet-migration"; + "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy"; + "rlglue" = dontDistribute super."rlglue"; + "rmonad" = dontDistribute super."rmonad"; + "rncryptor" = dontDistribute super."rncryptor"; + "rng-utils" = dontDistribute super."rng-utils"; + "robin" = dontDistribute super."robin"; + "robot" = dontDistribute super."robot"; + "robots-txt" = dontDistribute super."robots-txt"; + "rocksdb-haskell" = dontDistribute super."rocksdb-haskell"; + "roguestar" = dontDistribute super."roguestar"; + "roguestar-engine" = dontDistribute super."roguestar-engine"; + "roguestar-gl" = dontDistribute super."roguestar-gl"; + "roguestar-glut" = dontDistribute super."roguestar-glut"; + "rollbar" = dontDistribute super."rollbar"; + "roller" = dontDistribute super."roller"; + "rolling-queue" = dontDistribute super."rolling-queue"; + "roman-numerals" = dontDistribute super."roman-numerals"; + "romkan" = dontDistribute super."romkan"; + "roots" = dontDistribute super."roots"; + "rope" = dontDistribute super."rope"; + "rosa" = dontDistribute super."rosa"; + "rose-trees" = dontDistribute super."rose-trees"; + "rosezipper" = dontDistribute super."rosezipper"; + "roshask" = dontDistribute super."roshask"; + "rosso" = dontDistribute super."rosso"; + "rot13" = dontDistribute super."rot13"; + "rotating-log" = dontDistribute super."rotating-log"; + "rounding" = dontDistribute super."rounding"; + "roundtrip" = dontDistribute super."roundtrip"; + "roundtrip-aeson" = dontDistribute super."roundtrip-aeson"; + "roundtrip-string" = dontDistribute super."roundtrip-string"; + "roundtrip-xml" = dontDistribute super."roundtrip-xml"; + "route-generator" = dontDistribute super."route-generator"; + "route-planning" = dontDistribute super."route-planning"; + "rowrecord" = dontDistribute super."rowrecord"; + "rpc" = dontDistribute super."rpc"; + "rpc-framework" = dontDistribute super."rpc-framework"; + "rpf" = dontDistribute super."rpf"; + "rpm" = dontDistribute super."rpm"; + "rsagl" = dontDistribute super."rsagl"; + "rsagl-frp" = dontDistribute super."rsagl-frp"; + "rsagl-math" = dontDistribute super."rsagl-math"; + "rspp" = dontDistribute super."rspp"; + "rss" = dontDistribute super."rss"; + "rss2irc" = dontDistribute super."rss2irc"; + "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"; + "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-plugins" = dontDistribute super."safe-plugins"; + "safe-printf" = dontDistribute super."safe-printf"; + "safeint" = dontDistribute super."safeint"; + "safer-file-handles" = dontDistribute super."safer-file-handles"; + "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; + "safer-file-handles-text" = dontDistribute super."safer-file-handles-text"; + "saferoute" = dontDistribute super."saferoute"; + "sai-shape-syb" = dontDistribute super."sai-shape-syb"; + "saltine" = dontDistribute super."saltine"; + "saltine-quickcheck" = dontDistribute super."saltine-quickcheck"; + "salvia" = dontDistribute super."salvia"; + "salvia-demo" = dontDistribute super."salvia-demo"; + "salvia-extras" = dontDistribute super."salvia-extras"; + "salvia-protocol" = dontDistribute super."salvia-protocol"; + "salvia-sessions" = dontDistribute super."salvia-sessions"; + "salvia-websocket" = dontDistribute super."salvia-websocket"; + "sample-frame" = dontDistribute super."sample-frame"; + "sample-frame-np" = dontDistribute super."sample-frame-np"; + "samtools" = dontDistribute super."samtools"; + "samtools-conduit" = dontDistribute super."samtools-conduit"; + "samtools-enumerator" = dontDistribute super."samtools-enumerator"; + "samtools-iteratee" = dontDistribute super."samtools-iteratee"; + "sandlib" = dontDistribute super."sandlib"; + "sandman" = dontDistribute super."sandman"; + "sarasvati" = dontDistribute super."sarasvati"; + "sasl" = dontDistribute super."sasl"; + "sat" = dontDistribute super."sat"; + "sat-micro-hs" = dontDistribute super."sat-micro-hs"; + "satchmo" = dontDistribute super."satchmo"; + "satchmo-backends" = dontDistribute super."satchmo-backends"; + "satchmo-examples" = dontDistribute super."satchmo-examples"; + "satchmo-funsat" = dontDistribute super."satchmo-funsat"; + "satchmo-minisat" = dontDistribute super."satchmo-minisat"; + "satchmo-toysat" = dontDistribute super."satchmo-toysat"; + "sbp" = dontDistribute super."sbp"; + "sc3-rdu" = dontDistribute super."sc3-rdu"; + "scalable-server" = dontDistribute super."scalable-server"; + "scaleimage" = dontDistribute super."scaleimage"; + "scalp-webhooks" = dontDistribute super."scalp-webhooks"; + "scan" = dontDistribute super."scan"; + "scan-vector-machine" = dontDistribute super."scan-vector-machine"; + "scat" = dontDistribute super."scat"; + "scc" = dontDistribute super."scc"; + "scenegraph" = dontDistribute super."scenegraph"; + "scgi" = dontDistribute super."scgi"; + "schedevr" = dontDistribute super."schedevr"; + "schedule-planner" = dontDistribute super."schedule-planner"; + "schedyield" = dontDistribute super."schedyield"; + "scholdoc" = dontDistribute super."scholdoc"; + "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc"; + "scholdoc-texmath" = dontDistribute super."scholdoc-texmath"; + "scholdoc-types" = dontDistribute super."scholdoc-types"; + "schonfinkeling" = dontDistribute super."schonfinkeling"; + "sci-ratio" = dontDistribute super."sci-ratio"; + "science-constants" = dontDistribute super."science-constants"; + "science-constants-dimensional" = dontDistribute super."science-constants-dimensional"; + "scion" = dontDistribute super."scion"; + "scion-browser" = dontDistribute super."scion-browser"; + "scons2dot" = dontDistribute super."scons2dot"; + "scope" = dontDistribute super."scope"; + "scope-cairo" = dontDistribute super."scope-cairo"; + "scottish" = dontDistribute super."scottish"; + "scotty-binding-play" = dontDistribute super."scotty-binding-play"; + "scotty-blaze" = dontDistribute super."scotty-blaze"; + "scotty-cookie" = dontDistribute super."scotty-cookie"; + "scotty-fay" = dontDistribute super."scotty-fay"; + "scotty-hastache" = dontDistribute super."scotty-hastache"; + "scotty-rest" = dontDistribute super."scotty-rest"; + "scotty-session" = dontDistribute super."scotty-session"; + "scotty-tls" = dontDistribute super."scotty-tls"; + "scp-streams" = dontDistribute super."scp-streams"; + "scrabble-bot" = dontDistribute super."scrabble-bot"; + "scrobble" = dontDistribute super."scrobble"; + "scroll" = dontDistribute super."scroll"; + "scrypt" = dontDistribute super."scrypt"; + "scrz" = dontDistribute super."scrz"; + "scyther-proof" = dontDistribute super."scyther-proof"; + "sde-solver" = dontDistribute super."sde-solver"; + "sdf2p1-parser" = dontDistribute super."sdf2p1-parser"; + "sdl2" = doDistribute super."sdl2_1_3_1"; + "sdl2-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"; + "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"; + "sendgrid-haskell" = dontDistribute super."sendgrid-haskell"; + "sensenet" = dontDistribute super."sensenet"; + "sentry" = dontDistribute super."sentry"; + "senza" = dontDistribute super."senza"; + "separated" = dontDistribute super."separated"; + "seqaid" = dontDistribute super."seqaid"; + "seqid" = dontDistribute super."seqid"; + "seqid-streams" = dontDistribute super."seqid-streams"; + "seqloc-datafiles" = dontDistribute super."seqloc-datafiles"; + "sequence" = dontDistribute super."sequence"; + "sequent-core" = dontDistribute super."sequent-core"; + "sequential-index" = dontDistribute super."sequential-index"; + "sequor" = dontDistribute super."sequor"; + "serial" = dontDistribute super."serial"; + "serial-test-generators" = dontDistribute super."serial-test-generators"; + "serialport" = dontDistribute super."serialport"; + "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; + "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-ede" = dontDistribute super."servant-ede"; + "servant-examples" = dontDistribute super."servant-examples"; + "servant-lucid" = dontDistribute super."servant-lucid"; + "servant-mock" = dontDistribute super."servant-mock"; + "servant-pool" = dontDistribute super."servant-pool"; + "servant-postgresql" = dontDistribute super."servant-postgresql"; + "servant-response" = dontDistribute super."servant-response"; + "servant-scotty" = dontDistribute super."servant-scotty"; + "servius" = dontDistribute super."servius"; + "ses-html" = dontDistribute super."ses-html"; + "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; + "sessions" = dontDistribute super."sessions"; + "set-cover" = dontDistribute super."set-cover"; + "set-with" = dontDistribute super."set-with"; + "setdown" = dontDistribute super."setdown"; + "setops" = dontDistribute super."setops"; + "sets" = dontDistribute super."sets"; + "setters" = dontDistribute super."setters"; + "settings" = dontDistribute super."settings"; + "sexp" = dontDistribute super."sexp"; + "sexp-show" = dontDistribute super."sexp-show"; + "sexpr" = dontDistribute super."sexpr"; + "sext" = dontDistribute super."sext"; + "sfml-audio" = dontDistribute super."sfml-audio"; + "sfmt" = dontDistribute super."sfmt"; + "sgd" = dontDistribute super."sgd"; + "sgf" = dontDistribute super."sgf"; + "sgrep" = dontDistribute super."sgrep"; + "sha-streams" = dontDistribute super."sha-streams"; + "shadower" = dontDistribute super."shadower"; + "shadowsocks" = dontDistribute super."shadowsocks"; + "shady-gen" = dontDistribute super."shady-gen"; + "shady-graphics" = dontDistribute super."shady-graphics"; + "shake-cabal-build" = dontDistribute super."shake-cabal-build"; + "shake-extras" = dontDistribute super."shake-extras"; + "shake-minify" = dontDistribute super."shake-minify"; + "shake-pack" = dontDistribute super."shake-pack"; + "shaker" = dontDistribute super."shaker"; + "shakespeare-css" = dontDistribute super."shakespeare-css"; + "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; + "shakespeare-js" = dontDistribute super."shakespeare-js"; + "shakespeare-text" = dontDistribute super."shakespeare-text"; + "shana" = dontDistribute super."shana"; + "shapefile" = dontDistribute super."shapefile"; + "shapely-data" = dontDistribute super."shapely-data"; + "shared-buffer" = dontDistribute super."shared-buffer"; + "shared-fields" = dontDistribute super."shared-fields"; + "shared-memory" = dontDistribute super."shared-memory"; + "sharedio" = dontDistribute super."sharedio"; + "she" = dontDistribute super."she"; + "shelduck" = dontDistribute super."shelduck"; + "shell-escape" = dontDistribute super."shell-escape"; + "shell-monad" = dontDistribute super."shell-monad"; + "shell-pipe" = dontDistribute super."shell-pipe"; + "shellish" = dontDistribute super."shellish"; + "shellmate" = dontDistribute super."shellmate"; + "shelly-extra" = dontDistribute super."shelly-extra"; + "shivers-cfg" = dontDistribute super."shivers-cfg"; + "shoap" = dontDistribute super."shoap"; + "shortcircuit" = dontDistribute super."shortcircuit"; + "shorten-strings" = dontDistribute super."shorten-strings"; + "should-not-typecheck" = dontDistribute super."should-not-typecheck"; + "show-type" = dontDistribute super."show-type"; + "showdown" = dontDistribute super."showdown"; + "shpider" = dontDistribute super."shpider"; + "shplit" = dontDistribute super."shplit"; + "shqq" = dontDistribute super."shqq"; + "shuffle" = dontDistribute super."shuffle"; + "sieve" = dontDistribute super."sieve"; + "sifflet" = dontDistribute super."sifflet"; + "sifflet-lib" = dontDistribute super."sifflet-lib"; + "sign" = dontDistribute super."sign"; + "signal" = dontDistribute super."signal"; + "signals" = dontDistribute super."signals"; + "signed-multiset" = dontDistribute super."signed-multiset"; + "simd" = dontDistribute super."simd"; + "simgi" = dontDistribute super."simgi"; + "simple" = dontDistribute super."simple"; + "simple-actors" = dontDistribute super."simple-actors"; + "simple-atom" = dontDistribute super."simple-atom"; + "simple-bluetooth" = dontDistribute super."simple-bluetooth"; + "simple-c-value" = dontDistribute super."simple-c-value"; + "simple-conduit" = dontDistribute super."simple-conduit"; + "simple-config" = dontDistribute super."simple-config"; + "simple-css" = dontDistribute super."simple-css"; + "simple-eval" = dontDistribute super."simple-eval"; + "simple-firewire" = dontDistribute super."simple-firewire"; + "simple-form" = dontDistribute super."simple-form"; + "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm"; + "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr"; + "simple-get-opt" = dontDistribute super."simple-get-opt"; + "simple-index" = dontDistribute super."simple-index"; + "simple-log" = dontDistribute super."simple-log"; + "simple-log-syslog" = dontDistribute super."simple-log-syslog"; + "simple-neural-networks" = dontDistribute super."simple-neural-networks"; + "simple-nix" = dontDistribute super."simple-nix"; + "simple-observer" = dontDistribute super."simple-observer"; + "simple-pascal" = dontDistribute super."simple-pascal"; + "simple-pipe" = dontDistribute super."simple-pipe"; + "simple-postgresql-orm" = dontDistribute super."simple-postgresql-orm"; + "simple-rope" = dontDistribute super."simple-rope"; + "simple-server" = dontDistribute super."simple-server"; + "simple-session" = dontDistribute super."simple-session"; + "simple-sessions" = dontDistribute super."simple-sessions"; + "simple-smt" = dontDistribute super."simple-smt"; + "simple-sql-parser" = dontDistribute super."simple-sql-parser"; + "simple-stacked-vm" = dontDistribute super."simple-stacked-vm"; + "simple-tabular" = dontDistribute super."simple-tabular"; + "simple-templates" = dontDistribute super."simple-templates"; + "simple-vec3" = dontDistribute super."simple-vec3"; + "simpleargs" = dontDistribute super."simpleargs"; + "simpleirc" = dontDistribute super."simpleirc"; + "simpleirc-lens" = dontDistribute super."simpleirc-lens"; + "simplenote" = dontDistribute super."simplenote"; + "simpleprelude" = dontDistribute super."simpleprelude"; + "simplesmtpclient" = dontDistribute super."simplesmtpclient"; + "simplessh" = dontDistribute super."simplessh"; + "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"; + "skeletons" = dontDistribute super."skeletons"; + "skell" = dontDistribute super."skell"; + "skype4hs" = dontDistribute super."skype4hs"; + "skypelogexport" = dontDistribute super."skypelogexport"; + "slack" = dontDistribute super."slack"; + "slack-api" = dontDistribute super."slack-api"; + "slack-notify-haskell" = dontDistribute super."slack-notify-haskell"; + "slice-cpp-gen" = dontDistribute super."slice-cpp-gen"; + "slidemews" = dontDistribute super."slidemews"; + "sloane" = dontDistribute super."sloane"; + "slot-lambda" = dontDistribute super."slot-lambda"; + "sloth" = dontDistribute super."sloth"; + "smallarray" = dontDistribute super."smallarray"; + "smallcaps" = dontDistribute super."smallcaps"; + "smallcheck-laws" = dontDistribute super."smallcheck-laws"; + "smallcheck-lens" = dontDistribute super."smallcheck-lens"; + "smallcheck-series" = dontDistribute super."smallcheck-series"; + "smallpt-hs" = dontDistribute super."smallpt-hs"; + "smallstring" = dontDistribute super."smallstring"; + "smaoin" = dontDistribute super."smaoin"; + "smartGroup" = dontDistribute super."smartGroup"; + "smartcheck" = dontDistribute super."smartcheck"; + "smartconstructor" = dontDistribute super."smartconstructor"; + "smartword" = dontDistribute super."smartword"; + "sme" = dontDistribute super."sme"; + "smoothie" = doDistribute super."smoothie_0_4_1"; + "smsaero" = dontDistribute super."smsaero"; + "smt-lib" = dontDistribute super."smt-lib"; + "smtlib2" = dontDistribute super."smtlib2"; + "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; + "smtp2mta" = dontDistribute super."smtp2mta"; + "smtps-gmail" = dontDistribute super."smtps-gmail"; + "snake-game" = dontDistribute super."snake-game"; + "snap-accept" = dontDistribute super."snap-accept"; + "snap-app" = dontDistribute super."snap-app"; + "snap-auth-cli" = dontDistribute super."snap-auth-cli"; + "snap-blaze" = dontDistribute super."snap-blaze"; + "snap-blaze-clay" = dontDistribute super."snap-blaze-clay"; + "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities"; + "snap-cors" = dontDistribute super."snap-cors"; + "snap-elm" = dontDistribute super."snap-elm"; + "snap-error-collector" = dontDistribute super."snap-error-collector"; + "snap-extras" = dontDistribute super."snap-extras"; + "snap-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-hasql" = dontDistribute super."snaplet-hasql"; + "snaplet-haxl" = dontDistribute super."snaplet-haxl"; + "snaplet-hdbc" = dontDistribute super."snaplet-hdbc"; + "snaplet-hslogger" = dontDistribute super."snaplet-hslogger"; + "snaplet-i18n" = dontDistribute super."snaplet-i18n"; + "snaplet-influxdb" = dontDistribute super."snaplet-influxdb"; + "snaplet-lss" = dontDistribute super."snaplet-lss"; + "snaplet-mandrill" = dontDistribute super."snaplet-mandrill"; + "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB"; + "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic"; + "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple"; + "snaplet-oauth" = dontDistribute super."snaplet-oauth"; + "snaplet-persistent" = dontDistribute super."snaplet-persistent"; + "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple"; + "snaplet-postmark" = dontDistribute super."snaplet-postmark"; + "snaplet-purescript" = dontDistribute super."snaplet-purescript"; + "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha"; + "snaplet-redis" = dontDistribute super."snaplet-redis"; + "snaplet-redson" = dontDistribute super."snaplet-redson"; + "snaplet-rest" = dontDistribute super."snaplet-rest"; + "snaplet-riak" = dontDistribute super."snaplet-riak"; + "snaplet-sass" = dontDistribute super."snaplet-sass"; + "snaplet-sedna" = dontDistribute super."snaplet-sedna"; + "snaplet-ses-html" = dontDistribute super."snaplet-ses-html"; + "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple"; + "snaplet-stripe" = dontDistribute super."snaplet-stripe"; + "snaplet-tasks" = dontDistribute super."snaplet-tasks"; + "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions"; + "snaplet-wordpress" = dontDistribute super."snaplet-wordpress"; + "snappy" = dontDistribute super."snappy"; + "snappy-conduit" = dontDistribute super."snappy-conduit"; + "snappy-framing" = dontDistribute super."snappy-framing"; + "snappy-iteratee" = dontDistribute super."snappy-iteratee"; + "sndfile-enumerators" = dontDistribute super."sndfile-enumerators"; + "sneakyterm" = dontDistribute super."sneakyterm"; + "sneathlane-haste" = dontDistribute super."sneathlane-haste"; + "snippet-extractor" = dontDistribute super."snippet-extractor"; + "snm" = dontDistribute super."snm"; + "snow-white" = dontDistribute super."snow-white"; + "snowball" = dontDistribute super."snowball"; + "snowglobe" = dontDistribute super."snowglobe"; + "soap" = dontDistribute super."soap"; + "soap-openssl" = dontDistribute super."soap-openssl"; + "soap-tls" = dontDistribute super."soap-tls"; + "sock2stream" = dontDistribute super."sock2stream"; + "sockaddr" = dontDistribute super."sockaddr"; + "socket" = dontDistribute super."socket"; + "socket-activation" = dontDistribute super."socket-activation"; + "socket-sctp" = dontDistribute super."socket-sctp"; + "socketio" = dontDistribute super."socketio"; + "soegtk" = dontDistribute super."soegtk"; + "sonic-visualiser" = dontDistribute super."sonic-visualiser"; + "sophia" = dontDistribute super."sophia"; + "sort-by-pinyin" = dontDistribute super."sort-by-pinyin"; + "sorted" = dontDistribute super."sorted"; + "sorted-list" = dontDistribute super."sorted-list"; + "sorting" = dontDistribute super."sorting"; + "sorty" = dontDistribute super."sorty"; + "sound-collage" = dontDistribute super."sound-collage"; + "sounddelay" = dontDistribute super."sounddelay"; + "source-code-server" = dontDistribute super."source-code-server"; + "sousit" = dontDistribute super."sousit"; + "sox" = dontDistribute super."sox"; + "soxlib" = dontDistribute super."soxlib"; + "soyuz" = dontDistribute super."soyuz"; + "spacefill" = dontDistribute super."spacefill"; + "spacepart" = dontDistribute super."spacepart"; + "spaceprobe" = dontDistribute super."spaceprobe"; + "spanout" = dontDistribute super."spanout"; + "sparse" = dontDistribute super."sparse"; + "sparse-lin-alg" = dontDistribute super."sparse-lin-alg"; + "sparsebit" = dontDistribute super."sparsebit"; + "sparsecheck" = dontDistribute super."sparsecheck"; + "sparser" = dontDistribute super."sparser"; + "spata" = dontDistribute super."spata"; + "spatial-math" = dontDistribute super."spatial-math"; + "spawn" = dontDistribute super."spawn"; + "spdx" = doDistribute super."spdx_0_2_0_0"; + "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-memo" = dontDistribute super."stable-memo"; + "stable-tree" = dontDistribute super."stable-tree"; + "stack-prism" = dontDistribute super."stack-prism"; + "stackage-curator" = dontDistribute super."stackage-curator"; + "standalone-haddock" = dontDistribute super."standalone-haddock"; + "star-to-star" = dontDistribute super."star-to-star"; + "star-to-star-contra" = dontDistribute super."star-to-star-contra"; + "starling" = dontDistribute super."starling"; + "starrover2" = dontDistribute super."starrover2"; + "stash" = dontDistribute super."stash"; + "state" = dontDistribute super."state"; + "state-plus" = dontDistribute super."state-plus"; + "state-record" = dontDistribute super."state-record"; + "stateWriter" = dontDistribute super."stateWriter"; + "statechart" = dontDistribute super."statechart"; + "stateful-mtl" = dontDistribute super."stateful-mtl"; + "statethread" = dontDistribute super."statethread"; + "statgrab" = dontDistribute super."statgrab"; + "static-hash" = dontDistribute super."static-hash"; + "static-resources" = dontDistribute super."static-resources"; + "staticanalysis" = dontDistribute super."staticanalysis"; + "statistics-dirichlet" = dontDistribute super."statistics-dirichlet"; + "statistics-fusion" = dontDistribute super."statistics-fusion"; + "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; + "stats" = dontDistribute super."stats"; + "statsd" = dontDistribute super."statsd"; + "statsd-datadog" = dontDistribute super."statsd-datadog"; + "statvfs" = dontDistribute super."statvfs"; + "stb-image" = dontDistribute super."stb-image"; + "stb-truetype" = dontDistribute super."stb-truetype"; + "stdata" = dontDistribute super."stdata"; + "stdf" = dontDistribute super."stdf"; + "steambrowser" = dontDistribute super."steambrowser"; + "steeloverseer" = dontDistribute super."steeloverseer"; + "stemmer" = dontDistribute super."stemmer"; + "step-function" = dontDistribute super."step-function"; + "stepwise" = dontDistribute super."stepwise"; + "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey"; + "stitch" = dontDistribute super."stitch"; + "stm-channelize" = dontDistribute super."stm-channelize"; + "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; + "stm-firehose" = dontDistribute super."stm-firehose"; + "stm-io-hooks" = dontDistribute super."stm-io-hooks"; + "stm-lifted" = dontDistribute super."stm-lifted"; + "stm-linkedlist" = dontDistribute super."stm-linkedlist"; + "stm-orelse-io" = dontDistribute super."stm-orelse-io"; + "stm-promise" = dontDistribute super."stm-promise"; + "stm-queue-extras" = dontDistribute super."stm-queue-extras"; + "stm-sbchan" = dontDistribute super."stm-sbchan"; + "stm-split" = dontDistribute super."stm-split"; + "stm-tlist" = dontDistribute super."stm-tlist"; + "stmcontrol" = dontDistribute super."stmcontrol"; + "stomp-conduit" = dontDistribute super."stomp-conduit"; + "stomp-patterns" = dontDistribute super."stomp-patterns"; + "stomp-queue" = dontDistribute super."stomp-queue"; + "stompl" = dontDistribute super."stompl"; + "stopwatch" = dontDistribute super."stopwatch"; + "storable" = dontDistribute super."storable"; + "storable-record" = dontDistribute super."storable-record"; + "storable-static-array" = dontDistribute super."storable-static-array"; + "storable-tuple" = dontDistribute super."storable-tuple"; + "storablevector" = dontDistribute super."storablevector"; + "storablevector-carray" = dontDistribute super."storablevector-carray"; + "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion"; + "str" = dontDistribute super."str"; + "stratum-tool" = dontDistribute super."stratum-tool"; + "stream-fusion" = dontDistribute super."stream-fusion"; + "stream-monad" = dontDistribute super."stream-monad"; + "streamed" = dontDistribute super."streamed"; + "streaming" = dontDistribute super."streaming"; + "streaming-bytestring" = dontDistribute super."streaming-bytestring"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_13"; + "streaming-histogram" = dontDistribute super."streaming-histogram"; + "streaming-utils" = dontDistribute super."streaming-utils"; + "streamproc" = dontDistribute super."streamproc"; + "strict-base-types" = dontDistribute super."strict-base-types"; + "strict-concurrency" = dontDistribute super."strict-concurrency"; + "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; + "strict-identity" = dontDistribute super."strict-identity"; + "strict-io" = dontDistribute super."strict-io"; + "strictify" = dontDistribute super."strictify"; + "strictly" = dontDistribute super."strictly"; + "string" = dontDistribute super."string"; + "string-conv" = dontDistribute super."string-conv"; + "string-convert" = dontDistribute super."string-convert"; + "string-qq" = dontDistribute super."string-qq"; + "string-quote" = dontDistribute super."string-quote"; + "string-similarity" = dontDistribute super."string-similarity"; + "stringlike" = dontDistribute super."stringlike"; + "stringprep" = dontDistribute super."stringprep"; + "strings" = dontDistribute super."strings"; + "stringtable-atom" = dontDistribute super."stringtable-atom"; + "strio" = dontDistribute super."strio"; + "stripe" = dontDistribute super."stripe"; + "stripe-haskell" = dontDistribute super."stripe-haskell"; + "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"; + "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"; + "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"; + "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"; + "swapper" = dontDistribute super."swapper"; + "swearjure" = dontDistribute super."swearjure"; + "swf" = dontDistribute super."swf"; + "swift-lda" = dontDistribute super."swift-lda"; + "swish" = dontDistribute super."swish"; + "sws" = dontDistribute super."sws"; + "syb-extras" = dontDistribute super."syb-extras"; + "syb-with-class" = dontDistribute super."syb-with-class"; + "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text"; + "sylvia" = dontDistribute super."sylvia"; + "sym" = dontDistribute super."sym"; + "sym-plot" = dontDistribute super."sym-plot"; + "sync" = dontDistribute super."sync"; + "sync-mht" = dontDistribute super."sync-mht"; + "synchronous-channels" = dontDistribute super."synchronous-channels"; + "syncthing-hs" = dontDistribute super."syncthing-hs"; + "synt" = dontDistribute super."synt"; + "syntactic" = dontDistribute super."syntactic"; + "syntactical" = dontDistribute super."syntactical"; + "syntax" = dontDistribute super."syntax"; + "syntax-attoparsec" = dontDistribute super."syntax-attoparsec"; + "syntax-example" = dontDistribute super."syntax-example"; + "syntax-example-json" = dontDistribute super."syntax-example-json"; + "syntax-pretty" = dontDistribute super."syntax-pretty"; + "syntax-printer" = dontDistribute super."syntax-printer"; + "syntax-trees" = dontDistribute super."syntax-trees"; + "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn"; + "synthesizer" = dontDistribute super."synthesizer"; + "synthesizer-alsa" = dontDistribute super."synthesizer-alsa"; + "synthesizer-core" = dontDistribute super."synthesizer-core"; + "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional"; + "synthesizer-inference" = dontDistribute super."synthesizer-inference"; + "synthesizer-llvm" = dontDistribute super."synthesizer-llvm"; + "synthesizer-midi" = dontDistribute super."synthesizer-midi"; + "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient"; + "sys-process" = dontDistribute super."sys-process"; + "system-canonicalpath" = dontDistribute super."system-canonicalpath"; + "system-command" = dontDistribute super."system-command"; + "system-gpio" = dontDistribute super."system-gpio"; + "system-inotify" = dontDistribute super."system-inotify"; + "system-lifted" = dontDistribute super."system-lifted"; + "system-random-effect" = dontDistribute super."system-random-effect"; + "system-time-monotonic" = dontDistribute super."system-time-monotonic"; + "system-util" = dontDistribute super."system-util"; + "system-uuid" = dontDistribute super."system-uuid"; + "systemd" = dontDistribute super."systemd"; + "syz" = dontDistribute super."syz"; + "t-regex" = dontDistribute super."t-regex"; + "ta" = dontDistribute super."ta"; + "table" = dontDistribute super."table"; + "table-tennis" = dontDistribute super."table-tennis"; + "tableaux" = dontDistribute super."tableaux"; + "tables" = dontDistribute super."tables"; + "tablestorage" = dontDistribute super."tablestorage"; + "tabloid" = dontDistribute super."tabloid"; + "taffybar" = dontDistribute super."taffybar"; + "tag-bits" = dontDistribute super."tag-bits"; + "tag-stream" = dontDistribute super."tag-stream"; + "tagchup" = dontDistribute super."tagchup"; + "tagged-exception-core" = dontDistribute super."tagged-exception-core"; + "tagged-list" = dontDistribute super."tagged-list"; + "tagged-th" = dontDistribute super."tagged-th"; + "tagged-transformer" = dontDistribute super."tagged-transformer"; + "tagging" = dontDistribute super."tagging"; + "taggy" = dontDistribute super."taggy"; + "taggy-lens" = dontDistribute super."taggy-lens"; + "taglib" = dontDistribute super."taglib"; + "taglib-api" = dontDistribute super."taglib-api"; + "tagset-positional" = dontDistribute super."tagset-positional"; + "tagsoup-ht" = dontDistribute super."tagsoup-ht"; + "tagsoup-parsec" = dontDistribute super."tagsoup-parsec"; + "takahashi" = dontDistribute super."takahashi"; + "takusen-oracle" = dontDistribute super."takusen-oracle"; + "tamarin-prover" = dontDistribute super."tamarin-prover"; + "tamarin-prover-term" = dontDistribute super."tamarin-prover-term"; + "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory"; + "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils"; + "tamper" = dontDistribute super."tamper"; + "target" = dontDistribute super."target"; + "task" = dontDistribute super."task"; + "taskpool" = dontDistribute super."taskpool"; + "tasty-expected-failure" = dontDistribute super."tasty-expected-failure"; + "tasty-html" = dontDistribute super."tasty-html"; + "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; + "tasty-integrate" = dontDistribute super."tasty-integrate"; + "tasty-laws" = dontDistribute super."tasty-laws"; + "tasty-lens" = dontDistribute super."tasty-lens"; + "tasty-program" = dontDistribute super."tasty-program"; + "tasty-tap" = dontDistribute super."tasty-tap"; + "tau" = dontDistribute super."tau"; + "tbox" = dontDistribute super."tbox"; + "tcache-AWS" = dontDistribute super."tcache-AWS"; + "tccli" = dontDistribute super."tccli"; + "tce-conf" = dontDistribute super."tce-conf"; + "tconfig" = dontDistribute super."tconfig"; + "tcp" = dontDistribute super."tcp"; + "tdd-util" = dontDistribute super."tdd-util"; + "tdoc" = dontDistribute super."tdoc"; + "teams" = dontDistribute super."teams"; + "teeth" = dontDistribute super."teeth"; + "telegram" = dontDistribute super."telegram"; + "tellbot" = dontDistribute super."tellbot"; + "template-default" = dontDistribute super."template-default"; + "template-haskell-util" = dontDistribute super."template-haskell-util"; + "template-hsml" = dontDistribute super."template-hsml"; + "templatepg" = dontDistribute super."templatepg"; + "templater" = dontDistribute super."templater"; + "tempodb" = dontDistribute super."tempodb"; + "temporal-csound" = dontDistribute super."temporal-csound"; + "temporal-media" = dontDistribute super."temporal-media"; + "temporal-music-notation" = dontDistribute super."temporal-music-notation"; + "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo"; + "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western"; + "temporary-resourcet" = dontDistribute super."temporary-resourcet"; + "tempus" = dontDistribute super."tempus"; + "tempus-fugit" = dontDistribute super."tempus-fugit"; + "tensor" = dontDistribute super."tensor"; + "term-rewriting" = dontDistribute super."term-rewriting"; + "termbox-bindings" = dontDistribute super."termbox-bindings"; + "termination-combinators" = dontDistribute super."termination-combinators"; + "terminfo" = doDistribute super."terminfo_0_4_0_1"; + "terminfo-hs" = dontDistribute super."terminfo-hs"; + "terrahs" = dontDistribute super."terrahs"; + "tersmu" = dontDistribute super."tersmu"; + "test-framework-doctest" = dontDistribute super."test-framework-doctest"; + "test-framework-golden" = dontDistribute super."test-framework-golden"; + "test-framework-program" = dontDistribute super."test-framework-program"; + "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck"; + "test-framework-sandbox" = dontDistribute super."test-framework-sandbox"; + "test-framework-skip" = dontDistribute super."test-framework-skip"; + "test-framework-smallcheck" = dontDistribute super."test-framework-smallcheck"; + "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat"; + "test-framework-th-prime" = dontDistribute super."test-framework-th-prime"; + "test-invariant" = dontDistribute super."test-invariant"; + "test-pkg" = dontDistribute super."test-pkg"; + "test-sandbox" = dontDistribute super."test-sandbox"; + "test-sandbox-compose" = dontDistribute super."test-sandbox-compose"; + "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit"; + "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck"; + "test-shouldbe" = dontDistribute super."test-shouldbe"; + "test-simple" = dontDistribute super."test-simple"; + "testPkg" = dontDistribute super."testPkg"; + "testing-type-modifiers" = dontDistribute super."testing-type-modifiers"; + "testloop" = dontDistribute super."testloop"; + "testpack" = dontDistribute super."testpack"; + "testpattern" = dontDistribute super."testpattern"; + "testrunner" = dontDistribute super."testrunner"; + "tetris" = dontDistribute super."tetris"; + "tex2txt" = dontDistribute super."tex2txt"; + "texrunner" = dontDistribute super."texrunner"; + "text-and-plots" = dontDistribute super."text-and-plots"; + "text-format-simple" = dontDistribute super."text-format-simple"; + "text-icu-translit" = dontDistribute super."text-icu-translit"; + "text-json-qq" = dontDistribute super."text-json-qq"; + "text-latin1" = dontDistribute super."text-latin1"; + "text-ldap" = dontDistribute super."text-ldap"; + "text-locale-encoding" = dontDistribute super."text-locale-encoding"; + "text-normal" = dontDistribute super."text-normal"; + "text-position" = dontDistribute super."text-position"; + "text-printer" = dontDistribute super."text-printer"; + "text-regex-replace" = dontDistribute super."text-regex-replace"; + "text-register-machine" = dontDistribute super."text-register-machine"; + "text-render" = dontDistribute super."text-render"; + "text-show" = doDistribute super."text-show_2"; + "text-show-instances" = dontDistribute super."text-show-instances"; + "text-stream-decode" = dontDistribute super."text-stream-decode"; + "text-utf7" = dontDistribute super."text-utf7"; + "text-xml-generic" = dontDistribute super."text-xml-generic"; + "text-xml-qq" = dontDistribute super."text-xml-qq"; + "text-zipper" = dontDistribute super."text-zipper"; + "text1" = dontDistribute super."text1"; + "textPlot" = dontDistribute super."textPlot"; + "textmatetags" = dontDistribute super."textmatetags"; + "textocat-api" = dontDistribute super."textocat-api"; + "texts" = dontDistribute super."texts"; + "tfp" = dontDistribute super."tfp"; + "tfp-th" = dontDistribute super."tfp-th"; + "tftp" = dontDistribute super."tftp"; + "tga" = dontDistribute super."tga"; + "th-alpha" = dontDistribute super."th-alpha"; + "th-build" = dontDistribute super."th-build"; + "th-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-lift-instances" = dontDistribute super."th-lift-instances"; + "th-printf" = dontDistribute super."th-printf"; + "th-sccs" = dontDistribute super."th-sccs"; + "th-traced" = dontDistribute super."th-traced"; + "th-typegraph" = dontDistribute super."th-typegraph"; + "themoviedb" = dontDistribute super."themoviedb"; + "themplate" = dontDistribute super."themplate"; + "theoremquest" = dontDistribute super."theoremquest"; + "theoremquest-client" = dontDistribute super."theoremquest-client"; + "these" = dontDistribute super."these"; + "thespian" = dontDistribute super."thespian"; + "theta-functions" = dontDistribute super."theta-functions"; + "thih" = dontDistribute super."thih"; + "thimk" = dontDistribute super."thimk"; + "thorn" = dontDistribute super."thorn"; + "thread-local-storage" = dontDistribute super."thread-local-storage"; + "threadPool" = dontDistribute super."threadPool"; + "threadmanager" = dontDistribute super."threadmanager"; + "threads-pool" = dontDistribute super."threads-pool"; + "threads-supervisor" = dontDistribute super."threads-supervisor"; + "threadscope" = dontDistribute super."threadscope"; + "threefish" = dontDistribute super."threefish"; + "threepenny-gui" = dontDistribute super."threepenny-gui"; + "thrift" = dontDistribute super."thrift"; + "thrist" = dontDistribute super."thrist"; + "throttle" = dontDistribute super."throttle"; + "thumbnail" = dontDistribute super."thumbnail"; + "tianbar" = dontDistribute super."tianbar"; + "tic-tac-toe" = dontDistribute super."tic-tac-toe"; + "tickle" = dontDistribute super."tickle"; + "tictactoe3d" = dontDistribute super."tictactoe3d"; + "tidal" = dontDistribute super."tidal"; + "tidal-midi" = dontDistribute super."tidal-midi"; + "tidal-vis" = dontDistribute super."tidal-vis"; + "tie-knot" = dontDistribute super."tie-knot"; + "tiempo" = dontDistribute super."tiempo"; + "tiger" = dontDistribute super."tiger"; + "tight-apply" = dontDistribute super."tight-apply"; + "tightrope" = dontDistribute super."tightrope"; + "tighttp" = dontDistribute super."tighttp"; + "tilings" = dontDistribute super."tilings"; + "timberc" = dontDistribute super."timberc"; + "time-extras" = dontDistribute super."time-extras"; + "time-exts" = dontDistribute super."time-exts"; + "time-http" = dontDistribute super."time-http"; + "time-interval" = dontDistribute super."time-interval"; + "time-io-access" = dontDistribute super."time-io-access"; + "time-patterns" = dontDistribute super."time-patterns"; + "time-qq" = dontDistribute super."time-qq"; + "time-recurrence" = dontDistribute super."time-recurrence"; + "time-series" = dontDistribute super."time-series"; + "time-units" = dontDistribute super."time-units"; + "time-w3c" = dontDistribute super."time-w3c"; + "timecalc" = dontDistribute super."timecalc"; + "timeconsole" = dontDistribute super."timeconsole"; + "timeout" = dontDistribute super."timeout"; + "timeout-control" = dontDistribute super."timeout-control"; + "timeout-with-results" = dontDistribute super."timeout-with-results"; + "timeparsers" = dontDistribute super."timeparsers"; + "timeplot" = dontDistribute super."timeplot"; + "timers" = dontDistribute super."timers"; + "timers-updatable" = dontDistribute super."timers-updatable"; + "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; + "timestamper" = dontDistribute super."timestamper"; + "timezone-olson-th" = dontDistribute super."timezone-olson-th"; + "timing-convenience" = dontDistribute super."timing-convenience"; + "tinyMesh" = dontDistribute super."tinyMesh"; + "tinytemplate" = dontDistribute super."tinytemplate"; + "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; + "tip-lib" = dontDistribute super."tip-lib"; + "titlecase" = dontDistribute super."titlecase"; + "tkhs" = dontDistribute super."tkhs"; + "tkyprof" = dontDistribute super."tkyprof"; + "tld" = dontDistribute super."tld"; + "tls-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"; + "treeviz" = dontDistribute super."treeviz"; + "tremulous-query" = dontDistribute super."tremulous-query"; + "trhsx" = dontDistribute super."trhsx"; + "triangulation" = dontDistribute super."triangulation"; + "tries" = dontDistribute super."tries"; + "trimpolya" = dontDistribute super."trimpolya"; + "trivia" = dontDistribute super."trivia"; + "trivial-constraint" = dontDistribute super."trivial-constraint"; + "tropical" = dontDistribute super."tropical"; + "true-name" = dontDistribute super."true-name"; + "truelevel" = dontDistribute super."truelevel"; + "trurl" = dontDistribute super."trurl"; + "truthful" = dontDistribute super."truthful"; + "tsession" = dontDistribute super."tsession"; + "tsession-happstack" = dontDistribute super."tsession-happstack"; + "tskiplist" = dontDistribute super."tskiplist"; + "tslogger" = dontDistribute super."tslogger"; + "tsp-viz" = dontDistribute super."tsp-viz"; + "tsparse" = dontDistribute super."tsparse"; + "tst" = dontDistribute super."tst"; + "tsvsql" = dontDistribute super."tsvsql"; + "ttrie" = dontDistribute super."ttrie"; + "tttool" = doDistribute super."tttool_1_4_0_4"; + "tubes" = dontDistribute super."tubes"; + "tuntap" = dontDistribute super."tuntap"; + "tup-functor" = dontDistribute super."tup-functor"; + "tuple-gen" = dontDistribute super."tuple-gen"; + "tuple-generic" = dontDistribute super."tuple-generic"; + "tuple-hlist" = dontDistribute super."tuple-hlist"; + "tuple-lenses" = dontDistribute super."tuple-lenses"; + "tuple-morph" = dontDistribute super."tuple-morph"; + "tuple-th" = dontDistribute super."tuple-th"; + "tupleinstances" = dontDistribute super."tupleinstances"; + "turing-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-feed" = doDistribute super."twitter-feed_0_2_0_3"; + "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-digits" = dontDistribute super."type-digits"; + "type-equality" = dontDistribute super."type-equality"; + "type-equality-check" = dontDistribute super."type-equality-check"; + "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"; + "typedquery" = dontDistribute super."typedquery"; + "typehash" = dontDistribute super."typehash"; + "typelevel-tensor" = dontDistribute super."typelevel-tensor"; + "typeof" = dontDistribute super."typeof"; + "typeparams" = dontDistribute super."typeparams"; + "typesafe-endian" = dontDistribute super."typesafe-endian"; + "typescript-docs" = dontDistribute super."typescript-docs"; + "typical" = dontDistribute super."typical"; + "typography-geometry" = dontDistribute super."typography-geometry"; + "tz" = dontDistribute super."tz"; + "tzdata" = dontDistribute super."tzdata"; + "uAgda" = dontDistribute super."uAgda"; + "ua-parser" = dontDistribute super."ua-parser"; + "uacpid" = dontDistribute super."uacpid"; + "uberlast" = dontDistribute super."uberlast"; + "uconv" = dontDistribute super."uconv"; + "udbus" = dontDistribute super."udbus"; + "udbus-model" = dontDistribute super."udbus-model"; + "udcode" = dontDistribute super."udcode"; + "udev" = dontDistribute super."udev"; + "uglymemo" = dontDistribute super."uglymemo"; + "uhc-light" = dontDistribute super."uhc-light"; + "uhc-util" = dontDistribute super."uhc-util"; + "uhexdump" = dontDistribute super."uhexdump"; + "uhttpc" = dontDistribute super."uhttpc"; + "ui-command" = dontDistribute super."ui-command"; + "uid" = dontDistribute super."uid"; + "una" = dontDistribute super."una"; + "unagi-chan" = dontDistribute super."unagi-chan"; + "unagi-streams" = dontDistribute super."unagi-streams"; + "unamb" = dontDistribute super."unamb"; + "unamb-custom" = dontDistribute super."unamb-custom"; + "unbound" = dontDistribute super."unbound"; + "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; + "unboxed-containers" = dontDistribute super."unboxed-containers"; + "unexceptionalio" = dontDistribute super."unexceptionalio"; + "unfoldable" = dontDistribute super."unfoldable"; + "ungadtagger" = dontDistribute super."ungadtagger"; + "uni-events" = dontDistribute super."uni-events"; + "uni-graphs" = dontDistribute super."uni-graphs"; + "uni-htk" = dontDistribute super."uni-htk"; + "uni-posixutil" = dontDistribute super."uni-posixutil"; + "uni-reactor" = dontDistribute super."uni-reactor"; + "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph"; + "uni-util" = dontDistribute super."uni-util"; + "unicode" = dontDistribute super."unicode"; + "unicode-names" = dontDistribute super."unicode-names"; + "unicode-normalization" = dontDistribute super."unicode-normalization"; + "unicode-prelude" = dontDistribute super."unicode-prelude"; + "unicode-properties" = dontDistribute super."unicode-properties"; + "unicode-symbols" = dontDistribute super."unicode-symbols"; + "unicoder" = dontDistribute super."unicoder"; + "unification-fd" = dontDistribute super."unification-fd"; + "uniform-io" = dontDistribute super."uniform-io"; + "uniform-pair" = dontDistribute super."uniform-pair"; + "union-find-array" = dontDistribute super."union-find-array"; + "union-map" = dontDistribute super."union-map"; + "unique-logic" = dontDistribute super."unique-logic"; + "unique-logic-tf" = dontDistribute super."unique-logic-tf"; + "uniqueid" = dontDistribute super."uniqueid"; + "unit" = dontDistribute super."unit"; + "units" = dontDistribute super."units"; + "units-attoparsec" = dontDistribute super."units-attoparsec"; + "units-defs" = dontDistribute super."units-defs"; + "units-parser" = dontDistribute super."units-parser"; + "unittyped" = dontDistribute super."unittyped"; + "universal-binary" = dontDistribute super."universal-binary"; + "universe" = dontDistribute super."universe"; + "universe-base" = dontDistribute super."universe-base"; + "universe-instances-base" = dontDistribute super."universe-instances-base"; + "universe-instances-extended" = dontDistribute super."universe-instances-extended"; + "universe-instances-trans" = dontDistribute super."universe-instances-trans"; + "universe-reverse-instances" = dontDistribute super."universe-reverse-instances"; + "universe-th" = dontDistribute super."universe-th"; + "unix-bytestring" = dontDistribute super."unix-bytestring"; + "unix-fcntl" = dontDistribute super."unix-fcntl"; + "unix-handle" = dontDistribute super."unix-handle"; + "unix-io-extra" = dontDistribute super."unix-io-extra"; + "unix-memory" = dontDistribute super."unix-memory"; + "unix-process-conduit" = dontDistribute super."unix-process-conduit"; + "unix-pty-light" = dontDistribute super."unix-pty-light"; + "unlit" = dontDistribute super."unlit"; + "unm-hip" = dontDistribute super."unm-hip"; + "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch"; + "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"; + "userid" = dontDistribute super."userid"; + "utc" = dontDistribute super."utc"; + "utf8-env" = dontDistribute super."utf8-env"; + "utf8-prelude" = dontDistribute super."utf8-prelude"; + "utility-ht" = dontDistribute super."utility-ht"; + "uu-cco" = dontDistribute super."uu-cco"; + "uu-cco-examples" = dontDistribute super."uu-cco-examples"; + "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing"; + "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib"; + "uu-options" = dontDistribute super."uu-options"; + "uu-tc" = dontDistribute super."uu-tc"; + "uuagc" = dontDistribute super."uuagc"; + "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; + "uuagc-cabal" = dontDistribute super."uuagc-cabal"; + "uuagc-diagrams" = dontDistribute super."uuagc-diagrams"; + "uuagd" = dontDistribute super."uuagd"; + "uuid-aeson" = dontDistribute super."uuid-aeson"; + "uuid-le" = dontDistribute super."uuid-le"; + "uuid-orphans" = dontDistribute super."uuid-orphans"; + "uuid-quasi" = dontDistribute super."uuid-quasi"; + "uulib" = dontDistribute super."uulib"; + "uvector" = dontDistribute super."uvector"; + "uvector-algorithms" = dontDistribute super."uvector-algorithms"; + "uxadt" = dontDistribute super."uxadt"; + "uzbl-with-source" = dontDistribute super."uzbl-with-source"; + "v4l2" = dontDistribute super."v4l2"; + "v4l2-examples" = dontDistribute super."v4l2-examples"; + "vacuum" = dontDistribute super."vacuum"; + "vacuum-cairo" = dontDistribute super."vacuum-cairo"; + "vacuum-graphviz" = dontDistribute super."vacuum-graphviz"; + "vacuum-opengl" = dontDistribute super."vacuum-opengl"; + "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph"; + "vado" = dontDistribute super."vado"; + "valid-names" = dontDistribute super."valid-names"; + "validate" = dontDistribute super."validate"; + "validate-input" = doDistribute super."validate-input_0_2_0_0"; + "validated-literals" = dontDistribute super."validated-literals"; + "validation" = dontDistribute super."validation"; + "validations" = dontDistribute super."validations"; + "value-supply" = dontDistribute super."value-supply"; + "vampire" = dontDistribute super."vampire"; + "var" = dontDistribute super."var"; + "varan" = dontDistribute super."varan"; + "variable-precision" = dontDistribute super."variable-precision"; + "variables" = dontDistribute super."variables"; + "varying" = dontDistribute super."varying"; + "vaultaire-common" = dontDistribute super."vaultaire-common"; + "vcache" = dontDistribute super."vcache"; + "vcache-trie" = dontDistribute super."vcache-trie"; + "vcard" = dontDistribute super."vcard"; + "vcd" = dontDistribute super."vcd"; + "vcs-revision" = dontDistribute super."vcs-revision"; + "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse"; + "vcsgui" = dontDistribute super."vcsgui"; + "vcswrapper" = dontDistribute super."vcswrapper"; + "vect" = dontDistribute super."vect"; + "vect-floating" = dontDistribute super."vect-floating"; + "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; + "vect-opengl" = dontDistribute super."vect-opengl"; + "vector-binary" = dontDistribute super."vector-binary"; + "vector-bytestring" = dontDistribute super."vector-bytestring"; + "vector-clock" = dontDistribute super."vector-clock"; + "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = dontDistribute super."vector-fftw"; + "vector-functorlazy" = dontDistribute super."vector-functorlazy"; + "vector-heterogenous" = dontDistribute super."vector-heterogenous"; + "vector-instances-collections" = dontDistribute super."vector-instances-collections"; + "vector-mmap" = dontDistribute super."vector-mmap"; + "vector-random" = dontDistribute super."vector-random"; + "vector-read-instances" = dontDistribute super."vector-read-instances"; + "vector-space-map" = dontDistribute super."vector-space-map"; + "vector-space-opengl" = dontDistribute super."vector-space-opengl"; + "vector-static" = dontDistribute super."vector-static"; + "vector-strategies" = dontDistribute super."vector-strategies"; + "verbalexpressions" = dontDistribute super."verbalexpressions"; + "verbosity" = dontDistribute super."verbosity"; + "verilog" = dontDistribute super."verilog"; + "vhdl" = dontDistribute super."vhdl"; + "views" = dontDistribute super."views"; + "vigilance" = dontDistribute super."vigilance"; + "vimeta" = dontDistribute super."vimeta"; + "vimus" = dontDistribute super."vimus"; + "vintage-basic" = dontDistribute super."vintage-basic"; + "vinyl" = dontDistribute super."vinyl"; + "vinyl-gl" = dontDistribute super."vinyl-gl"; + "vinyl-json" = dontDistribute super."vinyl-json"; + "vinyl-utils" = dontDistribute super."vinyl-utils"; + "virthualenv" = dontDistribute super."virthualenv"; + "vision" = dontDistribute super."vision"; + "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; + "visual-prof" = dontDistribute super."visual-prof"; + "vivid" = dontDistribute super."vivid"; + "vk-aws-route53" = dontDistribute super."vk-aws-route53"; + "vk-posix-pty" = dontDistribute super."vk-posix-pty"; + "vocabulary-kadma" = dontDistribute super."vocabulary-kadma"; + "vorbiscomment" = dontDistribute super."vorbiscomment"; + "vowpal-utils" = dontDistribute super."vowpal-utils"; + "voyeur" = dontDistribute super."voyeur"; + "vte" = dontDistribute super."vte"; + "vtegtk3" = dontDistribute super."vtegtk3"; + "vty" = dontDistribute super."vty"; + "vty-examples" = dontDistribute super."vty-examples"; + "vty-menu" = dontDistribute super."vty-menu"; + "vty-ui" = dontDistribute super."vty-ui"; + "vty-ui-extras" = dontDistribute super."vty-ui-extras"; + "waddle" = dontDistribute super."waddle"; + "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; + "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; + "wai-dispatch" = dontDistribute super."wai-dispatch"; + "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; + "wai-graceful" = dontDistribute super."wai-graceful"; + "wai-handler-devel" = dontDistribute super."wai-handler-devel"; + "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi"; + "wai-handler-scgi" = dontDistribute super."wai-handler-scgi"; + "wai-handler-snap" = dontDistribute super."wai-handler-snap"; + "wai-handler-webkit" = dontDistribute super."wai-handler-webkit"; + "wai-hastache" = dontDistribute super."wai-hastache"; + "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; + "wai-lens" = dontDistribute super."wai-lens"; + "wai-lite" = dontDistribute super."wai-lite"; + "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; + "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; + "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; + "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type"; + "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; + "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; + "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; + "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac"; + "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client"; + "wai-middleware-metrics" = dontDistribute super."wai-middleware-metrics"; + "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; + "wai-middleware-route" = dontDistribute super."wai-middleware-route"; + "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; + "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; + "wai-request-spec" = dontDistribute super."wai-request-spec"; + "wai-responsible" = dontDistribute super."wai-responsible"; + "wai-router" = dontDistribute super."wai-router"; + "wai-routes" = doDistribute super."wai-routes_0_7_3"; + "wai-session-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-throttler" = dontDistribute super."wai-throttler"; + "wai-transformers" = dontDistribute super."wai-transformers"; + "wai-util" = dontDistribute super."wai-util"; + "wait-handle" = dontDistribute super."wait-handle"; + "waitfree" = dontDistribute super."waitfree"; + "warc" = dontDistribute super."warc"; + "warp-dynamic" = dontDistribute super."warp-dynamic"; + "warp-static" = dontDistribute super."warp-static"; + "warp-tls-uid" = dontDistribute super."warp-tls-uid"; + "watchdog" = dontDistribute super."watchdog"; + "watcher" = dontDistribute super."watcher"; + "watchit" = dontDistribute super."watchit"; + "wavconvert" = dontDistribute super."wavconvert"; + "wavesurfer" = dontDistribute super."wavesurfer"; + "wavy" = dontDistribute super."wavy"; + "wcwidth" = dontDistribute super."wcwidth"; + "weather-api" = dontDistribute super."weather-api"; + "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell"; + "web-css" = dontDistribute super."web-css"; + "web-encodings" = dontDistribute super."web-encodings"; + "web-mongrel2" = dontDistribute super."web-mongrel2"; + "web-page" = dontDistribute super."web-page"; + "web-plugins" = dontDistribute super."web-plugins"; + "web-routes" = dontDistribute super."web-routes"; + "web-routes-boomerang" = dontDistribute super."web-routes-boomerang"; + "web-routes-happstack" = dontDistribute super."web-routes-happstack"; + "web-routes-hsp" = dontDistribute super."web-routes-hsp"; + "web-routes-mtl" = dontDistribute super."web-routes-mtl"; + "web-routes-quasi" = dontDistribute super."web-routes-quasi"; + "web-routes-regular" = dontDistribute super."web-routes-regular"; + "web-routes-th" = dontDistribute super."web-routes-th"; + "web-routes-transformers" = dontDistribute super."web-routes-transformers"; + "web-routes-wai" = dontDistribute super."web-routes-wai"; + "webcrank" = dontDistribute super."webcrank"; + "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; + "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver-snoy" = dontDistribute super."webdriver-snoy"; + "webidl" = dontDistribute super."webidl"; + "webify" = dontDistribute super."webify"; + "webkit" = dontDistribute super."webkit"; + "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore"; + "webkitgtk3" = dontDistribute super."webkitgtk3"; + "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore"; + "webrtc-vad" = dontDistribute super."webrtc-vad"; + "webserver" = dontDistribute super."webserver"; + "websnap" = dontDistribute super."websnap"; + "websockets-snap" = dontDistribute super."websockets-snap"; + "webwire" = dontDistribute super."webwire"; + "wedding-announcement" = dontDistribute super."wedding-announcement"; + "wedged" = dontDistribute super."wedged"; + "weighted-regexp" = dontDistribute super."weighted-regexp"; + "weighted-search" = dontDistribute super."weighted-search"; + "welshy" = dontDistribute super."welshy"; + "wheb-mongo" = dontDistribute super."wheb-mongo"; + "wheb-redis" = dontDistribute super."wheb-redis"; + "wheb-strapped" = dontDistribute super."wheb-strapped"; + "while-lang-parser" = dontDistribute super."while-lang-parser"; + "whim" = dontDistribute super."whim"; + "whiskers" = dontDistribute super."whiskers"; + "whitespace" = dontDistribute super."whitespace"; + "whois" = dontDistribute super."whois"; + "why3" = dontDistribute super."why3"; + "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"; + "word-trie" = dontDistribute super."word-trie"; + "word24" = dontDistribute super."word24"; + "wordcloud" = dontDistribute super."wordcloud"; + "wordexp" = dontDistribute super."wordexp"; + "words" = dontDistribute super."words"; + "wordsearch" = dontDistribute super."wordsearch"; + "wordsetdiff" = dontDistribute super."wordsetdiff"; + "wp-archivebot" = dontDistribute super."wp-archivebot"; + "wraparound" = dontDistribute super."wraparound"; + "wraxml" = dontDistribute super."wraxml"; + "wreq-sb" = dontDistribute super."wreq-sb"; + "wright" = dontDistribute super."wright"; + "wsedit" = dontDistribute super."wsedit"; + "wtk" = dontDistribute super."wtk"; + "wtk-gtk" = dontDistribute super."wtk-gtk"; + "wumpus-basic" = dontDistribute super."wumpus-basic"; + "wumpus-core" = dontDistribute super."wumpus-core"; + "wumpus-drawing" = dontDistribute super."wumpus-drawing"; + "wumpus-microprint" = dontDistribute super."wumpus-microprint"; + "wumpus-tree" = dontDistribute super."wumpus-tree"; + "wuss" = dontDistribute super."wuss"; + "wx" = dontDistribute super."wx"; + "wxAsteroids" = dontDistribute super."wxAsteroids"; + "wxFruit" = dontDistribute super."wxFruit"; + "wxc" = dontDistribute super."wxc"; + "wxcore" = dontDistribute super."wxcore"; + "wxdirect" = dontDistribute super."wxdirect"; + "wxhnotepad" = dontDistribute super."wxhnotepad"; + "wxturtle" = dontDistribute super."wxturtle"; + "wybor" = dontDistribute super."wybor"; + "wyvern" = dontDistribute super."wyvern"; + "x-dsp" = dontDistribute super."x-dsp"; + "x11-xim" = dontDistribute super."x11-xim"; + "x11-xinput" = dontDistribute super."x11-xinput"; + "x509-util" = dontDistribute super."x509-util"; + "xattr" = dontDistribute super."xattr"; + "xbattbar" = dontDistribute super."xbattbar"; + "xcb-types" = dontDistribute super."xcb-types"; + "xcffib" = dontDistribute super."xcffib"; + "xchat-plugin" = dontDistribute super."xchat-plugin"; + "xcp" = dontDistribute super."xcp"; + "xdg-basedir" = dontDistribute super."xdg-basedir"; + "xdg-userdirs" = dontDistribute super."xdg-userdirs"; + "xdot" = dontDistribute super."xdot"; + "xfconf" = dontDistribute super."xfconf"; + "xhaskell-library" = dontDistribute super."xhaskell-library"; + "xhb" = dontDistribute super."xhb"; + "xhb-atom-cache" = dontDistribute super."xhb-atom-cache"; + "xhb-ewmh" = dontDistribute super."xhb-ewmh"; + "xhtml" = doDistribute super."xhtml_3000_2_1"; + "xhtml-combinators" = dontDistribute super."xhtml-combinators"; + "xilinx-lava" = dontDistribute super."xilinx-lava"; + "xine" = dontDistribute super."xine"; + "xing-api" = dontDistribute super."xing-api"; + "xinput-conduit" = dontDistribute super."xinput-conduit"; + "xkbcommon" = dontDistribute super."xkbcommon"; + "xkcd" = dontDistribute super."xkcd"; + "xlsx-templater" = dontDistribute super."xlsx-templater"; + "xml-basic" = dontDistribute super."xml-basic"; + "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit-parse" = dontDistribute super."xml-conduit-parse"; + "xml-conduit-writer" = dontDistribute super."xml-conduit-writer"; + "xml-enumerator" = dontDistribute super."xml-enumerator"; + "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; + "xml-extractors" = dontDistribute super."xml-extractors"; + "xml-helpers" = dontDistribute super."xml-helpers"; + "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens"; + "xml-monad" = dontDistribute super."xml-monad"; + "xml-parsec" = dontDistribute super."xml-parsec"; + "xml-picklers" = dontDistribute super."xml-picklers"; + "xml-pipe" = dontDistribute super."xml-pipe"; + "xml-prettify" = dontDistribute super."xml-prettify"; + "xml-push" = dontDistribute super."xml-push"; + "xml2html" = dontDistribute super."xml2html"; + "xml2json" = dontDistribute super."xml2json"; + "xml2x" = dontDistribute super."xml2x"; + "xmltv" = dontDistribute super."xmltv"; + "xmms2-client" = dontDistribute super."xmms2-client"; + "xmms2-client-glib" = dontDistribute super."xmms2-client-glib"; + "xmobar" = dontDistribute super."xmobar"; + "xmonad" = dontDistribute super."xmonad"; + "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch"; + "xmonad-contrib" = dontDistribute super."xmonad-contrib"; + "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch"; + "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl"; + "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper"; + "xmonad-eval" = dontDistribute super."xmonad-eval"; + "xmonad-extras" = dontDistribute super."xmonad-extras"; + "xmonad-screenshot" = dontDistribute super."xmonad-screenshot"; + "xmonad-utils" = dontDistribute super."xmonad-utils"; + "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper"; + "xmonad-windownames" = dontDistribute super."xmonad-windownames"; + "xmpipe" = dontDistribute super."xmpipe"; + "xorshift" = dontDistribute super."xorshift"; + "xosd" = dontDistribute super."xosd"; + "xournal-builder" = dontDistribute super."xournal-builder"; + "xournal-convert" = dontDistribute super."xournal-convert"; + "xournal-parser" = dontDistribute super."xournal-parser"; + "xournal-render" = dontDistribute super."xournal-render"; + "xournal-types" = dontDistribute super."xournal-types"; + "xsact" = dontDistribute super."xsact"; + "xsd" = dontDistribute super."xsd"; + "xsha1" = dontDistribute super."xsha1"; + "xslt" = dontDistribute super."xslt"; + "xtc" = dontDistribute super."xtc"; + "xtest" = dontDistribute super."xtest"; + "xturtle" = dontDistribute super."xturtle"; + "xxhash" = dontDistribute super."xxhash"; + "y0l0bot" = dontDistribute super."y0l0bot"; + "yabi" = dontDistribute super."yabi"; + "yabi-muno" = dontDistribute super."yabi-muno"; + "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit"; + "yahoo-web-search" = dontDistribute super."yahoo-web-search"; + "yajl" = dontDistribute super."yajl"; + "yajl-enumerator" = dontDistribute super."yajl-enumerator"; + "yall" = dontDistribute super."yall"; + "yamemo" = dontDistribute super."yamemo"; + "yaml-config" = dontDistribute super."yaml-config"; + "yaml-light" = dontDistribute super."yaml-light"; + "yaml-light-lens" = dontDistribute super."yaml-light-lens"; + "yaml-rpc" = dontDistribute super."yaml-rpc"; + "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty"; + "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap"; + "yaml2owl" = dontDistribute super."yaml2owl"; + "yamlkeysdiff" = dontDistribute super."yamlkeysdiff"; + "yampa-canvas" = dontDistribute super."yampa-canvas"; + "yampa-glfw" = dontDistribute super."yampa-glfw"; + "yampa-glut" = dontDistribute super."yampa-glut"; + "yampa2048" = dontDistribute super."yampa2048"; + "yaop" = dontDistribute super."yaop"; + "yap" = dontDistribute super."yap"; + "yarr" = dontDistribute super."yarr"; + "yarr-image-io" = dontDistribute super."yarr-image-io"; + "yate" = dontDistribute super."yate"; + "yavie" = dontDistribute super."yavie"; + "ycextra" = dontDistribute super."ycextra"; + "yeganesh" = dontDistribute super."yeganesh"; + "yeller" = dontDistribute super."yeller"; + "yes-precure5-command" = dontDistribute super."yes-precure5-command"; + "yesod-angular" = dontDistribute super."yesod-angular"; + "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork"; + "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; + "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; + "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; + "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; + "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; + "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; + "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; + "yesod-comments" = dontDistribute super."yesod-comments"; + "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; + "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-crud" = dontDistribute super."yesod-crud"; + "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; + "yesod-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-mangopay" = doDistribute super."yesod-mangopay_1_11_4"; + "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-recaptcha" = dontDistribute super."yesod-recaptcha"; + "yesod-routes" = dontDistribute super."yesod-routes"; + "yesod-routes-flow" = dontDistribute super."yesod-routes-flow"; + "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript"; + "yesod-rst" = dontDistribute super."yesod-rst"; + "yesod-s3" = dontDistribute super."yesod-s3"; + "yesod-sass" = dontDistribute super."yesod-sass"; + "yesod-session-redis" = dontDistribute super."yesod-session-redis"; + "yesod-table" = doDistribute super."yesod-table_1_0_6"; + "yesod-tableview" = dontDistribute super."yesod-tableview"; + "yesod-test" = doDistribute super."yesod-test_1_4_4"; + "yesod-test-json" = dontDistribute super."yesod-test-json"; + "yesod-tls" = dontDistribute super."yesod-tls"; + "yesod-transloadit" = dontDistribute super."yesod-transloadit"; + "yesod-vend" = dontDistribute super."yesod-vend"; + "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra"; + "yesod-worker" = dontDistribute super."yesod-worker"; + "yet-another-logger" = dontDistribute super."yet-another-logger"; + "yhccore" = dontDistribute super."yhccore"; + "yi" = dontDistribute super."yi"; + "yi-contrib" = dontDistribute super."yi-contrib"; + "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; + "yi-fuzzy-open" = dontDistribute super."yi-fuzzy-open"; + "yi-gtk" = dontDistribute super."yi-gtk"; + "yi-language" = dontDistribute super."yi-language"; + "yi-monokai" = dontDistribute super."yi-monokai"; + "yi-rope" = dontDistribute super."yi-rope"; + "yi-snippet" = dontDistribute super."yi-snippet"; + "yi-solarized" = dontDistribute super."yi-solarized"; + "yi-spolsky" = dontDistribute super."yi-spolsky"; + "yi-vty" = dontDistribute super."yi-vty"; + "yices" = dontDistribute super."yices"; + "yices-easy" = dontDistribute super."yices-easy"; + "yices-painless" = dontDistribute super."yices-painless"; + "yjftp" = dontDistribute super."yjftp"; + "yjftp-libs" = dontDistribute super."yjftp-libs"; + "yjsvg" = dontDistribute super."yjsvg"; + "yjtools" = dontDistribute super."yjtools"; + "yocto" = dontDistribute super."yocto"; + "yoko" = dontDistribute super."yoko"; + "york-lava" = dontDistribute super."york-lava"; + "youtube" = dontDistribute super."youtube"; + "yql" = dontDistribute super."yql"; + "yst" = dontDistribute super."yst"; + "yuiGrid" = dontDistribute super."yuiGrid"; + "yuuko" = dontDistribute super."yuuko"; + "yxdb-utils" = dontDistribute super."yxdb-utils"; + "z3" = dontDistribute super."z3"; + "zalgo" = dontDistribute super."zalgo"; + "zampolit" = dontDistribute super."zampolit"; + "zasni-gerna" = dontDistribute super."zasni-gerna"; + "zcache" = dontDistribute super."zcache"; + "zenc" = dontDistribute super."zenc"; + "zendesk-api" = dontDistribute super."zendesk-api"; + "zeno" = dontDistribute super."zeno"; + "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"; + "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/default.nix b/pkgs/development/haskell-modules/default.nix index d3d65b6d64f..eda63a42674 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -44,7 +44,7 @@ let overrideScope = f: callPackageWithScope (mkScope (fix (extend scope.__unfix__ f))) drv args; }; - mkScope = scope: pkgs // pkgs.xlibs // pkgs.gnome // scope; + mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome // scope; defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b77293806ac..01cc139665a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1691,6 +1691,32 @@ self: { license = "GPL"; }) {}; + "BlogLiterately_0_8_1_2" = callPackage + ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs + , containers, data-default, directory, filepath, HaXml, haxr + , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc + , pandoc-types, parsec, process, split, strict, temporary + , transformers + }: + mkDerivation { + pname = "BlogLiterately"; + version = "0.8.1.2"; + sha256 = "740cf96f8d9b38d20740cc44440329632f2d5508fb42d9bf52f52052c33ed672"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html bool-extras bytestring cmdargs containers + data-default directory filepath HaXml haxr highlighting-kate + hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec + process split strict temporary transformers + ]; + executableHaskellDepends = [ base cmdargs ]; + homepage = "http://byorgey.wordpress.com/blogliterately/"; + description = "A tool for posting Haskelly articles to blogs"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "BlogLiterately-diagrams_0_1_4_3" = callPackage ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder , diagrams-cairo, diagrams-lib, directory, filepath, pandoc, safe @@ -3202,6 +3228,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ContextAlgebra" = callPackage + ({ mkDerivation, base, containers, lattices, multiset }: + mkDerivation { + pname = "ContextAlgebra"; + version = "0.1.0.0"; + sha256 = "e3acf793d5766ed33fc386adbc64ffd6b99ce77657465b29ca557cc978698ded"; + libraryHaskellDepends = [ base containers lattices multiset ]; + jailbreak = true; + description = "Context Algebra"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Contract" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -3484,7 +3522,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "DAV" = callPackage + "DAV_1_0_7" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , data-default, either, exceptions, http-client, http-client-tls , http-types, lens, mtl, network, network-uri, optparse-applicative @@ -3511,9 +3549,10 @@ self: { homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "DAV_1_2" = callPackage + "DAV" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , data-default, exceptions, http-client, http-client-tls , http-types, lens, mtl, mtl-compat, network, network-uri @@ -3541,7 +3580,6 @@ self: { homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DBlimited" = callPackage @@ -5709,16 +5747,17 @@ self: { }) {}; "FunGEn" = callPackage - ({ mkDerivation, base, GLUT, OpenGL, random }: + ({ mkDerivation, base, base-compat, GLUT, OpenGL, random }: mkDerivation { pname = "FunGEn"; - version = "0.4.6.1"; - sha256 = "d72dfb90f5f971d5c07024d39540d2a216ed1e55964358a222038a26904a3e6d"; + version = "1.0"; + sha256 = "119cb0c6bff7a5cf416f0c94a535a0695e4e461105841fed516d207f8c648686"; + revision = "4"; + editedCabalFile = "7994da4a472d9460df18724f7e96cece4ccd4a62516d76f26d14701ceed19623"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base GLUT OpenGL random ]; + libraryHaskellDepends = [ base base-compat GLUT OpenGL random ]; executableHaskellDepends = [ base GLUT OpenGL random ]; - jailbreak = true; homepage = "http://joyful.com/fungen"; description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine"; license = stdenv.lib.licenses.bsd3; @@ -5795,7 +5834,7 @@ self: { homepage = "http://haskell.org/haskellwiki/GLFW"; description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; "GLFW-OGL" = callPackage ({ mkDerivation, base, libX11, libXrandr, mtl, OGL }: @@ -5809,7 +5848,7 @@ self: { description = "A binding for GLFW (OGL)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXrandr;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; "GLFW-b" = callPackage ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework @@ -5871,7 +5910,36 @@ self: { librarySystemDepends = [ libX11 mesa ]; description = "Open OpenGL context windows in X11 with libX11"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;}; + + "GLM" = callPackage + ({ mkDerivation, aeson, base, bytestring, interpolate, lens, mtl + , parsec, pureMD5, QuickCheck, test-framework + , test-framework-quickcheck2, test-framework-th, transformers + }: + mkDerivation { + pname = "GLM"; + version = "0.5.0.0"; + sha256 = "cf0e0a4e3e0f05a700158adf48e470c9bb77a820219000bf91a29ac0c3725a0f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring interpolate lens mtl parsec pureMD5 QuickCheck + test-framework test-framework-quickcheck2 test-framework-th + transformers + ]; + executableHaskellDepends = [ + aeson base bytestring interpolate lens mtl parsec pureMD5 + test-framework test-framework-quickcheck2 test-framework-th + ]; + testHaskellDepends = [ + base lens mtl parsec test-framework test-framework-quickcheck2 + test-framework-th + ]; + homepage = "http://github.com/sordina/GLM"; + description = "Simple Gridlab-D GLM parser and utilities"; + license = stdenv.lib.licenses.mit; + }) {}; "GLMatrix" = callPackage ({ mkDerivation, base, OpenGLRaw }: @@ -6833,6 +6901,7 @@ self: { base bytestring directory inline-r process singletons tasty tasty-golden tasty-hunit text vector ]; + doCheck = false; description = "The Haskell/R mixed programming environment"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -7480,7 +7549,7 @@ self: { license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; - inherit (pkgs.xlibs) libX11;}; + inherit (pkgs.xorg) libX11;}; "HGamer3D-SFML-Binding" = callPackage ({ mkDerivation, base, hg3dsfml050, HGamer3D-Data, sfml-audio @@ -9438,6 +9507,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HerbiePlugin" = callPackage + ({ mkDerivation, base, deepseq, directory, ghc, mtl, process + , sqlite-simple, subhask, template-haskell, text + }: + mkDerivation { + pname = "HerbiePlugin"; + version = "0.1.0.0"; + sha256 = "c8bbadbc2eee99dc92921335c591a8bfbc6ca11bb47477abfeaa48e3dcd5c8d4"; + libraryHaskellDepends = [ + base deepseq directory ghc mtl process sqlite-simple + template-haskell text + ]; + testHaskellDepends = [ subhask ]; + homepage = "github.com/mikeizbicki/herbie-haskell"; + description = "automatically improve your code's numeric stability"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Hermes" = callPackage ({ mkDerivation, AES, base, bytestring, cereal, containers , hslogger, monads-tf, network, old-time, random, random-shuffle @@ -9572,6 +9659,7 @@ self: { array base containers directory filepath libgraph mtl process RBTree regex-posix template-haskell threepenny-gui ]; + jailbreak = true; homepage = "http://maartenfaddegon.nl"; description = "Lighweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; @@ -11613,8 +11701,8 @@ self: { }: mkDerivation { pname = "MFlow"; - version = "0.4.5.10"; - sha256 = "2c2e2c03b31f37f628e446cabaf544bf7b669d3e6a34b6c38798e89145c3b6c4"; + version = "0.4.6.0"; + sha256 = "4e93f7488152d88359fd100a742c2ea96788284d262f3cd1b50d936f80f1a342"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring case-insensitive clientsession conduit conduit-extra containers directory @@ -11628,31 +11716,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "MFlow_0_4_5_13" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , case-insensitive, clientsession, conduit, conduit-extra - , containers, directory, extensible-exceptions, http-types - , monadloc, mtl, old-time, parsec, pwstore-fast, random - , RefSerialize, resourcet, stm, TCache, text, time, transformers - , utf8-string, vector, wai, wai-extra, warp, warp-tls, Workflow - }: - mkDerivation { - pname = "MFlow"; - version = "0.4.5.13"; - sha256 = "cd0664d1ca4f447537a4a1f82cc5ab0f5793a8e48c0027e642b48bafa4b77415"; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring case-insensitive - clientsession conduit conduit-extra containers directory - extensible-exceptions http-types monadloc mtl old-time parsec - pwstore-fast random RefSerialize resourcet stm TCache text time - transformers utf8-string vector wai wai-extra warp warp-tls - Workflow - ]; - description = "stateful, RESTful web framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "MHask" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -12622,6 +12685,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "NearContextAlgebra" = callPackage + ({ mkDerivation, base, containers, ContextAlgebra, lattices + , multiset, QuickCheck + }: + mkDerivation { + pname = "NearContextAlgebra"; + version = "0.1.0.0"; + sha256 = "151ec5dc8583c72415936d8c043b3e0f884801c5be28f1389f724e837447a06a"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers ContextAlgebra lattices multiset QuickCheck + ]; + jailbreak = true; + description = "Context Algebra of near"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Neks" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, directory , hashable, messagepack, network, stm, vector @@ -14123,8 +14204,8 @@ self: { ({ mkDerivation, alsaLib, base }: mkDerivation { pname = "PortMidi"; - version = "0.1.4"; - sha256 = "156183c88fb3c9c6564efac445df51bba2a1d78fa73ed47c530759d510108403"; + version = "0.1.5.2"; + sha256 = "b855a9f3c0b9796e9e8fe00bbfad47fd233e648b31c3443881f4dfa544800276"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ alsaLib ]; homepage = "http://haskell.org/haskellwiki/PortMidi"; @@ -15260,6 +15341,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "RoyalMonad" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "RoyalMonad"; + version = "1000.9"; + sha256 = "99bf6ccf65077396f305d18993c23ab8acb85fc38e2bed82638bc4918ee13dbe"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/atzeus/RoyalMonad"; + description = "All hail the Royal Monad!"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "RxHaskell" = callPackage ({ mkDerivation, base, containers, stm, transformers }: mkDerivation { @@ -18469,9 +18562,9 @@ self: { homepage = "https://github.com/haskell-pkg-janitors/X11"; description = "A binding to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; - inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xlibs) libXrandr; - inherit (pkgs.xlibs) libXrender;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + inherit (pkgs.xorg) libXrender;}; "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: @@ -18487,7 +18580,7 @@ self: { description = "Missing bindings to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11;}; + }) {inherit (pkgs.xorg) libX11;}; "X11-rm" = callPackage ({ mkDerivation, base, X11 }: @@ -18539,7 +18632,7 @@ self: { libraryPkgconfigDepends = [ libXft ]; description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts"; license = "LGPL"; - }) {inherit (pkgs.xlibs) libXft;}; + }) {inherit (pkgs.xorg) libXft;}; "X11-xshape" = callPackage ({ mkDerivation, base, X11 }: @@ -18576,7 +18669,7 @@ self: { description = "Bindings for the DirectX XInput library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) xinput;}; + }) {inherit (pkgs.xorg) xinput;}; "XMMS" = callPackage ({ mkDerivation, base, containers, xmmsclient, xmmsclient-glib }: @@ -18644,7 +18737,7 @@ self: { libraryPkgconfigDepends = [ libXau ]; description = "A binding to the X11 authentication library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libXau;}; + }) {inherit (pkgs.xorg) libXau;}; "Xec" = callPackage ({ mkDerivation, base, binary, bytestring, cairo, containers @@ -26795,7 +26888,7 @@ self: { description = "Automatic Rule-Based Time Tracker"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXScrnSaver;}; + }) {inherit (pkgs.xorg) libXScrnSaver;}; "arbtt_0_9_0_1" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring @@ -26826,7 +26919,7 @@ self: { description = "Automatic Rule-Based Time Tracker"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXScrnSaver;}; + }) {inherit (pkgs.xorg) libXScrnSaver;}; "arbtt_0_9_0_2" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring @@ -26857,7 +26950,7 @@ self: { description = "Automatic Rule-Based Time Tracker"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXScrnSaver;}; + }) {inherit (pkgs.xorg) libXScrnSaver;}; "arbtt_0_9_0_4" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring @@ -26887,9 +26980,9 @@ self: { description = "Automatic Rule-Based Time Tracker"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXScrnSaver;}; + }) {inherit (pkgs.xorg) libXScrnSaver;}; - "arbtt" = callPackage + "arbtt_0_9_0_5" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring , bytestring-progress, containers, deepseq, directory, filepath , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty @@ -26916,7 +27009,67 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; - }) {inherit (pkgs.xlibs) libXScrnSaver;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.xorg) libXScrnSaver;}; + + "arbtt" = callPackage + ({ mkDerivation, aeson, array, base, binary, bytestring + , bytestring-progress, containers, deepseq, directory, filepath + , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty + , tasty-golden, tasty-hunit, terminal-progress-bar, time + , transformers, unix, utf8-string, X11 + }: + mkDerivation { + pname = "arbtt"; + version = "0.9.0.6"; + sha256 = "f5f066f471761ed48388b3a80beff4ae3deaa7845666a513fa30dadf7dc4d5ad"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson array base binary bytestring bytestring-progress containers + deepseq directory filepath parsec pcre-light strict + terminal-progress-bar time transformers unix utf8-string X11 + ]; + executableSystemDepends = [ libXScrnSaver ]; + testHaskellDepends = [ + base binary bytestring containers deepseq directory parsec + pcre-light process-extras tasty tasty-golden tasty-hunit time + transformers unix utf8-string + ]; + homepage = "http://arbtt.nomeata.de/"; + description = "Automatic Rule-Based Time Tracker"; + license = "GPL"; + }) {inherit (pkgs.xorg) libXScrnSaver;}; + + "arbtt_0_9_0_7" = callPackage + ({ mkDerivation, aeson, array, base, binary, bytestring + , bytestring-progress, containers, deepseq, directory, filepath + , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty + , tasty-golden, tasty-hunit, terminal-progress-bar, time + , transformers, unix, utf8-string, X11 + }: + mkDerivation { + pname = "arbtt"; + version = "0.9.0.7"; + sha256 = "3a588f9228533df6233877a6be2612f4d4cb1adc2e2e190d9fb0cf46772ccba5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson array base binary bytestring bytestring-progress containers + deepseq directory filepath parsec pcre-light strict + terminal-progress-bar time transformers unix utf8-string X11 + ]; + executableSystemDepends = [ libXScrnSaver ]; + testHaskellDepends = [ + base binary bytestring containers deepseq directory parsec + pcre-light process-extras tasty tasty-golden tasty-hunit time + transformers unix utf8-string + ]; + homepage = "http://arbtt.nomeata.de/"; + description = "Automatic Rule-Based Time Tracker"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.xorg) libXScrnSaver;}; "archive" = callPackage ({ mkDerivation, base, bytestring, debian, debian-mirror, directory @@ -27682,7 +27835,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asn1-encoding" = callPackage + "asn1-encoding_0_9_2" = callPackage ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl , tasty, tasty-quickcheck, text }: @@ -27700,6 +27853,25 @@ self: { homepage = "http://github.com/vincenthz/hs-asn1"; description = "ASN1 data reader and writer in RAW, BER and DER forms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "asn1-encoding" = callPackage + ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl + , tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "asn1-encoding"; + version = "0.9.3"; + sha256 = "90d7e05806977e683a468a4112270c9745c07f52452915db6a8fb19b752d7106"; + libraryHaskellDepends = [ asn1-types base bytestring hourglass ]; + testHaskellDepends = [ + asn1-types base bytestring hourglass mtl tasty tasty-quickcheck + text + ]; + homepage = "http://github.com/vincenthz/hs-asn1"; + description = "ASN1 data reader and writer in RAW, BER and DER forms"; + license = stdenv.lib.licenses.bsd3; }) {}; "asn1-parse_0_9_0" = callPackage @@ -27734,7 +27906,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "asn1-types" = callPackage + "asn1-parse_0_9_4" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring }: + mkDerivation { + pname = "asn1-parse"; + version = "0.9.4"; + sha256 = "c6a328f570c69db73f8d2416f9251e8a03753f90d5d19e76cbe69509a3ceb708"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base bytestring + ]; + homepage = "https://github.com/vincenthz/hs-asn1"; + description = "Simple monadic parser for ASN1 stream types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "asn1-types_0_3_0" = callPackage ({ mkDerivation, base, bytestring, hourglass }: mkDerivation { pname = "asn1-types"; @@ -27744,6 +27931,19 @@ self: { homepage = "http://github.com/vincenthz/hs-asn1-types"; description = "ASN.1 types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "asn1-types" = callPackage + ({ mkDerivation, base, bytestring, hourglass, memory }: + mkDerivation { + pname = "asn1-types"; + version = "0.3.1"; + sha256 = "4ae6d47503a0ebf40584ea9d733eb572ac2dd607556dff1211b25602b34f2ec6"; + libraryHaskellDepends = [ base bytestring hourglass memory ]; + homepage = "http://github.com/vincenthz/hs-asn1-types"; + description = "ASN.1 types"; + license = stdenv.lib.licenses.bsd3; }) {}; "asn1dump" = callPackage @@ -28154,25 +28354,25 @@ self: { }) {}; "atom-conduit" = callPackage - ({ mkDerivation, base, conduit, conduit-parse, containers - , data-default, exceptions, hlint, lens, mono-traversable - , network-uri, parsers, quickcheck-instances, resourcet, tasty - , tasty-hunit, tasty-quickcheck, text, time, timerep, xml-conduit - , xml-conduit-parse, xml-types + ({ mkDerivation, base, conduit, conduit-parse, data-default + , exceptions, foldl, hlint, lens, mono-traversable, parsers + , quickcheck-instances, resourcet, tasty, tasty-hunit + , tasty-quickcheck, text, time, timerep, total, uri-bytestring + , xml-conduit, xml-conduit-parse, xml-types }: mkDerivation { pname = "atom-conduit"; - version = "0.1.0.0"; - sha256 = "53aa8894628f83c3542f7eff4c90abbac82f5fa98151f67e703aa86706380dca"; + version = "0.2.0.0"; + sha256 = "3dc3d6b784ebb2dc6a8cfc901f4c75351de5254efb6d12c6242d2cd5605e780e"; libraryHaskellDepends = [ - base conduit conduit-parse containers exceptions lens - mono-traversable network-uri parsers text time timerep xml-conduit + base conduit conduit-parse exceptions foldl lens mono-traversable + parsers text time timerep total uri-bytestring xml-conduit xml-conduit-parse xml-types ]; testHaskellDepends = [ base conduit conduit-parse data-default exceptions hlint lens - mono-traversable network-uri parsers quickcheck-instances resourcet - tasty tasty-hunit tasty-quickcheck text time xml-conduit + mono-traversable parsers quickcheck-instances resourcet tasty + tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit xml-conduit-parse xml-types ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; @@ -28972,6 +29172,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "avatar-generator" = callPackage + ({ mkDerivation, base, JuicyPixels, random }: + mkDerivation { + pname = "avatar-generator"; + version = "0.1.0.1"; + sha256 = "ff87c2530ce71ae090c4f29d41c0765652746a93b91f99a53d5125a3dd37369c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base JuicyPixels random ]; + jailbreak = true; + homepage = "http://github.com/keera-studios/avatar-generator"; + description = "A simple random avatar icon generator"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "average" = callPackage ({ mkDerivation, base, semigroups, vector-space }: mkDerivation { @@ -32346,10 +32561,10 @@ self: { doCheck = false; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; - inherit (pkgs.xlibs) libXext; inherit (pkgs.xlibs) libXfixes; - inherit (pkgs.xlibs) libXi; inherit (pkgs.xlibs) libXinerama; - inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; + inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; inherit (pkgs) mesa;}; "bindings-K8055" = callPackage @@ -36911,6 +37126,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-debian_4_31_6" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bifunctors, bytestring + , bzlib, Cabal, containers, data-default, deepseq, Diff, directory + , exceptions, filepath, HaXml, hsemail, HUnit, lens, ListLike + , memoize, mtl, network, network-uri, newtype-generics, old-locale + , optparse-applicative, parsec, pretty, process, process-extras + , pureMD5, regex-compat, regex-tdfa, set-extra, syb + , template-haskell, text, time, unix, Unixutils, utf8-string, zlib + }: + mkDerivation { + pname = "cabal-debian"; + version = "4.31.6"; + sha256 = "1cda07da0628d412fdda3862ce819d29c59c5c5bb5fe7a49e06938771c0c9894"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bifunctors bytestring bzlib Cabal containers + data-default deepseq Diff directory exceptions filepath HaXml + hsemail HUnit lens ListLike memoize mtl network network-uri + newtype-generics old-locale optparse-applicative parsec pretty + process process-extras pureMD5 regex-compat regex-tdfa set-extra + syb template-haskell text time unix Unixutils utf8-string zlib + ]; + executableHaskellDepends = [ + base Cabal lens mtl pretty Unixutils + ]; + testHaskellDepends = [ + base Cabal containers Diff directory filepath hsemail HUnit lens + pretty process text + ]; + 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 { @@ -41276,7 +41527,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-ghc" = callPackage + "clash-ghc_0_5_14" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl , containers, directory, filepath, ghc, ghc-typelits-natnormalise @@ -41299,6 +41550,32 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-ghc" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib + , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl + , containers, directory, filepath, ghc, ghc-typelits-natnormalise + , hashable, haskeline, lens, mtl, process, text, transformers + , unbound-generics, unix, unordered-containers + }: + mkDerivation { + pname = "clash-ghc"; + version = "0.5.15"; + sha256 = "54799a12bd0a01e0a1814caef51504301c843c4f745b7110a3542cc6043215e3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base bifunctors bytestring clash-lib clash-prelude + clash-systemverilog clash-verilog clash-vhdl containers directory + filepath ghc ghc-typelits-natnormalise hashable haskeline lens mtl + process text transformers unbound-generics unix + unordered-containers + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-lib_0_5_10" = callPackage @@ -41347,7 +41624,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-lib" = callPackage + "clash-lib_0_5_12" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, deepseq, directory, errors, fgl , filepath, hashable, lens, mtl, pretty, process, template-haskell @@ -41367,6 +41644,51 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-lib" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude + , concurrent-supply, containers, deepseq, directory, errors, fgl + , filepath, hashable, lens, mtl, pretty, process, template-haskell + , text, time, transformers, unbound-generics, unordered-containers + , uu-parsinglib, wl-pprint-text + }: + mkDerivation { + pname = "clash-lib"; + version = "0.5.13"; + sha256 = "d2440a3f0ff9df8b4b2b374b8c934da1c90cd9e57ed74aea3b682a99c84fd579"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clash-prelude concurrent-supply + containers deepseq directory errors fgl filepath hashable lens mtl + pretty process template-haskell text time transformers + unbound-generics unordered-containers uu-parsinglib wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "clash-prelude_0_9_2" = callPackage + ({ mkDerivation, array, base, data-default, doctest, ghc-prim + , ghc-typelits-natnormalise, Glob, integer-gmp, lens, QuickCheck + , singletons, template-haskell, th-lift + }: + mkDerivation { + pname = "clash-prelude"; + version = "0.9.2"; + sha256 = "11f8997503a00452e543d1bcb3d984bc79332cde5b30f1782bafec8b572d87be"; + revision = "1"; + editedCabalFile = "c2165cbe11e6b0e0acadbe0a6e822c1df9a4b12bf2825831badbc5dae9bba65a"; + libraryHaskellDepends = [ + array base data-default ghc-prim ghc-typelits-natnormalise + integer-gmp lens QuickCheck singletons template-haskell th-lift + ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Prelude library"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-prelude" = callPackage @@ -41376,8 +41698,8 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "0.9.2"; - sha256 = "11f8997503a00452e543d1bcb3d984bc79332cde5b30f1782bafec8b572d87be"; + version = "0.9.3"; + sha256 = "3cfcc4aa822a251dc2ea2e31e2bf3c15a37fe63ec859ea16aaa0fe3f31913315"; libraryHaskellDepends = [ array base data-default ghc-prim ghc-typelits-natnormalise integer-gmp lens QuickCheck singletons template-haskell th-lift @@ -41437,7 +41759,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-systemverilog" = callPackage + "clash-systemverilog_0_5_9" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -41452,6 +41774,24 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-systemverilog" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-systemverilog"; + version = "0.5.10"; + sha256 = "511310bdf943ecd2b1aeb87e22474e4a1bd9a4c6e881c8ba0733c6a097ae3e35"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-verilog_0_5_7" = callPackage @@ -41490,7 +41830,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-verilog" = callPackage + "clash-verilog_0_5_9" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -41505,6 +41845,24 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Verilog backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-verilog" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-verilog"; + version = "0.5.10"; + sha256 = "1a6ad070087a464a4eed05f8bc30cd92d000d8c02be33cbef08f973e9624bb03"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Verilog backend"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-vhdl_0_5_8" = callPackage @@ -41543,7 +41901,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-vhdl" = callPackage + "clash-vhdl_0_5_11" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -41558,6 +41916,24 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-vhdl" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-vhdl"; + version = "0.5.12"; + sha256 = "fe91d7635fb1278ee99c757ac0dc1965b04ec37a91db115d85692cf5a166d511"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - VHDL backend"; + license = stdenv.lib.licenses.bsd2; }) {}; "classify" = callPackage @@ -42157,14 +42533,14 @@ self: { , ixset, jmacro, lens, mtl, network, network-uri, old-locale , openssl, process, random, reform, reform-happstack, reform-hsp , safecopy, stm, tagsoup, text, time, time-locale-compat - , unordered-containers, userid, utf8-string, uuid, vector - , web-plugins, web-routes, web-routes-happstack, web-routes-hsp - , web-routes-th, xss-sanitize + , unordered-containers, userid, utf8-string, uuid-orphans + , uuid-types, vector, web-plugins, web-routes, web-routes-happstack + , web-routes-hsp, web-routes-th, xss-sanitize }: mkDerivation { pname = "clckwrks"; - version = "0.23.9"; - sha256 = "7d4c1b4d181b8c974e8472c43c72a1c226e4806f430e49d07f07039c511df51b"; + version = "0.23.10"; + sha256 = "7e85091501c7a91a51c17920b415e764f20b730f1bf59ad0e0cc5be9b777cbe7"; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -42172,12 +42548,11 @@ self: { happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl network network-uri old-locale process random reform reform-happstack reform-hsp safecopy stm tagsoup text time - time-locale-compat unordered-containers userid utf8-string uuid - vector web-plugins web-routes web-routes-happstack web-routes-hsp - web-routes-th xss-sanitize + time-locale-compat unordered-containers userid utf8-string + uuid-orphans uuid-types vector web-plugins web-routes + web-routes-happstack web-routes-hsp web-routes-th xss-sanitize ]; librarySystemDepends = [ openssl ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; @@ -42261,8 +42636,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-ircbot"; - version = "0.6.14"; - sha256 = "22075fc30d0795c1954bee0887e856d60e15bc2ccdd3e4b611c3a898441230d3"; + version = "0.6.15"; + sha256 = "1e6e9747a27e24258448b98d82217f9f69317beea18e4607accab1aa3df0ee88"; libraryHaskellDepends = [ acid-state attoparsec base blaze-html bytestring clckwrks containers directory filepath happstack-hsp happstack-server hsp @@ -42270,7 +42645,6 @@ self: { safecopy text web-plugins web-routes web-routes-th ]; libraryToolDepends = [ hsx2hs ]; - jailbreak = true; homepage = "http://clckwrks.com/"; description = "ircbot plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -42285,8 +42659,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.13"; - sha256 = "9c044fe6bda21cde985ce04de9a7b8f7f2598696b7f7071a8121003b7093d148"; + version = "0.6.14"; + sha256 = "6a6928e0e768c8c23061de9046250a699bbc7870804d9c9cbff9044f32870bd6"; libraryHaskellDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers directory filepath gd happstack-server hsp ixset magic mtl reform @@ -42294,7 +42668,6 @@ self: { web-routes-th ]; libraryToolDepends = [ hsx2hs ]; - jailbreak = true; homepage = "http://clckwrks.com/"; description = "media plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -42310,8 +42683,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.0"; - sha256 = "9a4f39714cbbca951403b06a057b64cb2fad8b55a36fe33ad127f9fbdaef0249"; + version = "0.4.1"; + sha256 = "1fb68c812f3ce260d92df7a6b614c80bea443347ad95612edb8c73160099fbc0"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -42319,7 +42692,6 @@ self: { tagsoup template-haskell text time time-locale-compat uuid web-plugins web-routes web-routes-happstack web-routes-th ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "support for CMS/Blogging in clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -42337,6 +42709,7 @@ self: { base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro mtl text web-plugins ]; + jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -43157,14 +43530,11 @@ self: { }: mkDerivation { pname = "cndict"; - version = "0.6.1"; - sha256 = "58cf673862f92eebacae959624b2f1b1694e69ae5af076201bde6c0e59b0205e"; - revision = "1"; - editedCabalFile = "6371863e768d5b9d01f80b10783bb7ab4530e8e168d0c0bcc0fcee2a4f1aa468"; + version = "0.6.2"; + sha256 = "13a3e38affeb1d86ddec1364e2e88152777946d863b594deb02b2cfd237246c0"; libraryHaskellDepends = [ base binary bytestring cassava containers file-embed text vector ]; - jailbreak = true; homepage = "https://github.com/Lemmih/cndict"; description = "Chinese/Mandarin <-> English dictionary, Chinese lexer"; license = stdenv.lib.licenses.publicDomain; @@ -47373,7 +47743,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "country-codes" = callPackage + "country-codes_0_1_2" = callPackage ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, tagsoup , text }: @@ -47389,6 +47759,25 @@ self: { homepage = "https://github.com/prowdsponsor/country-codes"; description = "ISO 3166 country codes and i18n names"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "country-codes" = callPackage + ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, tagsoup + , text + }: + mkDerivation { + pname = "country-codes"; + version = "0.1.3"; + sha256 = "062843cebfcb4df513e4688456311f07a2eb693935a053ce2eade2c8d586d1b5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson base shakespeare text ]; + executableHaskellDepends = [ base tagsoup text ]; + testHaskellDepends = [ aeson base HTF HUnit ]; + homepage = "https://github.com/prowdsponsor/country-codes"; + description = "ISO 3166 country codes and i18n names"; + license = stdenv.lib.licenses.bsd3; }) {}; "courier_0_1_0_15" = callPackage @@ -52273,8 +52662,8 @@ self: { }: mkDerivation { pname = "dead-code-detection"; - version = "0.1.2"; - sha256 = "522d4646c3e509759cf68e29fa2748d67014d9a623f2db61861e4e7cf2b2bc6c"; + version = "0.2"; + sha256 = "21335b4567f89145af60dca72ad77990662c06ecc75ad7f65e892ae6620925ca"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -52367,6 +52756,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "debian_3_89" = callPackage + ({ mkDerivation, base, bytestring, bzlib, containers, directory + , either, exceptions, filepath, HaXml, HUnit, ListLike, mtl + , network, network-uri, old-locale, parsec, pretty, process + , process-extras, pureMD5, regex-compat, regex-tdfa + , template-haskell, text, time, unix, Unixutils, utf8-string, zlib + }: + mkDerivation { + pname = "debian"; + version = "3.89"; + sha256 = "ec0da528635c8438f26f29a60f12c3ff606ec696ab641cf40b56b1d5ec92401c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bzlib containers directory either exceptions + filepath HaXml HUnit ListLike mtl network network-uri old-locale + parsec pretty process process-extras pureMD5 regex-compat + regex-tdfa template-haskell text time unix Unixutils utf8-string + zlib + ]; + executableHaskellDepends = [ + base directory filepath HaXml pretty process unix + ]; + testHaskellDepends = [ base HUnit parsec pretty regex-tdfa text ]; + homepage = "https://github.com/ddssff/debian-haskell"; + description = "Modules for working with the Debian package system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "debian-binary" = callPackage ({ mkDerivation, base, directory, filepath, HSH }: mkDerivation { @@ -53726,6 +54145,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-builder_0_7_2_0" = callPackage + ({ mkDerivation, base, base-orphans, bytestring, cmdargs + , diagrams-cairo, diagrams-lib, diagrams-postscript + , diagrams-rasterific, diagrams-svg, directory, exceptions + , filepath, hashable, haskell-src-exts, hint, JuicyPixels, lens + , lucid-svg, mtl, split, transformers + }: + mkDerivation { + pname = "diagrams-builder"; + version = "0.7.2.0"; + sha256 = "b41c5022404ea59d5b2c545d77486ed44c3ce2501e5f127ea823bf511e09ad8e"; + configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-orphans cmdargs diagrams-lib directory exceptions + filepath hashable haskell-src-exts hint lens mtl split transformers + ]; + executableHaskellDepends = [ + base bytestring cmdargs diagrams-cairo diagrams-lib + diagrams-postscript diagrams-rasterific diagrams-svg directory + filepath JuicyPixels lens lucid-svg + ]; + homepage = "http://projects.haskell.org/diagrams"; + description = "hint-based build service for the diagrams graphics EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-cairo_1_2_0_4" = callPackage ({ mkDerivation, base, bytestring, cairo, colour, containers , data-default-class, diagrams-core, diagrams-lib, directory @@ -54329,6 +54777,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-haddock_0_3_0_7" = callPackage + ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring + , Cabal, cautious-file, cmdargs, containers, cpphs + , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath + , haskell-src-exts, lens, linear, lucid-svg, mtl, parsec + , QuickCheck, split, strict, tasty, tasty-quickcheck, text + , uniplate + }: + mkDerivation { + pname = "diagrams-haddock"; + version = "0.3.0.7"; + sha256 = "27899e0fb4e3fc1f230374dfc872ffa658c6d797b6cfe8858f312637e1b694a3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base base64-bytestring bytestring cautious-file + containers cpphs diagrams-builder diagrams-lib diagrams-svg + directory filepath haskell-src-exts lens linear lucid-svg mtl + parsec split strict text uniplate + ]; + executableHaskellDepends = [ + base Cabal cmdargs cpphs directory filepath + ]; + testHaskellDepends = [ + base containers haskell-src-exts lens parsec QuickCheck tasty + tasty-quickcheck + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Preprocessor for embedding diagrams in Haddock documentation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-hsqml" = callPackage ({ mkDerivation, base, colour, containers, diagrams-core , diagrams-lib, hsqml, lens, text, transformers @@ -54365,6 +54846,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-html5_1_3_0_3" = callPackage + ({ mkDerivation, base, cmdargs, containers, data-default-class + , diagrams-core, diagrams-lib, lens, mtl, NumInstances + , optparse-applicative, split, statestack, static-canvas, text + }: + mkDerivation { + pname = "diagrams-html5"; + version = "1.3.0.3"; + sha256 = "319d8a79041abd91030d12a6b04196ed986432d0bd44a7c6f12505d5364b692b"; + libraryHaskellDepends = [ + base cmdargs containers data-default-class diagrams-core + diagrams-lib lens mtl NumInstances optparse-applicative split + statestack static-canvas text + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "HTML5 canvas backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-lib_1_2_0_7" = callPackage ({ mkDerivation, active, array, base, colour, containers , data-default-class, diagrams-core, dual-tree, filepath @@ -54629,6 +55130,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-postscript_1_3_0_3" = callPackage + ({ mkDerivation, base, containers, data-default-class + , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens + , monoid-extras, mtl, semigroups, split, statestack + }: + mkDerivation { + pname = "diagrams-postscript"; + version = "1.3.0.3"; + sha256 = "fd2a98a447a3383be967bbef9ed0262e91d7270b5ce9e2eeed7b2ba4cfebf7e9"; + libraryHaskellDepends = [ + base containers data-default-class diagrams-core diagrams-lib dlist + filepath hashable lens monoid-extras mtl semigroups split + statestack + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Postscript backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-qrcode" = callPackage ({ mkDerivation, array, base, colour, diagrams-core, diagrams-lib }: @@ -54712,6 +55233,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-rasterific_1_3_1_4" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable + , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split + , unix + }: + mkDerivation { + pname = "diagrams-rasterific"; + version = "1.3.1.4"; + sha256 = "6fb0d254d7959dd624d5918830601941bed87c4f37f2c625e24107af0560b78d"; + libraryHaskellDepends = [ + base bytestring containers data-default-class diagrams-core + diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl + optparse-applicative Rasterific split unix + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Rasterific backend for diagrams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-rubiks-cube" = callPackage ({ mkDerivation, base, data-default-class, diagrams-lib, lens }: mkDerivation { @@ -54831,6 +55373,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-svg_1_3_1_5" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, colour + , containers, diagrams-core, diagrams-lib, directory, filepath + , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl + , old-time, optparse-applicative, process, semigroups, split, text + , time + }: + mkDerivation { + pname = "diagrams-svg"; + version = "1.3.1.5"; + sha256 = "dbb850c21d1df466e1aadc81f74373fb4ec9f774079a27cf9c97aa99bba0ec30"; + libraryHaskellDepends = [ + base base64-bytestring bytestring colour containers diagrams-core + diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg + monoid-extras mtl old-time optparse-applicative process semigroups + split text time + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "SVG backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-tikz" = callPackage ({ mkDerivation, base, diagrams-core, diagrams-lib, dlist, mtl }: mkDerivation { @@ -55676,12 +56241,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_2_3_1" = callPackage + "directory_1_2_4_0" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.2.3.1"; - sha256 = "250a07a1e67be4a6381c2637f99ad7c0ff948eb1f09b727c5f5fcddc192afc87"; + version = "1.2.4.0"; + sha256 = "f80eb093f772f4be6c9c6d4d179b6cb2358ef40a62f7f9e52bfc6df643268517"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -56511,8 +57076,8 @@ self: { }: mkDerivation { pname = "diversity"; - version = "0.7.0.1"; - sha256 = "aa5e39896fe48ba067ad5c02213ada4dfbb5f089bb4d2338b58da4b95a56458b"; + version = "0.7.0.3"; + sha256 = "a9d977cfd093038d6df942df959e7f913298a8f18068ebf88380f4d8c6a9163b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56522,9 +57087,8 @@ self: { executableHaskellDepends = [ base containers fasta optparse-applicative pipes ]; - jailbreak = true; homepage = "https://github.com/GregorySchwartz/diversity"; - description = "Return the diversity at each position for all sequences in a fasta file"; + description = "Return the diversity at each position by default for all sequences in a fasta file"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -58504,8 +59068,8 @@ self: { }: mkDerivation { pname = "ebnf-bff"; - version = "0.1.0.0"; - sha256 = "1711696ee6ffd8edbb96aff5fef08c5edcfea7fb13260dbcb2b0ced4b93fe218"; + version = "0.1.1.0"; + sha256 = "683ce685b605b83feb795ec3a832e4e83c284ad7daa0bb8cb2a7d9c96bd27d80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base parsec text ]; @@ -62115,8 +62679,8 @@ self: { ({ mkDerivation, base, constraints, singletons }: mkDerivation { pname = "exinst"; - version = "0.1"; - sha256 = "73e32a3d91a7b3d8a9d6b28d560059ab2a5ba49d79dfa0730155b9c0eaf414bf"; + version = "0.1.1"; + sha256 = "ed8e30b2671102878767f275304e10d584b6e6e2e42fb179b5514b54dfc67147"; libraryHaskellDepends = [ base constraints singletons ]; homepage = "https://github.com/k0001/exinst"; description = "Derive instances for your existential types"; @@ -62127,8 +62691,8 @@ self: { ({ mkDerivation, aeson, base, constraints, exinst, singletons }: mkDerivation { pname = "exinst-aeson"; - version = "0.1"; - sha256 = "deb23a10a7f22fe743fb9bb90451e80dcb8d1b365f7a85498e56ef2c31a3a5bf"; + version = "0.1.0.1"; + sha256 = "bc916d6b4c3e6617b1b82e895b8a373f9ee1f2bf7c9b22efb43e8fb616995162"; libraryHaskellDepends = [ aeson base constraints exinst singletons ]; @@ -62141,8 +62705,8 @@ self: { ({ mkDerivation, base, bytes, constraints, exinst, singletons }: mkDerivation { pname = "exinst-bytes"; - version = "0.1"; - sha256 = "f30b5732cb926726e6d92d0888cbb0dca4f99059b9b321fb5198a0337b106189"; + version = "0.1.0.1"; + sha256 = "5dc66779093560fce4d5c4722615dab2d330d5c29bca4937981b009a391a8e67"; libraryHaskellDepends = [ base bytes constraints exinst singletons ]; @@ -62167,8 +62731,8 @@ self: { ({ mkDerivation, base, constraints, exinst, hashable, singletons }: mkDerivation { pname = "exinst-hashable"; - version = "0.1"; - sha256 = "c6ac56bd83b3fc47b38114019e0be79784f60ab068f77ead8e70d7308e9c297c"; + version = "0.1.0.1"; + sha256 = "7e76bd3604659dcb861a269362e1311bfe26ac92d5b88d6d6aa8253136c9ba68"; libraryHaskellDepends = [ base constraints exinst hashable singletons ]; @@ -63770,7 +64334,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fb" = callPackage + "fb_1_0_11" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, bytestring, cereal, conduit, conduit-extra , containers, crypto-api, cryptohash, cryptohash-cryptoapi @@ -63799,6 +64363,38 @@ self: { homepage = "https://github.com/prowdsponsor/fb"; description = "Bindings to Facebook's API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "fb" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , base64-bytestring, bytestring, cereal, conduit, conduit-extra + , containers, crypto-api, cryptohash, cryptohash-cryptoapi + , data-default, hspec, http-conduit, http-types, HUnit, lifted-base + , monad-control, monad-logger, old-locale, QuickCheck, resourcet + , text, time, transformers, transformers-base, unordered-containers + }: + mkDerivation { + pname = "fb"; + version = "1.0.12"; + sha256 = "e59f512c9fed9aa7f8aa0a891ffc06d82141a40a9f47cb5c57caec1d051fc4f6"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring base64-bytestring + bytestring cereal conduit conduit-extra crypto-api cryptohash + cryptohash-cryptoapi data-default http-conduit http-types + lifted-base monad-control monad-logger old-locale resourcet text + time transformers transformers-base unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring conduit containers data-default hspec + http-conduit HUnit lifted-base monad-control QuickCheck resourcet + text time transformers + ]; + jailbreak = true; + doCheck = false; + homepage = "https://github.com/prowdsponsor/fb"; + description = "Bindings to Facebook's API"; + license = stdenv.lib.licenses.bsd3; }) {}; "fb-persistent_0_3_4" = callPackage @@ -66464,6 +67060,7 @@ self: { ]; description = "Attoparsec and foldl-transduce integration"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "folds" = callPackage @@ -68180,26 +68777,26 @@ self: { }) {}; "funbot" = callPackage - ({ mkDerivation, aeson, base, bytestring, feed, feed-collect, HTTP - , http-listen, irc-fun-bot, irc-fun-color, network-uri, settings - , text, time, time-interval, time-units, transformers - , unordered-containers, vcs-web-hook-parse + ({ mkDerivation, aeson, base, bytestring, feed, feed-collect + , funbot-ext-events, HTTP, http-client, http-client-tls + , http-listen, irc-fun-bot, irc-fun-color, json-state, network-uri + , settings, tagsoup, text, time, time-interval, time-units + , transformers, unordered-containers, utf8-string + , vcs-web-hook-parse }: mkDerivation { pname = "funbot"; - version = "0.1.0.0"; - sha256 = "56cc9eec189f2d7f08ca3c47fb435606a796edcfe0823a2fc44626ccb0164c6b"; - revision = "1"; - editedCabalFile = "2173918811f07e0ac13ca1d9948e6a4aa48dbcd310e04ad6f23d8c549360fb20"; + version = "0.2"; + sha256 = "ce68139f253485451abfc91326f43a8cb711aa7d6f765ca67de3c6ce33f8cb48"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bytestring feed feed-collect HTTP http-listen - irc-fun-bot irc-fun-color network-uri settings text time - time-interval time-units transformers unordered-containers + aeson base bytestring feed feed-collect funbot-ext-events HTTP + http-client http-client-tls http-listen irc-fun-bot irc-fun-color + json-state network-uri settings tagsoup text time time-interval + time-units transformers unordered-containers utf8-string vcs-web-hook-parse ]; - jailbreak = true; homepage = "https://notabug.org/fr33domlover/funbot/"; description = "IRC bot for fun, learning, creativity and collaboration"; license = stdenv.lib.licenses.publicDomain; @@ -69752,13 +70349,13 @@ self: { }) {}; "geom2d" = callPackage - ({ mkDerivation, base, ieee754, QuickCheck }: + ({ mkDerivation, base, ieee754, linear, QuickCheck }: mkDerivation { pname = "geom2d"; - version = "0.1.3.1"; - sha256 = "05eeecd84e0440daede4b71addce096addf4b867fb6cfcb708e408e67a63e0cf"; - libraryHaskellDepends = [ base ieee754 QuickCheck ]; - testHaskellDepends = [ base ieee754 QuickCheck ]; + version = "0.2.1"; + sha256 = "c644a0adb3bf02c5ce6681f3002019665fb8c652e61a901c5d03bae72057caca"; + libraryHaskellDepends = [ base ieee754 linear QuickCheck ]; + testHaskellDepends = [ base ieee754 linear QuickCheck ]; description = "package for geometry in euklidean 2d space"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -71018,7 +71615,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gipeda" = callPackage + "gipeda_0_1_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, containers , directory, extra, filepath, gitlib, gitlib-libgit2, scientific , shake, split, tagged, text, unordered-containers, vector, yaml @@ -71037,6 +71634,28 @@ self: { homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gipeda" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, containers + , directory, extra, filepath, gitlib, gitlib-libgit2, scientific + , shake, split, tagged, text, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "gipeda"; + version = "0.2"; + sha256 = "ed227acff488ef7778ee9cc78fa3ec5e10edae19ea8ade79440033e29e83f82e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring cassava containers directory extra filepath + gitlib gitlib-libgit2 scientific shake split tagged text + unordered-containers vector yaml + ]; + homepage = "https://github.com/nomeata/gipeda"; + description = "Git Performance Dashboard"; + license = stdenv.lib.licenses.mit; }) {}; "gist" = callPackage @@ -73890,17 +74509,13 @@ self: { }) {}; "graphql" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, tasty, tasty-golden - , text - }: + ({ mkDerivation, attoparsec, base, tasty, tasty-hunit, text }: mkDerivation { pname = "graphql"; - version = "0.2.1"; - sha256 = "4ad90b450052590b8a9bfffd0080aac24fabf11d0b6838891ccd0cac40cf4968"; + version = "0.3"; + sha256 = "7f141c9507c135baf49491461060333e30128b49287f9b72de2875cef8420ba2"; libraryHaskellDepends = [ attoparsec base text ]; - testHaskellDepends = [ - attoparsec base bytestring tasty tasty-golden text - ]; + testHaskellDepends = [ attoparsec base tasty tasty-hunit text ]; homepage = "https://github.com/jdnavarro/graphql-haskell"; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; @@ -78505,8 +79120,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.1.5"; - sha256 = "203026967ec479957db08ad4109fb488eed254403064d7843deb8202b6c71ae2"; + version = "2.2.0"; + sha256 = "7093ae69b6be698102f87df7851eafbdeb830f55467083aea06bd8b11adf5078"; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang bytestring containers data-default filepath happstack-hsp @@ -82600,7 +83215,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hasql-postgres" = callPackage + "hasql-postgres_0_10_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , directory, doctest, either, filepath, free, hashable, hashtables , hasql, hasql-backend, hspec, list-t, loch-th, mmorph, mtl-prelude @@ -82629,6 +83244,38 @@ self: { homepage = "https://github.com/nikita-volkov/hasql-postgres"; description = "A \"PostgreSQL\" backend for the \"hasql\" library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hasql-postgres" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring + , directory, doctest, either, filepath, free, hashable, hashtables + , hasql, hasql-backend, hspec, list-t, loch-th, mmorph, mtl-prelude + , old-locale, placeholders, postgresql-binary, postgresql-libpq + , QuickCheck, quickcheck-instances, scientific, template-haskell + , text, time, transformers, uuid, vector + }: + mkDerivation { + pname = "hasql-postgres"; + version = "0.10.6"; + sha256 = "068c8de6696ae07a490e14fe83367fc383f2a6a41b9e64c688938f64bc04ec48"; + libraryHaskellDepends = [ + aeson attoparsec base-prelude bytestring either free hashable + hashtables hasql-backend list-t loch-th mmorph placeholders + postgresql-binary postgresql-libpq scientific template-haskell text + time transformers uuid vector + ]; + testHaskellDepends = [ + aeson base base-prelude bytestring directory doctest either + filepath hashable hasql hasql-backend hspec list-t mtl-prelude + old-locale postgresql-binary QuickCheck quickcheck-instances + scientific text time vector + ]; + jailbreak = true; + doCheck = false; + homepage = "https://github.com/nikita-volkov/hasql-postgres"; + description = "A \"PostgreSQL\" backend for the \"hasql\" library"; + license = stdenv.lib.licenses.mit; }) {}; "hasql-postgres-options" = callPackage @@ -83046,7 +83693,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haxr" = callPackage + "haxr_3000_11_1_1" = callPackage ({ mkDerivation, array, base, base-compat, base64-bytestring , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams , http-types, io-streams, mtl, mtl-compat, network, network-uri @@ -83065,6 +83712,28 @@ self: { homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haxr" = callPackage + ({ mkDerivation, array, base, base-compat, base64-bytestring + , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams + , http-types, io-streams, mtl, mtl-compat, network, network-uri + , old-locale, old-time, template-haskell, time, utf8-string + }: + mkDerivation { + pname = "haxr"; + version = "3000.11.1.2"; + sha256 = "a8a63a7d7df20472fa8fd2cdc089155292c16e4da34616180dbb33ba3ca0e436"; + libraryHaskellDepends = [ + array base base-compat base64-bytestring blaze-builder bytestring + HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat + network network-uri old-locale old-time template-haskell time + utf8-string + ]; + homepage = "http://www.haskell.org/haskellwiki/HaXR"; + description = "XML-RPC client and server library"; + license = stdenv.lib.licenses.bsd3; }) {}; "haxr-th" = callPackage @@ -89359,7 +90028,7 @@ self: { description = "Core library for hoodle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXi;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;}; "hoodle-extra" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base @@ -90332,8 +91001,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.7.1"; - sha256 = "f5bc40349949593d04fb9b501850bc95da03cd0aa2664ec95204073d8a4b0de6"; + version = "0.8.0"; + sha256 = "cd5f5cac842cfedb187f25b8932020e6f9e7c287d0477393330050af0d8e20db"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91382,6 +92051,7 @@ self: { tasty-quickcheck ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;}; "hs-nombre-generator" = callPackage @@ -92573,8 +93243,8 @@ self: { ({ mkDerivation, base, deepseq, HUnit, tagged }: mkDerivation { pname = "hset"; - version = "2.0.0"; - sha256 = "f8e0a3064ba59518450f548613a7d8b6752b834bc2dcad37db3ca696b360353d"; + version = "2.1.0"; + sha256 = "34471dc94721e12e3b85f9b32ec2c20e3d1fce62f4306e3542fa60b40aba5b97"; libraryHaskellDepends = [ base deepseq tagged ]; testHaskellDepends = [ base HUnit tagged ]; homepage = "https://bitbucket.org/s9gf4ult/hset"; @@ -92588,8 +93258,8 @@ self: { }: mkDerivation { pname = "hsexif"; - version = "0.6.0.5"; - sha256 = "8078722fbe719c485cbd2502b83f5eb5ca3b12ae5a0b651a3130a36cc10d1d19"; + version = "0.6.0.6"; + sha256 = "19e0a298d799c72b4bff13a0c08620cd4d49fe47dc4a06b07d8fa2ce310b01d6"; libraryHaskellDepends = [ base binary bytestring containers iconv text time ]; @@ -99744,8 +100414,8 @@ self: { }: mkDerivation { pname = "idris"; - version = "0.9.19"; - sha256 = "1525b7e9c716d1d09520b8e6cb599dad24ced6161e01a4c864fd7fc636405ff3"; + version = "0.9.19.1"; + sha256 = "ec61914e6099e1159157f1528348b2b67c46808a97fabd6a5f9d4addb60ec480"; configureFlags = [ "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; @@ -99761,7 +100431,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; @@ -102598,17 +103267,15 @@ self: { "irc-fun-bot" = callPackage ({ mkDerivation, aeson, base, fast-logger, irc-fun-client - , irc-fun-messages, settings, time, time-interval, time-units + , irc-fun-messages, json-state, time, time-interval, time-units , transformers, unordered-containers }: mkDerivation { pname = "irc-fun-bot"; - version = "0.2.0.0"; - sha256 = "2fc0ac4354117782b425b0b801624c85e46ad3a91c42e3f44f52618ffb0da37a"; - revision = "1"; - editedCabalFile = "12d2e79fef0ee2a48f5cc2d333cf97cfe5c19f82c6ba371547f55994538131e7"; + version = "0.3.0.0"; + sha256 = "e6c6bb7419a53a778509d2e6d5366ab0c39910eceb8a36c6362663cdb25578a1"; libraryHaskellDepends = [ - aeson base fast-logger irc-fun-client irc-fun-messages settings + aeson base fast-logger irc-fun-client irc-fun-messages json-state time time-interval time-units transformers unordered-containers ]; jailbreak = true; @@ -102624,8 +103291,8 @@ self: { }: mkDerivation { pname = "irc-fun-client"; - version = "0.1.1.0"; - sha256 = "00a2191a2a26d5c973f890fcd5cb618e4142acf8ff370b067708de1ed7fb52bc"; + version = "0.2.0.0"; + sha256 = "032c59b494afa94637db7e7bc2257fa210527e4336279dd988647fbbec449b74"; libraryHaskellDepends = [ auto-update base fast-logger irc-fun-messages network time time-units unordered-containers @@ -104401,7 +105068,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "json-autotype" = callPackage + "json-autotype_1_0_7" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, GenericPretty, hashable, hflags, hint, lens, mtl , pretty, process, QuickCheck, scientific, smallcheck, text @@ -104431,9 +105098,10 @@ self: { homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "json-autotype_1_0_10" = callPackage + "json-autotype" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, GenericPretty, hashable, hflags, hint, lens, mtl , pretty, process, QuickCheck, scientific, smallcheck, text @@ -104463,7 +105131,6 @@ self: { homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-b" = callPackage @@ -108508,27 +109175,6 @@ self: { }) {}; "language-nix" = callPackage - ({ mkDerivation, base, deepseq, doctest, lens, pretty, QuickCheck - , regex-posix - }: - mkDerivation { - pname = "language-nix"; - version = "2"; - sha256 = "9e39e96ced9da6a878fc647d8cec623e3ab5469249dac20cdb42971b9ad00fc6"; - revision = "2"; - editedCabalFile = "b6ccb47d33cc5e3d7c4a23caf3a3b2c2c1c17b34bc159256808e8f034a48b951"; - libraryHaskellDepends = [ base deepseq lens pretty regex-posix ]; - testHaskellDepends = [ - base deepseq doctest lens pretty QuickCheck regex-posix - ]; - doCheck = false; - homepage = "https://github.com/peti/language-nix"; - description = "Data types and useful functions to represent and manipulate the Nix language"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; - }) {}; - - "language-nix_2_1" = callPackage ({ mkDerivation, base, base-compat, Cabal, deepseq, doctest, lens , pretty, QuickCheck }: @@ -108542,10 +109188,10 @@ self: { testHaskellDepends = [ base base-compat Cabal deepseq doctest lens pretty QuickCheck ]; + doCheck = false; homepage = "https://github.com/peti/language-nix#readme"; description = "Data types and useful functions to represent and manipulate the Nix language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; @@ -108927,7 +109573,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "lattices" = callPackage + "lattices_1_3" = callPackage ({ mkDerivation, base, containers, deepseq, hashable , unordered-containers }: @@ -108941,9 +109587,10 @@ self: { homepage = "http://github.com/phadej/lattices/"; description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "lattices_1_4" = callPackage + "lattices" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, QuickCheck , semigroups, tagged, tasty, tasty-quickcheck, transformers , universe-base, universe-reverse-instances, unordered-containers @@ -108965,7 +109612,6 @@ self: { homepage = "http://github.com/phadej/lattices/"; description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "launchpad-control" = callPackage @@ -110436,8 +111082,8 @@ self: { }: mkDerivation { pname = "libgraph"; - version = "1.5"; - sha256 = "21124236aec58c454fcd46aa5a192c65ecfa43b0b5b151378d5a648a08b3de5f"; + version = "1.6"; + sha256 = "9970e5390e4ca52d3e1ba32af0b428d6baecebf97c658d6d2b86c33c5b469cd5"; libraryHaskellDepends = [ array base containers monads-tf process union-find ]; @@ -114172,6 +114818,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {objc = null;}; + "luminance" = callPackage + ({ mkDerivation, base, contravariant, gl, mtl, resourcet + , semigroups, transformers, void + }: + mkDerivation { + pname = "luminance"; + version = "0.1"; + sha256 = "1bd7bb005ed35d876c2c6703a9bcb6402b6a2d379b55b0a78344fafef97bb217"; + libraryHaskellDepends = [ + base contravariant gl mtl resourcet semigroups transformers void + ]; + homepage = "https://github.com/phaazon/luminance"; + description = "Type-safe, dependently-typed and stateless graphics framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "luminance-samples" = callPackage + ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels + , luminance, mtl, resourcet, transformers, vector + }: + mkDerivation { + pname = "luminance-samples"; + version = "0.1.1"; + sha256 = "52f139848fec2cfd691af9ce2fd054bd82ca325bf2cea465a8b6c920248eb31e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base contravariant GLFW-b JuicyPixels luminance mtl resourcet + transformers vector + ]; + jailbreak = true; + homepage = "https://github.com/phaazon/luminance-samples"; + description = "Luminance samples"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lushtags" = callPackage ({ mkDerivation, base, haskell-src-exts, text, vector }: mkDerivation { @@ -115100,6 +115782,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "managed_1_0_1" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "managed"; + version = "1.0.1"; + sha256 = "d2efbf081803303fb42b7bc105004a49be6f41719ad3e817400cba3a504dcb5f"; + libraryHaskellDepends = [ base transformers ]; + description = "A monad for managed values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "manatee" = callPackage ({ mkDerivation, base, binary, cairo, containers, dbus-client , dbus-core, derive, directory, filepath, gtk, gtk-serialized-event @@ -115617,8 +116311,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.4.0.0"; - sha256 = "495c8e1863140df809275f1972ec0b2514d78790650a68413c7bf103780205a5"; + version = "0.4.1.0"; + sha256 = "677f358e4ff991a41baff9e105a96d90849778dfa1ed12b316866e2df4cdb7e6"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types lens mtl @@ -115651,7 +116345,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mangopay" = callPackage + "mangopay_1_11_4" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, bytestring, case-insensitive , conduit, conduit-extra, connection, country-codes, data-default @@ -115689,6 +116383,47 @@ self: { homepage = "https://github.com/prowdsponsor/mangopay"; description = "Bindings to the MangoPay API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "mangopay" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring + , base64-bytestring, blaze-builder, bytestring, case-insensitive + , conduit, conduit-extra, connection, country-codes, data-default + , HTF, http-conduit, http-types, HUnit, lifted-base, monad-control + , monad-logger, resourcet, template-haskell, text, time, tls + , transformers, transformers-base, unordered-containers + , utf8-string, vector, wai, warp, x509-system + }: + mkDerivation { + pname = "mangopay"; + version = "1.11.5"; + sha256 = "514d49768921da81657adbe8b790df25cb2d655c674a09606fa9c91047d4c1ac"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base base16-bytestring base64-bytestring + blaze-builder bytestring case-insensitive conduit conduit-extra + connection country-codes data-default http-conduit http-types HUnit + lifted-base monad-control monad-logger resourcet template-haskell + text time tls transformers transformers-base unordered-containers + utf8-string vector wai warp x509-system + ]; + executableHaskellDepends = [ + aeson base bytestring http-conduit monad-logger text transformers + ]; + testHaskellDepends = [ + aeson async attoparsec base base16-bytestring base64-bytestring + blaze-builder bytestring case-insensitive conduit conduit-extra + connection country-codes data-default HTF http-conduit http-types + HUnit lifted-base monad-control monad-logger resourcet + template-haskell text time tls transformers transformers-base + unordered-containers utf8-string vector wai warp x509-system + ]; + doCheck = false; + homepage = "https://github.com/prowdsponsor/mangopay"; + description = "Bindings to the MangoPay API"; + license = stdenv.lib.licenses.bsd3; }) {}; "manifolds" = callPackage @@ -118815,18 +119550,18 @@ self: { ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens , lens-aeson, mtl, network, optparse-applicative, random, stm - , strict, text, time, transformers, unix, unordered-containers + , strict, text, time, transformers, unordered-containers }: mkDerivation { pname = "moesocks"; - version = "1.0.0.10"; - sha256 = "29902a8d0e3640c0a27673ee0b31690607f5f6d3dc973b0f7fda74b5fe0da6e6"; + version = "1.0.0.20"; + sha256 = "2f8a388696fb49168f23437a1a3187334ae260e42e235245cdb20afa8efb3ef1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async attoparsec base binary bytestring containers cryptohash hslogger HsOpenSSL iproute lens lens-aeson mtl network - optparse-applicative random stm strict text time transformers unix + optparse-applicative random stm strict text time transformers unordered-containers ]; homepage = "https://github.com/nfjinjing/moesocks"; @@ -123175,23 +123910,6 @@ self: { }) {}; "nationstates" = callPackage - ({ mkDerivation, base, bytestring, clock, containers, http-client - , http-client-tls, http-types, multiset, transformers, xml - }: - mkDerivation { - pname = "nationstates"; - version = "0.3.0.1"; - sha256 = "d5d352ba075f8b42c7eca4f15562bc85197f8832bb0145608f70c3f2fbbe3a39"; - libraryHaskellDepends = [ - base bytestring clock containers http-client http-client-tls - http-types multiset transformers xml - ]; - homepage = "https://github.com/lfairy/nationstates"; - description = "NationStates API client"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "nationstates_0_4_0_0" = callPackage ({ mkDerivation, base, bytestring, clock, containers, http-client , http-client-tls, http-types, multiset, transformers, xml }: @@ -123206,7 +123924,6 @@ self: { homepage = "https://github.com/lfairy/nationstates"; description = "NationStates API client"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nats" = callPackage @@ -123681,27 +124398,43 @@ self: { }) {}; "nested-routes" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , clay, composition, constraints, containers, hspec, hspec-wai - , http-media, http-types, lucid, mtl, poly-arity, pred-trie - , regex-compat, semigroups, shakespeare, text, transformers, wai - , wai-extra, wai-util, warp, witherable + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bifunctors, blaze-builder, blaze-html, bytestring, clay + , composition, composition-extra, constraints, containers, cookie + , cryptonite, data-default, errors, hspec, hspec-wai, http-media + , http-types, iso8601-time, lucid, memory, mtl, poly-arity + , pred-trie, regex-compat, semigroups, sets, shakespeare, stm, text + , time, transformers, tries, utf8-string, wai, wai-extra + , wai-session, wai-util, warp, witherable }: mkDerivation { pname = "nested-routes"; - version = "3.2.0"; - sha256 = "af87fbccaca05f257e357904645f1f25d1ab2fe2bda00414f7099e741429b20a"; + version = "4.0.0"; + sha256 = "e290b051d0863afd960b9daffc64fdf68696a7aa10013998ec764dd2a70c26fb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base blaze-html bytestring clay composition - constraints containers http-media http-types lucid mtl poly-arity - pred-trie regex-compat semigroups shakespeare text transformers wai - wai-extra wai-util witherable + aeson attoparsec base bifunctors blaze-html bytestring clay + composition composition-extra constraints containers errors + http-media http-types lucid mtl poly-arity pred-trie regex-compat + semigroups sets shakespeare text transformers tries wai wai-extra + wai-util witherable + ]; + executableHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-builder blaze-html + bytestring clay composition composition-extra constraints + containers cookie cryptonite data-default errors http-media + http-types iso8601-time lucid memory mtl poly-arity pred-trie + regex-compat semigroups sets shakespeare stm text time transformers + tries utf8-string wai wai-extra wai-session wai-util warp + witherable ]; testHaskellDepends = [ - aeson attoparsec base blaze-html bytestring composition constraints - containers hspec hspec-wai http-media http-types lucid mtl - poly-arity pred-trie regex-compat semigroups shakespeare text - transformers wai wai-util warp witherable + aeson attoparsec base blaze-html bytestring composition + composition-extra constraints containers errors hspec hspec-wai + http-media http-types lucid mtl poly-arity pred-trie regex-compat + semigroups sets shakespeare text transformers wai wai-util warp + witherable ]; description = "Declarative, compositional Wai responses"; license = stdenv.lib.licenses.bsd3; @@ -126825,7 +127558,7 @@ self: { description = "Oculus Rift ffi providing head tracking data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXinerama; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;}; "oeis" = callPackage @@ -127301,6 +128034,8 @@ self: { pname = "opaleye"; version = "0.4.1.0"; sha256 = "eca2210c89f76ddcc01c927d317fe58b212a446bffd3d61264a52056edcb91eb"; + revision = "1"; + editedCabalFile = "8d7f434cceda05cb188865f4a2dbca5f7de41fe1ec51f6bceae208d50d2a61a3"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -129327,7 +130062,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pandoc-citeproc" = callPackage + "pandoc-citeproc_0_7_3_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , containers, data-default, directory, filepath, hs-bibutils, mtl , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 @@ -129355,9 +130090,10 @@ self: { ]; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pandoc-citeproc_0_7_4" = callPackage + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , containers, data-default, directory, filepath, hs-bibutils, mtl , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 @@ -129385,7 +130121,6 @@ self: { ]; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-crossref" = callPackage @@ -129527,7 +130262,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pandoc-types" = callPackage + "pandoc-types_1_12_4_5" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , deepseq-generics, ghc-prim, syb }: @@ -129541,6 +130276,23 @@ self: { homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pandoc-types" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , deepseq-generics, ghc-prim, syb + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.12.4.6"; + sha256 = "fbb67e345f17dd706f4500d600a8ec75fbce57b14276eb9b2483585fd3cfacea"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq-generics ghc-prim syb + ]; + homepage = "http://johnmacfarlane.net/pandoc"; + description = "Types for representing a structured document"; + license = stdenv.lib.licenses.bsd3; }) {}; "pandoc-unlit" = callPackage @@ -134032,22 +134784,21 @@ self: { "pipes-csv" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, cassava, HUnit - , pipes, pipes-bytestring, test-framework, test-framework-hunit - , unordered-containers, vector + , MissingH, pipes, pipes-bytestring, test-framework + , test-framework-hunit, unordered-containers, vector }: mkDerivation { pname = "pipes-csv"; - version = "1.4.1"; - sha256 = "9a18f4c24281e87136ea17bc73a37199333da25532a5ffed8d268eb080f5d9c4"; + version = "1.4.2"; + sha256 = "eacd20547f7d9d7efc8424cebeae424d7abe2c851ae192a21d6c99516ff787ce"; libraryHaskellDepends = [ base blaze-builder bytestring cassava pipes unordered-containers vector ]; testHaskellDepends = [ - base bytestring cassava HUnit pipes pipes-bytestring test-framework - test-framework-hunit vector + base bytestring cassava HUnit MissingH pipes pipes-bytestring + test-framework test-framework-hunit vector ]; - jailbreak = true; description = "Fast, streaming csv parser"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ jb55 ]; @@ -134228,6 +134979,7 @@ self: { sha256 = "0821194bdf7f377beeb20fc8f697ed5388a221b6e8e42c513eea67a91c198340"; libraryHaskellDepends = [ base monad-control mongoDB pipes ]; testHaskellDepends = [ base monad-control mongoDB pipes text ]; + doCheck = false; homepage = "http://github.com/jb55/pipes-mongodb"; description = "Stream results from MongoDB"; license = stdenv.lib.licenses.mit; @@ -136337,7 +137089,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "postgresql-simple_0_5_0_0" = callPackage + "postgresql-simple_0_5_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, bytestring-builder, case-insensitive, containers , cryptohash, hashable, HUnit, postgresql-libpq, scientific @@ -136345,8 +137097,8 @@ self: { }: mkDerivation { pname = "postgresql-simple"; - version = "0.5.0.0"; - sha256 = "820799a45f715938e7c5b427e1e273a6116cd616e8b210843ad462f7f299ed1f"; + version = "0.5.0.1"; + sha256 = "1b045b957533eba33fd7a93bf4b4aecc685cdb6592b635a2a383b71502efcb6c"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable postgresql-libpq scientific @@ -137363,7 +138115,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "primitive" = callPackage + "primitive_0_6" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "primitive"; @@ -137374,6 +138126,20 @@ self: { homepage = "https://github.com/haskell/primitive"; description = "Primitive memory-related operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "primitive" = callPackage + ({ mkDerivation, base, ghc-prim, transformers }: + mkDerivation { + pname = "primitive"; + version = "0.6.1.0"; + sha256 = "93731fa72eaf74e8e83453f080828e18cec9fbc82bee91b49ba8b61c043d38c8"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + testHaskellDepends = [ base ghc-prim ]; + homepage = "https://github.com/haskell/primitive"; + description = "Primitive memory-related operations"; + license = stdenv.lib.licenses.bsd3; }) {}; "primula-board" = callPackage @@ -138728,6 +139494,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "psc-ide_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, containers, directory, either + , filepath, hspec, lens, lens-aeson, mtl, network + , optparse-applicative, parsec, regex-tdfa, text, wreq + }: + mkDerivation { + pname = "psc-ide"; + version = "0.2.0.0"; + sha256 = "4b670a9e698c1c2b89d7041c3378a59ada3028b7e535fb377b2d979ed7e36ac4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers directory either filepath lens lens-aeson mtl + parsec regex-tdfa text wreq + ]; + executableHaskellDepends = [ + base directory mtl network optparse-applicative text + ]; + testHaskellDepends = [ base hspec ]; + homepage = "http://github.com/kRITZCREEK/psc-ide"; + description = "Language support for the PureScript programming language"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pseudo-boolean" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , containers, deepseq, dlist, hashable, HUnit, parsec, QuickCheck @@ -141315,16 +142106,15 @@ self: { "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit - , network, old-locale, random, text, time, unordered-containers - , uuid + , network, random, text, time, unordered-containers, uuid }: mkDerivation { pname = "raven-haskell"; - version = "0.1.0.0"; - sha256 = "bd8e2c14b84651142622b44e159e2a32475e2e7f6c3232260ebbf79bde00ea1a"; + version = "0.1.0.1"; + sha256 = "ef1eeb5734d94b9ace31ce41e6afc79cb1a9a60d5944c6abfee54c4d064ac77b"; libraryHaskellDepends = [ - aeson base bytestring http-conduit network old-locale random text - time unordered-containers uuid + aeson base bytestring http-conduit network random text time + unordered-containers uuid ]; testHaskellDepends = [ aeson base bytestring hspec unordered-containers @@ -141541,15 +142331,20 @@ self: { }) {}; "react-flux" = callPackage - ({ mkDerivation, aeson, base, deepseq, mtl, text }: + ({ mkDerivation, aeson, base, bytestring, deepseq, mtl + , template-haskell, text, time, unordered-containers + }: mkDerivation { pname = "react-flux"; - version = "0.9.4"; - sha256 = "3e030f6439f25fda59de81d487b289b76106e8d08985dba4e444892deb62e4b6"; + version = "1.0.0"; + sha256 = "3318ec6fcb6b8e6efc2033f366a1cbb11b850e39935dd86513e3c73b0c341e26"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ aeson base deepseq mtl text ]; - executableHaskellDepends = [ base deepseq ]; + libraryHaskellDepends = [ + aeson base bytestring deepseq mtl template-haskell text time + unordered-containers + ]; + executableHaskellDepends = [ base deepseq text time ]; homepage = "https://bitbucket.org/wuzzeb/react-flux"; description = "A binding to React based on the Flux application architecture for GHCJS"; license = stdenv.lib.licenses.bsd3; @@ -142192,6 +142987,17 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "redis-job-queue" = callPackage + ({ mkDerivation, aeson, base, bytestring, hedis }: + mkDerivation { + pname = "redis-job-queue"; + version = "0.1.0"; + sha256 = "5ee207f8ca3031e2b8662018ad7a4a9c820741c87e3d57336f4a2848ebabd2fe"; + libraryHaskellDepends = [ aeson base bytestring hedis ]; + description = "Simple priority job queue backed by Redis"; + license = stdenv.lib.licenses.mit; + }) {}; + "redis-resp" = callPackage ({ mkDerivation, attoparsec, base, bytestring , bytestring-conversion, containers, dlist, double-conversion @@ -143645,6 +144451,7 @@ self: { ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-schemas" = callPackage @@ -144486,8 +145293,8 @@ self: { }: mkDerivation { pname = "resolve-trivial-conflicts"; - version = "0.3.1.1"; - sha256 = "4f50a77d04eb304da3c7f93368c4dc5f9e65e705895fa58c018fa0b8f9d79452"; + version = "0.3.1.2"; + sha256 = "067c40b2d83a5804285065443659606a1188542d80615c009dc228d68a55dee1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -144995,6 +145802,8 @@ self: { pname = "rest-example"; version = "0.2.0.2"; sha256 = "f1d66ed2a8d6f700cb60b5d046afe20010ac909cd3004d55cca75c2ee13fb88e"; + revision = "1"; + editedCabalFile = "b0f11f80fe7f78fb76fc0ccb243eb54fe7177a6eef051abbcb2409f8fc79aab2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145346,6 +146155,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rest-gen_0_18_0_0" = callPackage + ({ mkDerivation, aeson, base, blaze-html, Cabal, code-builder + , directory, fclabels, filepath, hashable, haskell-src-exts + , HStringTemplate, HUnit, hxt, json-schema, pretty, process + , rest-core, safe, scientific, semigroups, split, test-framework + , test-framework-hunit, text, uniplate, unordered-containers + , vector + }: + mkDerivation { + pname = "rest-gen"; + version = "0.18.0.0"; + sha256 = "bca52143478e12a5fc91630c0df7f2206f8f60639d3a6cc568e4772696e92787"; + libraryHaskellDepends = [ + aeson base blaze-html Cabal code-builder directory fclabels + filepath hashable haskell-src-exts HStringTemplate hxt json-schema + pretty process rest-core safe scientific semigroups split text + uniplate unordered-containers vector + ]; + testHaskellDepends = [ + base fclabels haskell-src-exts HUnit rest-core test-framework + test-framework-hunit + ]; + description = "Documentation and client generation from rest definition"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rest-happstack_0_2_10_3" = callPackage ({ mkDerivation, base, containers, happstack-server, mtl, rest-core , rest-gen, utf8-string @@ -145409,6 +146245,8 @@ self: { pname = "rest-happstack"; version = "0.2.10.8"; sha256 = "feec31c1a8ab85941ebfe1d5081e7809592a4d622a6951691c08b79d56603958"; + revision = "1"; + editedCabalFile = "647255beca0013110e88747224f545e198aba15f47af6d894c7313997cca2bc1"; libraryHaskellDepends = [ base containers happstack-server mtl rest-core rest-gen utf8-string ]; @@ -146638,8 +147476,8 @@ self: { }: mkDerivation { pname = "roller"; - version = "0.1.3"; - sha256 = "1af09fc037e8678121d923179ffc7686f7c955a15f4b1187afdd18385067711d"; + version = "0.1.4"; + sha256 = "369a39d93d125550bc5ffc3dd21e89e2b04a611c7200935afbd303042b254fb6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146648,8 +147486,7 @@ self: { executableHaskellDepends = [ base optparse-applicative random regex-applicative ]; - jailbreak = true; - homepage = "https://github.com/Econify/roller"; + homepage = "https://github.com/PiotrJustyna/roller"; description = "Playing with applicatives and dice!"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -148328,6 +149165,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sbv_5_0" = callPackage + ({ mkDerivation, array, async, base, containers, crackNum + , data-binary-ieee754, deepseq, directory, filepath, HUnit, mtl + , old-time, pretty, process, QuickCheck, random, syb + }: + mkDerivation { + pname = "sbv"; + version = "5.0"; + sha256 = "eeb19fb888234565c9e5cfda6c760ed4c4650e33ba52400684f9c1ae6c55497f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base containers crackNum data-binary-ieee754 deepseq + directory filepath mtl old-time pretty process QuickCheck random + syb + ]; + executableHaskellDepends = [ + base data-binary-ieee754 directory filepath HUnit process syb + ]; + testHaskellDepends = [ + base data-binary-ieee754 directory filepath HUnit syb + ]; + homepage = "http://leventerkok.github.com/sbv/"; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sc3-rdu" = callPackage ({ mkDerivation, base, hsc3, hsc3-db }: mkDerivation { @@ -150766,6 +151631,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant_0_4_4_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , bytestring-conversion, case-insensitive, directory, doctest + , filemanip, filepath, hspec, http-media, http-types, network-uri + , parsec, QuickCheck, quickcheck-instances, string-conversions + , text, url + }: + mkDerivation { + pname = "servant"; + version = "0.4.4.3"; + sha256 = "13ca10419a1826a8ecd4b8cf762e58ed25ae31adaf4bdeb8d36c71dfa5869dc1"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring bytestring-conversion + case-insensitive http-media http-types network-uri + string-conversions text + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring directory doctest filemanip + filepath hspec parsec QuickCheck quickcheck-instances + string-conversions text url + ]; + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-JuicyPixels_0_1_0_0" = callPackage ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant , servant-server, wai, warp @@ -150813,8 +151705,8 @@ self: { ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; - version = "0.4.4.2"; - sha256 = "da58db6c24bb5360c3ee027061d7e9183667c1bdbde56d70f4f8e8fef982a47b"; + version = "0.4.4.3"; + sha256 = "8fca95f4325e10a290d6835c72bd31c69e22327548fcb2bc1094c66d3c3a5287"; libraryHaskellDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.github.io/"; description = "Blaze-html support for servant"; @@ -150900,6 +151792,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-client_0_4_4_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq + , either, exceptions, hspec, http-client, http-client-tls + , http-media, http-types, HUnit, network, network-uri, QuickCheck + , safe, servant, servant-server, string-conversions, text + , transformers, wai, warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.4.4.3"; + sha256 = "e83b581ebdabd8d81173605fa40da1acc31f2115cd633188402ca5a5938854f6"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring either exceptions http-client + http-client-tls http-media http-types network-uri safe servant + string-conversions text transformers + ]; + testHaskellDepends = [ + aeson base bytestring deepseq either hspec http-client http-media + http-types HUnit network QuickCheck servant servant-server text wai + warp + ]; + homepage = "http://haskell-servant.github.io/"; + description = "automatical derivation of querying functions for servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-docs_0_3_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable , lens, servant, string-conversions, system-filepath, text @@ -150980,6 +151899,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-docs_0_4_4_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, bytestring-conversion + , case-insensitive, hashable, hspec, http-media, http-types, lens + , servant, string-conversions, text, unordered-containers + }: + mkDerivation { + pname = "servant-docs"; + version = "0.4.4.3"; + sha256 = "ca87fe6949cdda55e4745aa3c4863cd68ff3a3904d61a0d9baa556e2f364e89f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bytestring-conversion case-insensitive hashable + http-media http-types lens servant string-conversions text + unordered-containers + ]; + executableHaskellDepends = [ + aeson base bytestring-conversion lens servant string-conversions + text + ]; + testHaskellDepends = [ + aeson base hspec lens servant string-conversions + ]; + homepage = "http://haskell-servant.github.io/"; + description = "generate API docs for your servant webservice"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-ede" = callPackage ({ mkDerivation, aeson, base, bytestring, ede, either, filepath , http-media, http-types, semigroups, servant, servant-server, text @@ -151012,8 +151960,8 @@ self: { }: mkDerivation { pname = "servant-examples"; - version = "0.4.4.2"; - sha256 = "76edea7d08e6ee4e5c41e2056f34353dd4033ba4a171008b92e1d34f1cbd146c"; + version = "0.4.4.3"; + sha256 = "7ccdf278c8f5da6b3630040ec4eba3111eeedd2465d5047034f10372defcb760"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151095,12 +152043,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-jquery_0_4_4_3" = callPackage + ({ mkDerivation, aeson, base, charset, filepath, hspec + , hspec-expectations, language-ecmascript, lens, servant + , servant-server, stm, text, transformers, warp + }: + mkDerivation { + pname = "servant-jquery"; + version = "0.4.4.3"; + sha256 = "1ec131e7b48673c8c7d99f0422d287a34e81f55f6fb2b142377d8e5b4d9288f8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base charset lens servant text ]; + executableHaskellDepends = [ + aeson base filepath servant servant-server stm transformers warp + ]; + testHaskellDepends = [ + base hspec hspec-expectations language-ecmascript lens servant + ]; + homepage = "http://haskell-servant.github.io/"; + description = "Automatically derive (jquery) javascript functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; - version = "0.4.4.2"; - sha256 = "073cff7d8e1551d1300d9d5c74159f3a7912951ac1874080359406e6de9fed01"; + version = "0.4.4.3"; + sha256 = "6d6b836794f1f5bda94c15d4f7950913db3396a6f9d233fd88e43e4fdcb100d2"; libraryHaskellDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.github.io/"; description = "Servant support for lucid"; @@ -151113,8 +152085,8 @@ self: { }: mkDerivation { pname = "servant-mock"; - version = "0.4.4.2"; - sha256 = "d203424df5f2d0484f874f81ec98623c226ab89f5c232c3a884aa3b91230e7c6"; + version = "0.4.4.3"; + sha256 = "bef08a756d600298f8762a73bf2b25ceed2377a970c4eb69273cd7f7981753ef"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151344,6 +152316,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-server_0_4_4_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , bytestring-conversion, directory, doctest, either, exceptions + , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl + , network, network-uri, parsec, QuickCheck, safe, servant, split + , string-conversions, system-filepath, temporary, text + , transformers, wai, wai-app-static, wai-extra, warp + }: + mkDerivation { + pname = "servant-server"; + version = "0.4.4.3"; + sha256 = "552ccb848fbb99c471f950412c12fe7a6081507678a4108d195299ecdc987fa0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring either filepath http-types mmorph + mtl network-uri safe servant split string-conversions + system-filepath text transformers wai wai-app-static warp + ]; + executableHaskellDepends = [ aeson base servant text wai warp ]; + testHaskellDepends = [ + aeson base bytestring bytestring-conversion directory doctest + either exceptions filemanip filepath hspec hspec-wai http-types mtl + network parsec QuickCheck servant string-conversions temporary text + transformers wai wai-extra warp + ]; + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs and serving them"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "serversession" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, hashable, hspec, nonce, path-pieces @@ -151962,19 +152966,19 @@ self: { "shadowsocks" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring , conduit-combinators, conduit-extra, containers, cryptohash - , HsOpenSSL, HUnit, iproute, optparse-applicative, process - , unordered-containers + , HsOpenSSL, HUnit, iproute, network, optparse-applicative, process + , streaming-commons, unordered-containers }: mkDerivation { pname = "shadowsocks"; - version = "1.20150811"; - sha256 = "1021016861c01a63f4a30825431b22e74e5011984f9406fc6642f5070e201382"; + version = "1.20150921"; + sha256 = "24873dbf0ccb94fe711a6f551b63889e49da89382ee431f78eafab796a4d9638"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async base binary bytestring conduit-combinators - conduit-extra containers cryptohash HsOpenSSL iproute - optparse-applicative unordered-containers + conduit-extra containers cryptohash HsOpenSSL iproute network + optparse-applicative streaming-commons unordered-containers ]; testHaskellDepends = [ base binary bytestring containers cryptohash HUnit process @@ -154323,14 +155327,14 @@ self: { description = "A programming language for simple GUIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXft;}; + }) {inherit (pkgs.xorg) libXft;}; "singleton-nats" = callPackage ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; - version = "0.3.0.1"; - sha256 = "b5e3b6f415c62e4e7f900c407ffb377d8dc6c56fa0e8ec601d786dfaf5ddf9fd"; + version = "0.3.1.0"; + sha256 = "f73eb73b439e419e58c3705fa021339178efa00e2cef90e7ca5a6a4bc97472f8"; libraryHaskellDepends = [ base singletons ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = stdenv.lib.licenses.bsd3; @@ -154423,16 +155427,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "singletons_2_0" = callPackage + "singletons_2_0_0_1" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl , process, syb, tasty, tasty-golden, template-haskell, th-desugar }: mkDerivation { pname = "singletons"; - version = "2.0"; - sha256 = "d4caa9f3e819eaa960751ec65e9a2b7656ee91385ea8d2f24dc9c4843678acca"; - revision = "1"; - editedCabalFile = "998190e96130bd256c33650f93dc36c44995fee7dc40fe6b59455b3791f18178"; + version = "2.0.0.1"; + sha256 = "ff21d7c55dcb6b92bddc67bcfbae23cb50f1dfb492c8ba9808f30c36ab65e447"; libraryHaskellDepends = [ base containers mtl syb template-haskell th-desugar ]; @@ -155253,7 +156255,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "smoothie" = callPackage + "smoothie_0_4_1" = callPackage ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { pname = "smoothie"; @@ -155263,6 +156265,19 @@ self: { homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several interpolation modes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "smoothie" = callPackage + ({ mkDerivation, aeson, base, linear, text, vector }: + mkDerivation { + pname = "smoothie"; + version = "0.4.2.1"; + sha256 = "9b3dcba5880be61a4ebbd895ec711a9d137e6a246f55ee1575170c4e413ebade"; + libraryHaskellDepends = [ aeson base linear text vector ]; + homepage = "https://github.com/phaazon/smoothie"; + description = "Smooth curves via several interpolation modes"; + license = stdenv.lib.licenses.bsd3; }) {}; "smsaero" = callPackage @@ -157947,7 +158962,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "spdx" = callPackage + "spdx_0_2_0_0" = callPackage ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "spdx"; @@ -157960,6 +158975,20 @@ self: { homepage = "https://github.com/phadej/spdx"; description = "SPDX license expression language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "spdx" = callPackage + ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }: + mkDerivation { + pname = "spdx"; + version = "0.2.1.0"; + sha256 = "a7f0d6098e201f5d7b14c13387fe699b9830c95c0192bbd8ceda446a30c980f2"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + homepage = "https://github.com/phadej/spdx"; + description = "SPDX license expression language"; + license = stdenv.lib.licenses.bsd3; }) {}; "spe" = callPackage @@ -159110,6 +160139,7 @@ self: { retry temporary text transformers unix-compat ]; doCheck = false; + enableSharedExecutables = false; postInstall = '' exe=$out/bin/stack mkdir -p $out/share/bash-completion/completions @@ -159175,6 +160205,7 @@ self: { retry temporary text transformers unix-compat ]; doCheck = false; + enableSharedExecutables = false; postInstall = '' exe=$out/bin/stack mkdir -p $out/share/bash-completion/completions @@ -159241,6 +160272,7 @@ self: { retry temporary text transformers unix-compat ]; doCheck = false; + enableSharedExecutables = false; postInstall = '' exe=$out/bin/stack mkdir -p $out/share/bash-completion/completions @@ -161532,7 +162564,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "streaming-commons" = callPackage + "streaming-commons_0_1_13" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , deepseq, directory, hspec, network, process, QuickCheck, random , stm, text, transformers, unix, zlib @@ -161552,6 +162584,29 @@ self: { homepage = "https://github.com/fpco/streaming-commons"; description = "Common lower-level functions needed by various streaming data libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "streaming-commons" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , deepseq, directory, hspec, network, process, QuickCheck, random + , stm, text, transformers, unix, zlib + }: + mkDerivation { + pname = "streaming-commons"; + version = "0.1.14"; + sha256 = "4472cb5847daea6b3341ddf33785bfc03d9e480f7cf67a5bc752198f1c6f39f2"; + libraryHaskellDepends = [ + array base blaze-builder bytestring directory network process + random stm text transformers unix zlib + ]; + testHaskellDepends = [ + array async base blaze-builder bytestring deepseq hspec network + QuickCheck text unix zlib + ]; + homepage = "https://github.com/fpco/streaming-commons"; + description = "Common lower-level functions needed by various streaming data libraries"; + license = stdenv.lib.licenses.mit; }) {}; "streaming-histogram" = callPackage @@ -163131,6 +164186,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "syb_0_6" = callPackage + ({ mkDerivation, base, containers, HUnit, mtl }: + mkDerivation { + pname = "syb"; + version = "0.6"; + sha256 = "a38d1f7e6a40e2c990fec85215c45063a508bf73df98a4483ec78c5025b66cdc"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base containers HUnit mtl ]; + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + description = "Scrap Your Boilerplate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "syb-extras" = callPackage ({ mkDerivation, base, eq, prelude-extras }: mkDerivation { @@ -165426,8 +166495,8 @@ self: { }: mkDerivation { pname = "tasty-lens"; - version = "0.3"; - sha256 = "f8cfd37a5f1da283b99ec0398757510cfbf2affe2004cbf49745e8eb32b69fdd"; + version = "0.3.1"; + sha256 = "06d947e738ef28ba74983fd611f76611483a384d4c637b126419ac61068ce90a"; libraryHaskellDepends = [ base lens smallcheck smallcheck-lens tasty tasty-smallcheck ]; @@ -168947,8 +170016,8 @@ self: { }: mkDerivation { pname = "tighttp"; - version = "0.0.0.8"; - sha256 = "279189c5265c434a8dc73367a1420646577578cc9912a492f13bde74fcbb7175"; + version = "0.0.0.9"; + sha256 = "8b73c5ae1f631621b3e67f9665e5b1dc886c60b16f608f3f929653c21dae1b96"; libraryHaskellDepends = [ base bytestring handle-like monads-tf old-locale papillon simple-pipe time @@ -169917,6 +170986,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls_1_3_3" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring + , cereal, cryptonite, data-default-class, hourglass, memory, mtl + , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509 + , x509-store, x509-validation + }: + mkDerivation { + pname = "tls"; + version = "1.3.3"; + sha256 = "9f03fb059198e1f3d866d1297f86fca3204d07e7cc5e8f7e8ad878be48f1ca24"; + libraryHaskellDepends = [ + asn1-encoding asn1-types async base bytestring cereal cryptonite + data-default-class memory mtl network transformers x509 x509-store + x509-validation + ]; + testHaskellDepends = [ + base bytestring cereal cryptonite data-default-class hourglass mtl + QuickCheck tasty tasty-quickcheck x509 x509-validation + ]; + jailbreak = true; + homepage = "http://github.com/vincenthz/hs-tls"; + description = "TLS/SSL protocol native implementation (Server and Client)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-debug_0_3_4" = callPackage ({ mkDerivation, base, bytestring, cprng-aes, crypto-pubkey , data-default-class, network, pem, time, tls, x509, x509-system @@ -169958,6 +171053,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls-debug_0_4_1" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, pem, time, tls, x509, x509-store, x509-system + , x509-validation + }: + mkDerivation { + pname = "tls-debug"; + version = "0.4.1"; + sha256 = "0051e7f978cde5825317d0ff9220f15dd4ed13512eec30246ec1ff268d00f42c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cryptonite data-default-class network pem time tls + x509 x509-store x509-system x509-validation + ]; + homepage = "http://github.com/vincenthz/hs-tls"; + description = "Set of programs for TLS testing and debugging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls-extra" = callPackage ({ mkDerivation, base, bytestring, certificate, cipher-aes , cipher-rc4, crypto-pubkey, crypto-random, cryptohash, mtl @@ -171435,7 +172551,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tttool" = callPackage + "tttool_1_4_0_4" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, executable-path, filepath, hashable, haskeline , JuicyPixels, mtl, parsec, process, random, template-haskell, time @@ -171455,6 +172571,29 @@ self: { homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tttool" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , directory, executable-path, filepath, hashable, haskeline + , JuicyPixels, mtl, parsec, process, random, template-haskell, time + , vector, yaml + }: + mkDerivation { + pname = "tttool"; + version = "1.4.0.5"; + sha256 = "7adde3a207387ae2cb1d44f30344a0b053703a204c2fdea670ab7409e5ad3764"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base binary bytestring containers directory executable-path + filepath hashable haskeline JuicyPixels mtl parsec process random + template-haskell time vector yaml + ]; + homepage = "https://github.com/entropia/tip-toi-reveng"; + description = "Working with files for the Tiptoi® pen"; + license = stdenv.lib.licenses.mit; }) {}; "tubes" = callPackage @@ -172098,7 +173237,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "twitter-feed" = callPackage + "twitter-feed_0_2_0_3" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring , containers, http-conduit, HUnit, test-framework , test-framework-hunit @@ -172116,9 +173255,10 @@ self: { homepage = "https://github.com/stackbuilders/twitter-feed"; description = "Client for fetching Twitter timeline via Oauth"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "twitter-feed_0_2_0_4" = callPackage + "twitter-feed" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring , containers, http-conduit, HUnit, test-framework , test-framework-hunit @@ -172136,7 +173276,6 @@ self: { homepage = "https://github.com/stackbuilders/twitter-feed"; description = "Client for fetching Twitter timeline via Oauth"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-types" = callPackage @@ -175068,6 +176207,7 @@ self: { testHaskellDepends = [ base hspec monad-logger persistent-sqlite temporary text users-test ]; + doCheck = false; homepage = "https://github.com/agrafix/users"; description = "A persistent backend for the users package"; license = stdenv.lib.licenses.mit; @@ -175639,6 +176779,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "uuid-orphans" = callPackage + ({ mkDerivation, base, safecopy, text, uuid-types, web-routes }: + mkDerivation { + pname = "uuid-orphans"; + version = "1.3.11.1"; + sha256 = "264028379dc6bfea1d84ebd6c745d666c51957430822b52480dd6413717a8b75"; + libraryHaskellDepends = [ + base safecopy text uuid-types web-routes + ]; + description = "Orphan instances for the UUID datatype"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uuid-quasi" = callPackage ({ mkDerivation, base, template-haskell, uuid }: mkDerivation { @@ -177319,6 +178472,7 @@ self: { ]; description = "Sound synthesis with SuperCollider"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vk-aws-route53" = callPackage @@ -178860,6 +180014,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-middleware-content-type" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring + , clay, containers, http-media, http-types, lucid, mtl, shakespeare + , text, transformers, wai, wai-transformers, wai-util + }: + mkDerivation { + pname = "wai-middleware-content-type"; + version = "0.0.0"; + sha256 = "067e44b377f653e3e67853f1f756cc1bf891547a83e4311aac55728537595d36"; + libraryHaskellDepends = [ + aeson base blaze-builder blaze-html bytestring clay containers + http-media http-types lucid mtl shakespeare text transformers wai + wai-transformers wai-util + ]; + description = "Route to different middlewares based on the incoming Accept header"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-middleware-crowd" = callPackage ({ mkDerivation, authenticate, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, clientsession @@ -179188,6 +180360,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-verbs" = callPackage + ({ mkDerivation, base, bifunctors, composition-extra, containers + , errors, http-types, mtl, transformers, wai, wai-transformers + }: + mkDerivation { + pname = "wai-middleware-verbs"; + version = "0.0.1"; + sha256 = "35ff8b93b7a971888aace1b4d2e64d3a7820ae2b6e8e5d0e1abdf05b800b42d3"; + libraryHaskellDepends = [ + base bifunctors composition-extra containers errors http-types mtl + transformers wai wai-transformers + ]; + description = "Route different middleware responses based on the incoming HTTP verb"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-predicates_0_8_4" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, cookie, http-types @@ -179316,30 +180504,6 @@ self: { }) {}; "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, wai - }: - mkDerivation { - pname = "wai-routes"; - version = "0.8.1"; - sha256 = "0ebdf952830d550a6f56bf048ae7f554c88ab8fa0f3a3b613569f620133d41d2"; - 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 wai - ]; - testHaskellDepends = [ - aeson base hspec hspec-wai hspec-wai-json wai - ]; - homepage = "https://ajnsit.github.io/wai-routes/"; - description = "Typesafe URLs for Wai applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-routes_0_9_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, containers, cookie, data-default-class , filepath, hspec, hspec-wai, hspec-wai-json, http-types @@ -179362,6 +180526,31 @@ self: { homepage = "https://ajnsit.github.io/wai-routes/"; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; + }) {}; + + "wai-routes_0_9_1" = 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, wai, wai-app-static, wai-extra + }: + mkDerivation { + pname = "wai-routes"; + version = "0.9.1"; + sha256 = "156c4c065fc94da10d6af66abf3c14d0dafb25b785d7b6d953347da6fd17dcd3"; + 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 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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -179508,6 +180697,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-transformers" = callPackage + ({ mkDerivation, base, composition-extra, transformers, wai }: + mkDerivation { + pname = "wai-transformers"; + version = "0.0.1"; + sha256 = "c8d478a3f5ed775ccdca324e6d042d3e4978935cea553b2139eb442b1f5805eb"; + libraryHaskellDepends = [ + base composition-extra transformers wai + ]; + description = "Simple parameterization of Wai's Application type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-util" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , http-accept, http-types, network-uri, text, transformers, wai @@ -182989,12 +184191,12 @@ self: { ({ mkDerivation, base, directory, random, wx, wxcore }: mkDerivation { pname = "wxAsteroids"; - version = "1.0"; - sha256 = "79116cdf32d6569f3c681e3ccce2dcf0aebc843cc1c3591445cec20f57829a57"; + version = "1.1"; + sha256 = "91fa3fe53f24d28fbbdfd6af0431471baf4b76cc77447366457829522d615d42"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory random wx wxcore ]; - homepage = "http://www.haskell.org/haskellwiki/wxAsteroids"; + homepage = "https://wiki.haskell.org/WxAsteroids"; description = "Try to avoid the asteroids with your space ship"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -183032,7 +184234,7 @@ self: { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper"; license = "unknown"; - }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; "wxcore" = callPackage @@ -183192,7 +184394,7 @@ self: { description = "Haskell FFI bindings for X11 XInput library (-lXi)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xlibs) libXi;}; + }) {inherit (pkgs.xorg) libXi;}; "x509_1_5_0_1" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base @@ -183289,6 +184491,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509_1_6_3" = callPackage + ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base + , bytestring, containers, cryptonite, hourglass, memory, mtl, pem + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "x509"; + version = "1.6.3"; + sha256 = "36c62877046e7ecd6c913da4c21264e18eb56f7cba7abb5d41c42e95845fbade"; + libraryHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base bytestring containers + cryptonite hourglass memory mtl pem + ]; + testHaskellDepends = [ + asn1-types base bytestring cryptonite hourglass mtl tasty + tasty-quickcheck + ]; + jailbreak = true; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "X509 reader and writer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "x509-store_1_5_0" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, crypto-pubkey-types, directory, filepath, mtl, pem @@ -183401,20 +184627,20 @@ self: { "x509-util" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , crypto-pubkey, crypto-pubkey-types, cryptohash, directory, pem - , x509, x509-store, x509-system, x509-validation + , cryptonite, directory, pem, x509, x509-store, x509-system + , x509-validation }: mkDerivation { pname = "x509-util"; - version = "1.5.2"; - sha256 = "3e0249fc7cbc1d801ba8763d32cd8f46086b903551195424cdaa644c43ecd08a"; + version = "1.6.0"; + sha256 = "823ed93ad997c5084bc9610814e7da28414e6aed80b0d37ba1218face3a10c82"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - asn1-encoding asn1-types base bytestring crypto-pubkey - crypto-pubkey-types cryptohash directory pem x509 x509-store - x509-system x509-validation + asn1-encoding asn1-types base bytestring cryptonite directory pem + x509 x509-store x509-system x509-validation ]; + jailbreak = true; homepage = "http://github.com/vincenthz/hs-certificate"; description = "Utility for X509 certificate and chain"; license = stdenv.lib.licenses.bsd3; @@ -183507,6 +184733,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509-validation_1_6_3" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, byteable + , bytestring, containers, cryptonite, data-default-class, hourglass + , memory, mtl, pem, x509, x509-store + }: + mkDerivation { + pname = "x509-validation"; + version = "1.6.3"; + sha256 = "80b7d3beef9dda913c7cc7c890ab703d6030574df2a62df1939036184cd921e3"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base byteable bytestring containers + cryptonite data-default-class hourglass memory mtl pem x509 + x509-store + ]; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "X.509 Certificate and CRL validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xattr" = callPackage ({ mkDerivation, attr, base, bytestring, containers, directory , filepath, HUnit, test-framework, test-framework-hunit, unix @@ -184882,8 +186128,8 @@ self: { homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; - }) {Xrender = null; inherit (pkgs.xlibs) libXpm; - inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;}; + }) {Xrender = null; inherit (pkgs.xorg) libXpm; + inherit (pkgs.xorg) libXrandr; inherit (pkgs) wirelesstools;}; "xmonad" = callPackage ({ mkDerivation, base, containers, directory, extensible-exceptions @@ -185385,7 +186631,7 @@ self: { librarySystemDepends = [ libXtst ]; description = "Thin FFI bindings to X11 XTest library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xlibs) libXtst;}; + }) {inherit (pkgs.xorg) libXtst;}; "xturtle" = callPackage ({ mkDerivation, base, convertible, Imlib, setlocale, X11, X11-xft @@ -186430,14 +187676,13 @@ self: { }: mkDerivation { pname = "yesod-angular"; - version = "0.1.0.1"; - sha256 = "edbfe8ad341813b80855776f71a5246cd6cb723dc009acb2d8834974347c4ab8"; + version = "0.1.0.2"; + sha256 = "27f5f4b53db1474d2d019d84047e73c5ee0da07c55379f76709df0f5fa2a9b1e"; libraryHaskellDepends = [ aeson base containers shakespeare template-haskell text transformers yesod ]; - jailbreak = true; - description = "Yesod Angular JS integration"; + description = "Angular JS integratoin"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -186874,6 +188119,7 @@ self: { homepage = "https://github.com/meteficha/yesod-auth-account-fork"; description = "An account authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-basic" = callPackage @@ -188287,6 +189533,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-content-pdf" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-html, bytestring + , conduit, directory, network-uri, process, temporary, yesod-core + }: + mkDerivation { + pname = "yesod-content-pdf"; + version = "0.1.0.2"; + sha256 = "26cf3132c03deedc76b672b979c4c0588f341109df7f142031ca456d5271a547"; + libraryHaskellDepends = [ + base blaze-builder blaze-html bytestring conduit directory + network-uri process temporary yesod-core + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/alexkyllo/yesod-content-pdf#readme"; + description = "PDF Content Type for Yesod"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yesod-continuations" = callPackage ({ mkDerivation, base, datetime, hashable, hashmap, stm , system-uuid, template-haskell, yesod @@ -189451,7 +190715,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yesod-mangopay" = callPackage + "yesod-mangopay_1_11_4" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra , containers, country-codes, data-default, directory, fast-logger , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay @@ -189483,6 +190747,41 @@ self: { homepage = "https://github.com/prowdsponsor/mangopay"; description = "Yesod library for MangoPay API access"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-mangopay" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra + , containers, country-codes, data-default, directory, fast-logger + , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay + , monad-control, monad-logger, persistent, persistent-postgresql + , persistent-template, resourcet, shakespeare, template-haskell + , text, time, wai, wai-extra, wai-logger, warp, yaml, yesod + , yesod-auth, yesod-core, yesod-form, yesod-persistent + , yesod-static + }: + mkDerivation { + pname = "yesod-mangopay"; + version = "1.11.5"; + sha256 = "7a02a34fc1e8e3ae320f1f07f66ac672c0c240b1eb39fabfb0befa8e893282c8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers http-conduit http-types lifted-base mangopay + persistent-template text time yesod yesod-core + ]; + executableHaskellDepends = [ + aeson base bytestring conduit conduit-extra containers + country-codes data-default directory fast-logger hamlet hjsmin + http-conduit lifted-base mangopay monad-control monad-logger + persistent persistent-postgresql persistent-template resourcet + shakespeare template-haskell text time wai wai-extra wai-logger + warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent + yesod-static + ]; + homepage = "https://github.com/prowdsponsor/mangopay"; + description = "Yesod library for MangoPay API access"; + license = stdenv.lib.licenses.bsd3; }) {}; "yesod-markdown" = callPackage @@ -191724,6 +193023,8 @@ self: { pname = "zlib"; version = "0.6.1.1"; sha256 = "c5f5b4285473657a7997d74f7642f3e7bda40f92c3c5d49471a899e27a4ba735"; + revision = "1"; + editedCabalFile = "e94fcf5a5822e569221c7897bdc15d9ddb31c0d844df0448cd388472d644b212"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ diff --git a/pkgs/development/interpreters/erlang/R15.nix b/pkgs/development/interpreters/erlang/R15.nix index e9c8380c35a..12f7a020032 100644 --- a/pkgs/development/interpreters/erlang/R15.nix +++ b/pkgs/development/interpreters/erlang/R15.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , makeWrapper, gnused, gawk -, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: +, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null }: -assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; +assert wxSupport -> mesa != null && wxGTK != null && xorg != null; let version = "15B03"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ]; + ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xorg.libX11 ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index 23243803e8d..cc15a2d21f5 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null -, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: +, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null }: -assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; +assert wxSupport -> mesa != null && wxGTK != null && xorg != null; assert odbcSupport -> unixODBC != null; with stdenv.lib; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ] + ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] ++ optional odbcSupport [ unixODBC ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 3a3d7434515..6c24f6ecb79 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null -, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null, wxmac ? null +, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null , javacSupport ? false, openjdk ? null , enableHipe ? true }: assert wxSupport -> (if stdenv.isDarwin then wxmac != null - else mesa != null && wxGTK != null && xlibs != null); + else mesa != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk != null; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xlibs.libX11 ]) + ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) ++ optional odbcSupport [ unixODBC ] ++ optional javacSupport [ openjdk ]; diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 9bc36ee47de..7646de28a85 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null -, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null, wxmac ? null +, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null , javacSupport ? false, openjdk ? null , enableHipe ? true }: assert wxSupport -> (if stdenv.isDarwin then wxmac != null - else mesa != null && wxGTK != null && xlibs != null); + else mesa != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk != null; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xlibs.libX11 ]) + ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) ++ optional odbcSupport [ unixODBC ] ++ optional javacSupport [ openjdk ]; diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index f5cf11ead97..fe209f6f114 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi -, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11 +, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, xlibsWrapper, libX11 , makeWrapper, callPackage, self }: assert zlibSupport -> zlib != null; @@ -21,7 +21,7 @@ let sha256 = "0xympj874cnjpxj68xm5gllq2f8bbvz8hr0md8mh1yd6fgzzxibh"; }; - buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ] + buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 28f53f8ca95..32974778168 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, self, callPackage }: +, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage }: assert zlibSupport -> zlib != null; @@ -49,7 +49,7 @@ let buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ - [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ] + [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ] ++ optional zlibSupport zlib; @@ -198,7 +198,7 @@ let tkinter = buildInternalPythonModule { moduleName = "tkinter"; - deps = [ tcl tk x11 ]; + deps = [ tcl tk xlibsWrapper ]; }; readline = buildInternalPythonModule { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 195caa583ad..6f951bc2837 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -5,7 +5,7 @@ , db, gdbm, ncurses, sqlite, readline -, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? !stdenv.isCygwin +, tcl ? null, tk ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? !stdenv.isCygwin , zlib ? null, zlibSupport ? true , expat, libffi @@ -15,7 +15,7 @@ assert zlibSupport -> zlib != null; assert x11Support -> tcl != null && tk != null - && x11 != null + && xlibsWrapper != null && libX11 != null; with stdenv.lib; @@ -92,7 +92,7 @@ let ++ optionals stdenv.isCygwin [ expat libffi ] ++ optionals includeModules ( [ db gdbm ncurses sqlite readline - ] ++ optionals x11Support [ tcl tk x11 libX11 ] + ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] ) ++ optional zlibSupport zlib @@ -249,7 +249,7 @@ let tkinter = if stdenv.isCygwin then null else (buildInternalPythonModule { moduleName = "tkinter"; - deps = [ tcl tk x11 libX11 ]; + deps = [ tcl tk xlibsWrapper libX11 ]; }); } // { diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index f53e42f0bde..d37d6099394 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, stdenv, xlibs, gcc44, makeWrapper, ncurses, cmake }: +{ fetchurl, fetchgit, stdenv, xorg, gcc44, makeWrapper, ncurses, cmake }: stdenv.mkDerivation rec { # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; # gcc 4.6 and above causes crashes on Self startup but gcc 4.4 works. - buildInputs = [ gcc44 ncurses xlibs.libX11 xlibs.libXext makeWrapper cmake ]; + buildInputs = [ gcc44 ncurses xorg.libX11 xorg.libXext makeWrapper cmake ]; selfWrapper = ./self; diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix index 1f24b4dde54..bc943a80ac7 100644 --- a/pkgs/development/interpreters/xulrunner/default.nix +++ b/pkgs/development/interpreters/xulrunner/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs +, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + python dbus dbus_glib pango freetype fontconfig xorg.libXi + xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file + alsaLib nspr nss libnotify xorg.pixman yasm mesa + xorg.libXScrnSaver xorg.scrnsaverproto pysqlite + xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx cairo gstreamer gst_plugins_base icu ]; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 1fae5d42ab7..ac895b5113e 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, audiofile, libcap , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null -, x11Support ? true, x11 ? null, libXrandr ? null +, x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -10,7 +10,7 @@ assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport; assert openglSupport -> (mesa != null && x11Support); -assert x11Support -> (x11 != null && libXrandr != null); +assert x11Support -> (xlibsWrapper != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> libpulseaudio != null; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. propagatedBuildInputs = - optionals x11Support [ x11 libXrandr ] ++ + optionals x11Support [ xlibsWrapper libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ optional openglSupport mesa ++ diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index f5bd144a717..7573d1e1cd2 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, audiofile , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null -, x11Support ? true, x11 ? null, libXrandr ? null +, x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -10,7 +10,7 @@ assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support); -assert x11Support -> (x11 != null && libXrandr != null); +assert x11Support -> (xlibsWrapper != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> libpulseaudio != null; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. - propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ + propagatedBuildInputs = stdenv.lib.optionals x11Support [ xlibsWrapper libXrandr ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; buildInputs = [ pkgconfig audiofile ] ++ diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 454c4e882f5..6084e7074fe 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}: +{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}: stdenv.mkDerivation { name = "Xaw3d-1.5E"; @@ -8,8 +8,8 @@ stdenv.mkDerivation { md5 = "29ecfdcd6bcf47f62ecfd672d31269a1"; }; patches = [./config.patch ./laylex.patch]; - buildInputs = [x11 imake gccmakedep libXmu libXpm libXp bison flex]; - propagatedBuildInputs = [x11 libXmu]; + buildInputs = [imake gccmakedep libXpm libXp bison flex]; + propagatedBuildInputs = [xlibsWrapper libXmu]; meta = { description = "3D widget set based on the Athena Widget set"; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 84c0b5f56aa..f5d806ff67a 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi +{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi , intltool, dbus_glib, at_spi2_core, libSM }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0xgkrnx04vaklbkzc7bzym9s0qhj8aiz4knqlxgx3vxnacsb6vaa"; }; - buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi + buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi intltool dbus_glib at_spi2_core libSM ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 47a2c63d328..e2d6b25e137 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty -, expat, zlib, libpng, pixman, fontconfig, freetype, xlibs +, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 , glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; propagatedBuildInputs = - with xlibs; [ xlibs.xlibs fontconfig expat freetype pixman zlib libpng ] + with xorg; [ xorg.xlibsWrapper fontconfig expat freetype pixman zlib libpng ] ++ optional (!stdenv.isDarwin) libXrender ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional gobjectSupport glib diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index b8e9fd7966b..97636f7a957 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, cairo, x11, fontconfig, freetype, libsigcxx }: +{ fetchurl, stdenv, pkgconfig, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: stdenv.mkDerivation rec { name = "cairomm-1.11.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ]; + propagatedBuildInputs = [ cairo xlibsWrapper fontconfig freetype libsigcxx ]; meta = with stdenv.lib; { description = "A 2D graphics library with support for multiple output devices"; diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix new file mode 100644 index 00000000000..ab5cd2beff3 --- /dev/null +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, gcc48 }: + +stdenv.mkDerivation rec { + name = "ctpp2"; + version = "2.8.3"; + + src = fetchurl { + url = "http://ctpp.havoc.ru/download/ctpp2-${version}.tar.gz"; + sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8"; + }; + + buildInputs = [ cmake gcc48 ]; + + patchPhase = '' + # include to fix undefined getcwd + sed -ie 's//\n#include /' src/CTPP2FileSourceLoader.cpp + ''; + + meta = { + description = "A high performance templating engine"; + homepage = http://ctpp.havoc.ru; + maintiainers = with stdenv.lib.maintainers; [ robbinch ]; + }; +} diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 81c23f7e41c..b4dd865dec0 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib -, enableX11 ? true, xlibs +, enableX11 ? true, xorg , enableSDL ? true, SDL }: let s = @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ] ++ stdenv.lib.optional enableSDL SDL - ++ stdenv.lib.optionals enableX11 (with xlibs; [ + ++ stdenv.lib.optionals enableX11 (with xorg; [ xproto libX11 libXext #xextproto #renderproto libXrender ]); diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 0d262fb061e..8a24445dcca 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, x11 }: +{ stdenv, fetchurl, cmake, xlibsWrapper }: stdenv.mkDerivation rec { version = "18.10"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - buildInputs = [ cmake x11 ]; - propagatedBuildInputs = [ x11 ]; + buildInputs = [ cmake xlibsWrapper ]; + propagatedBuildInputs = [ xlibsWrapper ]; meta = with stdenv.lib; { description = "A general purpose cross-platform C++ machine learning library"; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index d51419f3754..6398e5542ac 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi +{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }: let inherit (composableDerivation) edf; in @@ -11,7 +11,7 @@ composableDerivation.composableDerivation {} rec { sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih"; }; - propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; + propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; buildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix index a5b65f09e61..cb71724a360 100644 --- a/pkgs/development/libraries/fltk/fltk13.nix +++ b/pkgs/development/libraries/fltk/fltk13.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi +{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng , cfg ? {} , automake, autoconf, libtool @@ -21,7 +21,7 @@ composableDerivation.composableDerivation {} { --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand' ''; - propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; + propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; enableParallelBilding = true; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index dfd2c75184e..2d44444ab40 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: +{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: let version = "1.7.9"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; }; - buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; + buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; doCheck = true; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index e966388b2ad..3c823adf91b 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor +{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor , libXrandr, mesa, libXft, libXfixes, xinput }: let @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n"; }; - buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr + buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft mesa libXfixes xinput ]; doCheck = true; diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index 86ebaa0d8d9..fa8e9f0ef2c 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkgconfig, xlibs, xorgserver, xinput }: +, stdenv, fetchurl, pkgconfig, xorg, xorgserver, xinput }: stdenv.mkDerivation rec { name = "frame-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv pkgconfig - ] ++ stdenv.lib.optional enableX11 [xlibs.xorgserver xlibs.libX11 xlibs.libXext xlibs.libXi]; + ] ++ stdenv.lib.optional enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi]; configureFlags = stdenv.lib.optional enableX11 "--with-x11"; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 6159ce7c9e0..368a1e27487 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11, cmake }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, xlibsWrapper, cmake }: let version = "3.0.0"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ in stdenv.mkDerivation { sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra"; }; - buildInputs = [ libXi libXrandr libXxf86vm mesa x11 cmake ]; + buildInputs = [ libXi libXrandr libXxf86vm mesa xlibsWrapper cmake ]; meta = with stdenv.lib; { description = "Create and manage windows containing OpenGL contexts"; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 24c24fe5f12..5ef53ec7939 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true -, stdenv, fetchurl, pkgconfig, xlibs, xorgserver, python3, dbus_libs, frame, grail }: +, stdenv, fetchurl, pkgconfig, xorg, xorgserver, python3, dbus_libs, frame, grail }: stdenv.mkDerivation rec { name = "geis-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig python3 dbus_libs frame grail ] - ++ stdenv.lib.optional enableX11 [xlibs.libX11 xlibs.libXtst xlibs.libXext xlibs.libXi xlibs.xorgserver]; + ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.xorgserver]; configureFlags = stdenv.lib.optional enableX11"--enable-x11"; diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index 3ae649b6790..b6e515fef80 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, imlib2 }: +{ stdenv, fetchurl, xlibsWrapper, imlib2 }: stdenv.mkDerivation rec { name = "giblib-1.2.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; }; - buildInputs = [x11 imlib2]; + buildInputs = [xlibsWrapper imlib2]; meta = { homepage = http://linuxbrit.co.uk/giblib/; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 5127311e7c9..cbdc2831187 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }: +{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi }: with stdenv.lib; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1mhkllxz49l1x680dmzrv2i82qjrq017sykah3xc90f2d8qcxfv9"; }; - nativeBuildInputs = [ x11 libXmu libXi ]; + nativeBuildInputs = [ xlibsWrapper libXmu libXi ]; propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h patchPhase = '' diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 087be3bb6de..02d26759834 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 +{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper , libXinerama, libXcursor }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ - cmake mesa libXrandr libXi libXxf86vm libXfixes x11 + cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper libXinerama libXcursor ]; diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index 3cf946bb4ba..a4f27824d13 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -1,5 +1,5 @@ { enableX11 ? true, - stdenv, fetchurl, pkgconfig, xlibs, python3, frame }: + stdenv, fetchurl, pkgconfig, xorg, python3, frame }: stdenv.mkDerivation rec { name = "grail-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig python3 frame ] - ++ stdenv.lib.optional enableX11 [xlibs.libX11 xlibs.libXtst xlibs.libXext xlibs.libXi xlibs.libXfixes]; + ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes]; configureFlags = stdenv.lib.optional enableX11 "--with-x11"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index 040cf20c4ea..eb55ae874e5 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia +{ fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc , libintlOrEmpty , # Whether to build no plugins that have external dependencies @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # can't build alsaLib on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib ++ stdenv.lib.optionals (!minimalDeps) - [ xlibs.xlibs xlibs.libXv libogg libtheora libvorbis freetype pango + [ xorg.xlibsWrapper xorg.libXv libogg libtheora libvorbis freetype pango liboil ] # can't build cdparanoia on darwin ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index fec9d16cf95..e821e693b0c 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs -, gdk_pixbuf, libintlOrEmpty, x11 +{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg +, gdk_pixbuf, libintlOrEmpty, xlibsWrapper , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null }: -assert xineramaSupport -> xlibs.libXinerama != null; +assert xineramaSupport -> xorg.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig gettext ]; - propagatedBuildInputs = with xlibs; with stdenv.lib; + propagatedBuildInputs = with xorg; with stdenv.lib; [ glib cairo pango gdk_pixbuf atk ] ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ libXrandr libXrender libXcomposite libXi libXcursor ] - ++ optionals stdenv.isDarwin [ x11 libXdamage ] + ++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ] ++ libintlOrEmpty ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index a7f4bdad48a..8422f71985a 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gettext, perl , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, x11, wayland, libxkbcommon, epoxy +, xorg, xlibsWrapper, wayland, libxkbcommon, epoxy , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null }: -assert xineramaSupport -> xlibs.libXinerama != null; +assert xineramaSupport -> xorg.libXinerama != null; assert cupsSupport -> cups != null; let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; buildInputs = [ libxkbcommon epoxy ]; - propagatedBuildInputs = with xlibs; with stdenv.lib; + propagatedBuildInputs = with xorg; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] ++ optionals stdenv.isLinux [ wayland ] ++ optional xineramaSupport libXinerama diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 50703f907d3..3ff608a4ac3 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: +{ stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: stdenv.mkDerivation rec { name = "imlib2-1.4.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg"; }; - buildInputs = [ x11 libjpeg libtiff giflib libpng bzip2 ]; + buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 7b86403b0aa..2fa9cf7dbf9 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, xlibs, libjpeg }: +{ stdenv, fetchurl, unzip, xorg, libjpeg }: stdenv.mkDerivation rec { name = "jasper-1.900.1"; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index d40cdf75ad1..e0272529907 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1wiydkp8a4adwsgfsd688hpv2z7hjv5manhckchk96v6qdsbqk91"; }; + # Rust refers to jemalloc functions directly so make sure the prefix matchs. + configureFlags = [ + "--with-jemalloc-prefix=je_" + ]; + meta = with stdenv.lib; { homepage = http://www.canonware.com/jemalloc/index.html; description = "a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support"; diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix index 4ebac7aab70..e6961f16d27 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix @@ -116,7 +116,7 @@ let { inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme libgcrypt libgit2 modemmanager networkmanager perl - perlPackages qimageblitz xlibs zlib; + perlPackages qimageblitz xorg zlib; boost = boost155; gif = giflib; glib2 = glib; @@ -147,7 +147,7 @@ let }); frameworkintegration = extendDerivation super.frameworkintegration { - buildInputs = [ scope.xlibs.libXcursor ]; + buildInputs = [ scope.xorg.libXcursor ]; }; kauth = extendDerivation super.kauth { @@ -164,7 +164,7 @@ let }; kdelibs4support = extendDerivation super.kdelibs4support { - buildInputs = [ scope.networkmanager scope.xlibs.libSM ]; + buildInputs = [ scope.networkmanager scope.xorg.libSM ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_VERSION=4.5" diff --git a/pkgs/development/libraries/kde-frameworks-5.12/default.nix b/pkgs/development/libraries/kde-frameworks-5.12/default.nix index 0e0ee773343..229f28f9095 100644 --- a/pkgs/development/libraries/kde-frameworks-5.12/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.12/default.nix @@ -116,7 +116,7 @@ let { inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme libgcrypt libgit2 modemmanager networkmanager perl - perlPackages qimageblitz xlibs zlib; + perlPackages qimageblitz xorg zlib; boost = boost155; gif = giflib; glib2 = glib; @@ -154,7 +154,7 @@ let }); frameworkintegration = extendDerivation super.frameworkintegration { - buildInputs = [ scope.xlibs.libXcursor ]; + buildInputs = [ scope.xorg.libXcursor ]; }; kauth = extendDerivation super.kauth { @@ -171,7 +171,7 @@ let }; kdelibs4support = extendDerivation super.kdelibs4support { - buildInputs = [ scope.networkmanager scope.xlibs.libSM ]; + buildInputs = [ scope.networkmanager scope.xorg.libSM ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_VERSION=4.5" diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index 8b7d73462c2..8398f2d7db4 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, phonon, +{ stdenv, fetchurl, fetchpatch, cmake, kdelibs, subversion, qt4, automoc4, phonon, gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }: stdenv.mkDerivation rec { @@ -9,14 +9,22 @@ stdenv.mkDerivation rec { sha256 = "dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac"; }; + patches = [(fetchpatch { + name = "svn-1.9.patch"; + url = "https://git.reviewboard.kde.org/r/124783/diff/raw/"; + sha256 = "1ixll5pvynb3l4znc65d82a5bj2s3c7c7is585s2wdpfzjgl5ay0"; + })]; + propagatedBuildInputs = [ kdelibs qt4 phonon ]; buildInputs = [ apr aprutil subversion boost qjson grantlee ]; nativeBuildInputs = [ cmake automoc4 gettext pkgconfig ]; - meta = { - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.linux; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + maintainers = [ maintainers.ambrop72 ]; + platforms = platforms.linux; description = "KDE libraries for IDE-like programs"; longDescription = '' A free, opensource set of libraries that can be used as a foundation for diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index f0b4a1064fe..c964801f300 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,21 +1,23 @@ { fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite , clutter_gtk, libsoup /*, libmemphis */ }: +let version = "0.12.11"; in stdenv.mkDerivation rec { - name = "libchamplain-0.12.10"; + name = "libchamplain-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libchamplain/0.12/${name}.tar.xz"; - sha256 = "019b8scnx7d3wdylmpk9ihzh06w25b63x9cn8nhj6kjx82rcwlxz"; + url = "mirror://gnome/sources/libchamplain/0.12/libchamplain-${version}.tar.xz"; + sha256 = "19aadn4lh6mzpz2qzi5l1qcbi11a57qqv1zxp2n10z4nin4287l5"; }; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ]; - meta = { + meta = with stdenv.lib; { + inherit version; homepage = http://projects.gnome.org/libchamplain/; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; description = "C library providing a ClutterActor to display maps"; @@ -28,6 +30,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 4dc103515ac..4dca6b57c75 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libclthreads, libX11, libXft, xlibs }: +{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg }: stdenv.mkDerivation rec { name = "libclxclient-${version}"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0"; }; - buildInputs = [ libclthreads libX11 libXft xlibs.xproto ]; + buildInputs = [ libclthreads libX11 libXft xorg.xproto ]; - NIX_CFLAGS_COMPILE = "-I${xlibs.xproto}/include -I${libXft}/include"; + NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft}/include"; patchPhase = '' sed -e "s@ldconfig@@" -i Makefile diff --git a/pkgs/development/libraries/libcm/default.nix b/pkgs/development/libraries/libcm/default.nix index 09ef21dff59..1d4e96d55b6 100644 --- a/pkgs/development/libraries/libcm/default.nix +++ b/pkgs/development/libraries/libcm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, xlibs, mesa}: +{stdenv, fetchurl, pkgconfig, glib, xorg, mesa}: stdenv.mkDerivation { name = "libcm-0.1.1"; @@ -7,8 +7,8 @@ stdenv.mkDerivation { sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn"; }; buildInputs = [ - pkgconfig glib xlibs.xlibs xlibs.libXdamage xlibs.libXcomposite - xlibs.libXtst xlibs.inputproto + pkgconfig glib xorg.xlibsWrapper xorg.libXdamage xorg.libXcomposite + xorg.libXtst xorg.inputproto # !!! inputproto should really be propagated by libXtst ]; propagatedBuildInputs = [mesa]; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index ec2611e2ac9..58de331c0c5 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -13,13 +13,13 @@ let owner = "publicsuffix"; }; - libVersion = "0.9.0"; + libVersion = "0.10.0"; in stdenv.mkDerivation { name = "libpsl-${version}"; src = fetchFromGitHub { - sha256 = "01vmlmm75jdpfmd546z1yib92nmdqdlqv19ax379p3ys6kgap1sw"; + sha256 = "0m6jz0cc49cp0zki1qb2b1z7z0djladayfhbxi0i20pad28czsbn"; rev = "libpsl-${libVersion}"; repo = "libpsl"; owner = "rockdaboot"; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index a0050daec34..809a855835d 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec{ - name = "libqb-0.17.1"; + name = "libqb-0.17.2"; src = fetchurl { url = "https://fedorahosted.org/releases/q/u/quarterback/${name}.tar.xz"; - sha256 = "0a9fy4hb6ixs875fbqw77dfj7519ixg27vg4yajyl87y7gw1a8bs"; + sha256 = "1zpl45p3n6dn1jgbsrrmccrmv2mvp8aqmnl0qxfjf7ymkrj9qhcs"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { homepage = https://github.com/clusterlabs/libqb; diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix index 6ac4eb29d13..2649cb3660d 100644 --- a/pkgs/development/libraries/libu2f-server/default.nix +++ b/pkgs/development/libraries/libu2f-server/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, json_c, hidapi, openssl, check }: +{ stdenv, fetchurl, pkgconfig, json_c, openssl, check }: stdenv.mkDerivation rec { - name = "libu2f-server-0.0.0"; + name = "libu2f-server-1.0.1"; src = fetchurl { - url = "https://developers.yubico.com/libu2f-server/Releases/libu2f-server-0.0.0.tar.xz"; - sha256 = "1vdl3qavzfpi6p6h48zw17md9wykfzpay5c4l1c08id46m560wp0"; + url = "https://developers.yubico.com/libu2f-server/Releases/${name}.tar.xz"; + sha256 = "0vhzixz1s629qv9dpdj6b7fxfyxnr5j2vx2cq9q6v790a68ga656"; }; - buildInputs = [ pkgconfig json_c hidapi openssl check ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ json_c openssl check ]; meta = with stdenv.lib; { homepage = https://developers.yubico.com/libu2f-server/; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 4513530e6f0..a2e5d153060 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, x11, python3, libxslt }: +{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }: stdenv.mkDerivation rec { name = "lirc-0.9.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preBuild = "patchShebangs ."; - buildInputs = [ alsaLib help2man pkgconfig x11 python3 libxslt ]; + buildInputs = [ alsaLib help2man pkgconfig xlibsWrapper python3 libxslt ]; configureFlags = [ "--with-driver=devinput" diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 6944b55a721..e7106b9877e 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, glib, cairo, libpng, harfbuzz , fontconfig, freetype, libintlOrEmpty, gobjectIntrospection }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ optional stdenv.isDarwin fontconfig; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; + propagatedBuildInputs = [ xlibsWrapper glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 872576d9fb0..2c07c1e0858 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -26,7 +26,7 @@ # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11. , mesa ? null -, x11 ? null +, xlibsWrapper ? null , libXmu ? null }: @@ -41,7 +41,7 @@ assert enableXM -> motif != null; # OpenGL/X11 User Interface and Visualisation drivers. assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> mesa != null; -assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> x11 != null; +assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null; assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null; let @@ -81,8 +81,8 @@ let }; enableParallelBuilding = true; - buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa x11 libXmu ]; - propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa x11 libXmu ]; + buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; + propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index ffad4418815..08d8f141deb 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -7,7 +7,7 @@ , threadSupport ? true , mysqlSupport ? false, mysql ? null , openglSupport ? false, mesa ? null, libXmu ? null -, x11, xextproto, zlib, libjpeg, libpng, which +, xlibsWrapper, xextproto, zlib, libjpeg, libpng, which }: assert xftSupport -> libXft != null; @@ -30,7 +30,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which ]; - propagatedBuildInputs = [libpng x11 libXft libXrender zlib libjpeg]; + propagatedBuildInputs = [libpng xlibsWrapper libXft libXrender zlib libjpeg]; configureFlags = " -v diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index 5862fb6708d..136c352d1aa 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -152,7 +152,7 @@ let multimedia = callPackage ( - { qtSubmodule, base, declarative + { qtSubmodule, base, declarative, pkgconfig , alsaLib, gstreamer, gst_plugins_base, libpulseaudio }: @@ -160,7 +160,7 @@ let name = "qtmultimedia"; qtInputs = [ base declarative ]; buildInputs = [ - alsaLib gstreamer gst_plugins_base libpulseaudio + pkgconfig alsaLib gstreamer gst_plugins_base libpulseaudio ]; } ) diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 2e4a1c1c161..30d53eb874b 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll , srcs, version -, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi +, xorg, libX11, libxcb, libXcursor, libXext, libXrender, libXi , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon , fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre , zlib, libjpeg, libpng, libtiff, sqlite, icu @@ -163,7 +163,7 @@ stdenv.mkDerivation { PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; propagatedBuildInputs = [ - xlibs.libXcomposite libX11 libxcb libXext libXrender libXi + xorg.libXcomposite libX11 libxcb libXext libXrender libXi fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre zlib libjpeg libpng libtiff sqlite icu xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index d7a0b11a8da..ef2db5ae5a6 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -1,6 +1,6 @@ # alsaLib vorbisTools python can be made optional -{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, x11 }: +{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, xlibsWrapper }: stdenv.mkDerivation { name = "snack-2.2.10"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { postUnpack = ''sourceRoot="$sourceRoot/unix"''; - buildInputs = [ python tcl tk vorbisTools pkgconfig x11 ]; + buildInputs = [ python tcl tk vorbisTools pkgconfig xlibsWrapper ]; postInstall = "aoeu"; diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index bde3f6e4efb..0ed4f24ef86 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, unzip, xlibs }: +{ stdenv, requireFile, unzip, xorg }: assert stdenv.system == "i686-linux"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.cc.cc ]; + libraries = [ xorg.libXpm xorg.libXt xorg.libX11 xorg.libICE xorg.libSM stdenv.cc.cc ]; meta = { homepage = http://java.sun.com/products/sjwtoolkit/download.html; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index e503ade3ebc..cf14490c514 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, bashInteractive, autoconf, automake, libtool, pkgconfig -, git, xlibs, gnum4, libxcb, gperf }: +, git, xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { name = "xcb-util-cursor-0.1.1-3-gf03cc27"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { libtool libxcb pkgconfig - xlibs.utilmacros - xlibs.xcbutilimage - xlibs.xcbutilrenderutil + xorg.utilmacros + xorg.xcbutilimage + xorg.xcbutilrenderutil ]; configurePhase = '' diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 3fba451c711..85e2f08b31d 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.aleksey.com/xmlsec; description = "XML Security Library in C based on libxml2"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 079b457ab1f..c6ab03df10a 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, ruby }: stdenv.mkDerivation rec { - name = "yajl-2.0.4"; + name = "yajl-2.1.0"; src = fetchurl { - url = http://github.com/lloyd/yajl/tarball/2.0.4; + url = http://github.com/lloyd/yajl/tarball/2.1.0; name = "${name}.tar.gz"; - sha256 = "0661bfi4hfvwg3z2pf51wqbf5qd5kfn0dk83v5s2xwhmry8rd6y1"; + sha256 = "0f6yrjc05aa26wfi7lqn2gslm19m6rm81b30ksllpkappvh162ji"; }; buildInputs = [ cmake ruby ]; diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index b98d1f2385d..a62088824ff 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xlibs, alsaLib, cairo }: +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo }: stdenv.mkDerivation rec { @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { unzip ${sources40Zip} -d $prefix/lib/pharo-vm/ ''; - buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xlibs.libX11 xlibs.libICE xlibs.libSM alsaLib cairo ]; + buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index 37026ad9344..eb1c01e4eef 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, x11 }: +{ stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "gl"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pure freeglut mesa x11 ]; + propagatedBuildInputs = [ pure freeglut mesa xlibsWrapper ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index b36a58279fa..0fe1667b040 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, x11 }: +{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "tk"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pure tcl tk x11 ]; + propagatedBuildInputs = [ pure tcl tk xlibsWrapper ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 0589bec36b9..cb93ccc2b58 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, x11, isPyPy }: +{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, xlibsWrapper, isPyPy }: if isPyPy then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { version = "1.10.0"; @@ -23,7 +23,7 @@ if isPyPy then throw "pycairo not supported for interpreter ${python.executable} sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4"; }; - buildInputs = [ python pkgconfig cairo x11 ]; + buildInputs = [ python pkgconfig cairo xlibsWrapper ]; configurePhase = '' ( diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 62d39d768f9..a9d81f028f4 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -235,7 +235,7 @@ let ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ]; cit = [ pkgs.gsl ]; curl = [ pkgs.curl ]; - devEMF = [ pkgs.xlibs.libXft ]; + devEMF = [ pkgs.xorg.libXft ]; diversitree = [ pkgs.gsl pkgs.fftw ]; EMCluster = [ pkgs.liblapack ]; fftw = [ pkgs.fftw ]; @@ -289,7 +289,7 @@ let rgdal = [ pkgs.proj pkgs.gdal ]; rgeos = [ pkgs.geos ]; rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ]; - rgl = [ pkgs.mesa pkgs.x11 ]; + rgl = [ pkgs.mesa pkgs.xlibsWrapper ]; Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2 ]; Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; @@ -340,7 +340,7 @@ let TAQMNGR = [ pkgs.zlib ]; tiff = [ pkgs.libtiff ]; TKF = [ pkgs.gsl ]; - tkrplot = [ pkgs.xlibs.libX11 ]; + tkrplot = [ pkgs.xorg.libX11 ]; topicmodels = [ pkgs.gsl ]; udunits2 = [ pkgs.udunits pkgs.expat ]; V8 = [ pkgs.v8 ]; @@ -1632,7 +1632,7 @@ let }); devEMF = old.devEMF.overrideDerivation (attrs: { - NIX_CFLAGS_LINK = "-L${pkgs.xlibs.libXft}/lib -lXft"; + NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft}/lib -lXft"; }); slfm = old.slfm.overrideDerivation (attrs: { diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index d92cca88d5f..5394829a830 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,15 +1,17 @@ -{stdenv, fetchurl, curl, dmd, gcc, unzip }: +{ stdenv, fetchFromGitHub, curl, dmd, gcc }: +let version = "0.9.24"; in stdenv.mkDerivation { - name = "dub-0.9.23"; + name = "dub-${version}"; - src = fetchurl { - url = "https://github.com/D-Programming-Language/dub/archive/v0.9.23.tar.gz"; - sha256 = "7ecbce89c0e48b43705d7c48003394f383556f33562c4b5d884a786cd85814d1"; + src = fetchFromGitHub { + sha256 = "1j2cs2mvaj6bjjicabq6lh97nx0v4b2k6pj4cmywki7hf3i1p8yy"; + rev = "v${version}"; + repo = "dub"; + owner = "D-Programming-Language"; }; - buildInputs = [ unzip curl ]; - + buildInputs = [ curl ]; propagatedBuildInputs = [ gcc dmd ]; buildPhase = '' @@ -26,9 +28,10 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { + inherit version; description = "Build tool for D projects"; homepage = http://code.dlang.org/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index b3867be6377..d686da98fa3 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip +, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, unzip , systemd }: let @@ -9,9 +9,9 @@ let paths = [ stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss - xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst - xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr - xlibs.libXcursor libcap systemd + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor libcap systemd ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix index c7cc21a823c..89a56f1dbad 100644 --- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix @@ -1,16 +1,17 @@ -{ mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs -, fetchFromGitHub, language-nix, lens, optparse-applicative, pretty, pretty-show -, stdenv, nix-prefetch-scripts, makeWrapper +{ mkDerivation, ansi-wl-pprint, base, Cabal, containers +, distribution-nixpkgs, language-nix, lens, optparse-applicative +, pretty, pretty-show, stdenv, text, yaml +, nix-prefetch-scripts, makeWrapper, fetchFromGitHub }: mkDerivation rec { pname = "cabal2nix"; - version = "20150903"; + version = "20150922"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7"; + sha256 = "17s800yd8mm48yjjqiayvycaf8z0y1giwp8jp271875wdrx3p75a"; }; postUnpack = "sourceRoot+=/${pname}"; isLibrary = false; @@ -18,7 +19,7 @@ mkDerivation rec { enableSharedExecutables = false; executableHaskellDepends = [ ansi-wl-pprint base Cabal containers distribution-nixpkgs - language-nix lens optparse-applicative pretty pretty-show + language-nix lens optparse-applicative pretty pretty-show text yaml ]; executableToolDepends = [ makeWrapper ]; postInstall = '' diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix index 694b452dd81..6c2243628da 100644 --- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix +++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix @@ -1,31 +1,33 @@ { mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq -, deepseq-generics, directory, doctest, fetchFromGitHub, filepath -, hackage-db, hspec, language-nix, lens, pretty, process, SHA -, split, stdenv, transformers, utf8-string +, deepseq-generics, directory, doctest, filepath, hackage-db +, hashable, hspec, language-nix, lens, pretty, process, QuickCheck +, SHA, split, stdenv, text, transformers, unordered-containers +, utf8-string, yaml, fetchFromGitHub }: mkDerivation rec { pname = "distribution-nixpkgs"; - version = "20150903"; + version = "20150922"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7"; + sha256 = "17s800yd8mm48yjjqiayvycaf8z0y1giwp8jp271875wdrx3p75a"; }; postUnpack = "sourceRoot+=/${pname}"; libraryHaskellDepends = [ - aeson base bytestring Cabal containers deepseq deepseq-generics - directory doctest filepath hackage-db hspec language-nix lens - pretty process SHA split transformers utf8-string + aeson base bytestring Cabal containers deepseq-generics directory + filepath hackage-db hashable language-nix lens pretty process SHA + split text transformers unordered-containers utf8-string yaml ]; testHaskellDepends = [ aeson base bytestring Cabal containers deepseq deepseq-generics - directory doctest filepath hackage-db hspec language-nix lens - pretty process SHA split transformers utf8-string + directory doctest filepath hackage-db hashable hspec language-nix + lens pretty process QuickCheck SHA split text transformers + unordered-containers utf8-string yaml ]; homepage = "https://github.com/nixos/cabal2nix#readme"; - description = "Convert Cabal files into Nix build instructions"; + description = "Data types and functions to manipulate the Nixpkgs distribution"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ simons ]; } diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix index 0f7a31652da..422ab0fb18f 100644 --- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix @@ -1,24 +1,28 @@ -{ mkDerivation, base, Cabal, containers, distribution-nixpkgs -, fetchFromGitHub, filepath, language-nix, lens, monad-par -, monad-par-extras, mtl, optparse-applicative, pretty, stdenv +{ mkDerivation, aeson, base, bytestring, Cabal, containers +, deepseq-generics, directory, distribution-nixpkgs, filepath +, language-nix, lens, monad-par, monad-par-extras, mtl +, optparse-applicative, pretty, SHA, split, stackage-types, stdenv +, text, time, utf8-string, yaml, fetchFromGitHub }: mkDerivation rec { pname = "hackage2nix"; - version = "20150903"; + version = "20150922"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7"; + sha256 = "17s800yd8mm48yjjqiayvycaf8z0y1giwp8jp271875wdrx3p75a"; }; postUnpack = "sourceRoot+=/${pname}"; isLibrary = false; isExecutable = true; enableSharedExecutables = false; executableHaskellDepends = [ - base Cabal containers distribution-nixpkgs filepath language-nix - lens monad-par monad-par-extras mtl optparse-applicative pretty + aeson base bytestring Cabal containers deepseq-generics directory + distribution-nixpkgs filepath language-nix lens monad-par + monad-par-extras mtl optparse-applicative pretty SHA split + stackage-types text time utf8-string yaml ]; postInstall = '' exe=$out/bin/${pname} diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index e1479819c2f..48b543bcdf1 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kibana-${version}"; - version = "4.2.0"; + version = "4.1.2"; src = fetchurl { url = "http://download.elastic.co/kibana/kibana-snapshot/kibana-4.2.0-snapshot-linux-x86.tar.gz"; - sha256 = "01v35iwy8y6gpbl0v9gikvbx3zdxkrm60sxann76mkaq2al3pv0i"; + sha256 = "1sa92laawxc05abiysvp12v5nzrqggmls592mkprwnbkkkbwsm5x"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 5cfc39a5254..48ba12ccd9c 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { name = "swig-${version}"; @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ urkud ]; + maintainers = [ lib.maintainers.urkud ]; }; } diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 389e473240b..f93f7d6511d 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { name = "swig-${version}"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "swig"; repo = "swig"; rev = "rel-${version}"; - sha256 = "1y8rlrkqs9h5cyp75s1i9rvrj35kkcwjjw65dyv3xy1skgfxb6w8"; + sha256 = "18zp9546d5xfq88nyykk5v3hh0iyp8r59i2ridbavxn3z914mhyv"; }; nativeBuildInputs = [ autoconf automake libtool bison ]; @@ -25,24 +25,10 @@ stdenv.mkDerivation rec { meta = { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - - longDescription = '' - SWIG is an interface compiler that connects programs written in C and - C++ with languages such as Perl, Python, Ruby, Scheme, and Tcl. It - works by taking the declarations found in C/C++ header files and using - them to generate the wrapper code that scripting languages need to - access the underlying C/C++ code. In addition, SWIG provides a variety - of customization features that let you tailor the wrapping process to - suit your application. - ''; - homepage = http://swig.org/; - # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; - - platforms = stdenv.lib.platforms.unix; - - maintainers = with stdenv.lib.maintainers; [ urkud ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.urkud lib.maintainers.wkennington ]; }; } diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix index 978213f6760..ed3b99aad00 100644 --- a/pkgs/development/tools/node-webkit/nw11.nix +++ b/pkgs/development/tools/node-webkit/nw11.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap , libnotify}: let @@ -9,10 +9,10 @@ let nwEnv = buildEnv { name = "node-webkit-env"; paths = [ - xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf - freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage - xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc - xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap + xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc + xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap libnotify ]; }; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 0ad3ece2465..7492acb1367 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap , libnotify}: let @@ -9,10 +9,10 @@ let nwEnv = buildEnv { name = "nwjs-env"; paths = [ - xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf - freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage - xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc - xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap + xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc + xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap libnotify ]; }; diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix index 97399e5268c..213b94102b0 100644 --- a/pkgs/development/tools/node-webkit/nw9.nix +++ b/pkgs/development/tools/node-webkit/nw9.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev}: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -8,10 +8,10 @@ let nwEnv = buildEnv { name = "node-webkit-env"; paths = [ - xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf - freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage - xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc.cc - xlibs.libXtst xlibs.libXi + xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc.cc + xorg.libXtst xorg.libXi ]; }; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 26435088ade..2efd85f8401 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xlibs +{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xorg , chromedriver, chromeSupport ? true }: with stdenv.lib; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { ${jdk}/bin/jar xf $src launchers/launcher-linux-amd64 patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xlibs.libX11}/lib" \ + --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11}/lib" \ launchers/launcher-linux-${arch} ${jdk}/bin/jar uf $src launchers/launcher-linux-${arch} ''; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index a5bfb8bfc59..a59d656b625 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk, atk , pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss -, xlibs, libcap, unzip +, xorg, libcap, unzip }: let @@ -8,9 +8,9 @@ let name = "env-thrust"; paths = [ stdenv.cc.cc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf - cairo cups expat alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11 - xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite - xlibs.libXi xlibs.libXfixes xlibs.libXrandr xlibs.libXcursor libcap + cairo cups expat alsaLib nspr gconf nss xorg.libXrender xorg.libX11 + xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite + xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 74fe5232fa1..07075571c7e 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio -, xlibs }: +, xorg }: assert stdenv.system == "x86_64-linux"; let - inherit (xlibs) libXext libX11; + inherit (xorg) libXext libX11; lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [ zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio]; diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 76aed3f2cc6..681fec72f96 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, x11, mesa, SDL, openal, freealut, libogg, libvorbis }: +{ fetchurl, stdenv, cmake, xlibsWrapper, mesa, SDL, openal, freealut, libogg, libvorbis }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv"; }; - buildInputs = [ cmake x11 mesa SDL openal freealut libogg libvorbis ]; + buildInputs = [ cmake xlibsWrapper mesa SDL openal freealut libogg libvorbis ]; buildPhase = '' cmake ./ diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 2de42fd86ee..059fa74f8be 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, cmake, git, curl, SDL, xercesc, openal, lua , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng -, fontconfig, freetype, xlibs, makeWrapper, bash, which, gnome3, mesa_glu +, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu , mesa_drivers }: let version = "3.9.2"; lib-env = buildEnv { name = "megaglest-lib-env"; - paths = [ SDL xlibs.libSM xlibs.libICE xlibs.libX11 xlibs.libXext + paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype stdenv.cc.cc glew mesa_glu mesa_drivers wxGTK ]; }; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 72673ea010c..850b1d391c5 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp -, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite, luajit, freetype +, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, sqlite, luajit, freetype , gettext }: @@ -31,7 +31,7 @@ in stdenv.mkDerivation { buildInputs = [ cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa - openal libvorbis x11 sqlite luajit freetype gettext + openal libvorbis xlibsWrapper sqlite luajit freetype gettext ]; postInstall = '' diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index a94f388b322..ed682e7bed9 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, fetchurl, patchelf, makeWrapper, xlibs, gtk, glib, udev, alsaLib, atk +{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk, glib, udev, alsaLib, atk , nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }: # TODO: use dynamic attributes once Nix 1.7 is out @@ -34,12 +34,12 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" - wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" + wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" for f in $out/lib/*; do - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xorg.libX11 stdenv.glibc xorg.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f done ''; diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix index ed447004345..2ad922834d3 100644 --- a/pkgs/games/quake3/game/default.nix +++ b/pkgs/games/quake3/game/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, x11, SDL, mesa, openal, gcc46 }: +{ lib, stdenv, fetchurl, xlibsWrapper, SDL, mesa, openal, gcc46 }: stdenv.mkDerivation { name = "ioquake3-1.36"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ./botlib.patch ]; - buildInputs = [ x11 SDL mesa openal gcc46 ]; + buildInputs = [ xlibsWrapper SDL mesa openal gcc46 ]; # Fix building on GCC 4.6. NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 6e063a34bc8..7cc4c2b96b1 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xlibs }: +{ stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xorg }: assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xlibs.libX11}/lib:${xlibs.libXinerama}/lib:${stdenv.cc.cc}/lib" \ + --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xorg.libX11}/lib:${xorg.libXinerama}/lib:${stdenv.cc.cc}/lib" \ share/sdlmame/sdlmame mkdir -p "$out/bin" diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix index 081604d2ce8..2899f712098 100644 --- a/pkgs/games/snake4/default.nix +++ b/pkgs/games/snake4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, shhmsg, shhopt, xlibs }: +{ stdenv, fetchurl, shhmsg, shhopt, xorg }: stdenv.mkDerivation rec { name = "snake4-1.0.14"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "14cng9l857np42zixp440mbc8y5675frb6lhsds53j1cws9cncw9"; }; - buildInputs = with xlibs; [ shhmsg shhopt libX11 libXt libXpm libXaw libXext]; + buildInputs = with xorg; [ shhmsg shhopt libX11 libXt libXpm libXaw libXext]; preInstall = '' substituteInPlace Makefile --replace "-o \$(OWNER) -g \$(GROUP)" "" diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index aabd3656505..fe764c90b4b 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip -, openal, libvorbis, glew, freetype, xlibs, SDL, mesa, binutils +, openal, libvorbis, glew, freetype, xorg, SDL, mesa, binutils , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd , withAI ? true # support for AI Interfaces and Skirmish AIs @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DPREFER_STATIC_LIBS:BOOL=OFF"]; buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL - xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper + xorg.libX11 xorg.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper docbook_xsl_ns systemd ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index b9d13265ce7..ffd68562dee 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -13,7 +13,7 @@ buildFHSUserEnv { pkgs.python pkgs.gnome2.zenity pkgs.xdg_utils - pkgs.xlibs.xrandr + pkgs.xorg.xrandr pkgs.which ] ++ lib.optional (config.steam.java or false) pkgs.jdk @@ -28,23 +28,23 @@ buildFHSUserEnv { pkgs.pango pkgs.freetype - pkgs.xlibs.libICE - pkgs.xlibs.libSM - pkgs.xlibs.libX11 - pkgs.xlibs.libXau - pkgs.xlibs.libxcb - pkgs.xlibs.libXcursor - pkgs.xlibs.libXdamage - pkgs.xlibs.libXdmcp - pkgs.xlibs.libXext - pkgs.xlibs.libXfixes - pkgs.xlibs.libXi - pkgs.xlibs.libXinerama - pkgs.xlibs.libXrandr - pkgs.xlibs.libXrender - pkgs.xlibs.libXScrnSaver - pkgs.xlibs.libXtst - pkgs.xlibs.libXxf86vm + pkgs.xorg.libICE + pkgs.xorg.libSM + pkgs.xorg.libX11 + pkgs.xorg.libXau + pkgs.xorg.libxcb + pkgs.xorg.libXcursor + pkgs.xorg.libXdamage + pkgs.xorg.libXdmcp + pkgs.xorg.libXext + pkgs.xorg.libXfixes + pkgs.xorg.libXi + pkgs.xorg.libXinerama + pkgs.xorg.libXrandr + pkgs.xorg.libXrender + pkgs.xorg.libXScrnSaver + pkgs.xorg.libXtst + pkgs.xorg.libXxf86vm pkgs.ffmpeg pkgs.libpng12 diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index a0e583e1075..ed2ea23d415 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, patchelf, xlibs, openal }: +{ stdenv, fetchurl, unzip, patchelf, xorg, openal }: assert stdenv.isLinux; assert stdenv.isx86_64; @@ -11,7 +11,7 @@ let buildInputs = [ unzip patchelf ]; rtdeps = stdenv.lib.makeLibraryPath - [ xlibs.libXxf86vm xlibs.libXext openal ] + [ xorg.libXxf86vm xorg.libXext openal ] + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc ]; buildCommand = diff --git a/pkgs/games/ut2004demo/default.nix b/pkgs/games/ut2004demo/default.nix index a828d22ca0b..13f770eab2b 100644 --- a/pkgs/games/ut2004demo/default.nix +++ b/pkgs/games/ut2004demo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibs, mesa}: +{stdenv, fetchurl, xorg, mesa}: assert stdenv.system == "i686-linux"; @@ -17,7 +17,7 @@ let { name = raw.name; builder = ./make-wrapper.sh; inherit raw mesa; - inherit (xlibs) libX11 libXext; + inherit (xorg) libX11 libXext; }; } diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index 7d96829f12b..4c0c76d60b8 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite -, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, pkgconfig }: +, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { name = "voxelands-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake irrlicht libpng bzip2 libjpeg sqlite - libXxf86vm mesa openal libvorbis x11 pkgconfig + libXxf86vm mesa openal libvorbis xlibsWrapper pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index cb9974580d8..200b9c24c7d 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, perl, expat, x11, freetype }: +{ stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }: -# !!! assert freetype == xlibs.freetype +# !!! assert freetype == xorg.freetype stdenv.mkDerivation { name = "zoom-1.1.5"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj"; }; - buildInputs = [ perl expat x11 freetype ]; + buildInputs = [ perl expat xlibsWrapper freetype ]; # Zoom doesn't add the right directory in the include path. CFLAGS = [ "-I" (freetype + "/include/freetype2") ]; diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 32d47093d68..c1ff6cb9493 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, libpulseaudio}: +{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}: stdenv.mkDerivation rec { name = "snes9x-gtk-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3"; }; - buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 libpulseaudio]; + buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 xlibsWrapper libpulseaudio]; sourceRoot = "snes9x-${version}-src/gtk"; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index bf63340d35d..1e2d656fb0e 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [ freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses - ]) ++ (with pkgs.xlibs; [ - xlibs libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite + ]) ++ (with pkgs.xorg; [ + xlibsWrapper libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite ])); # Wine locates a lot of libraries dynamically through dlopen(). Add diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 4d9d9cedde5..9f930900c41 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, expat, openssl , libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec , libiconv -, x11Support ? false, x11 ? null +, x11Support ? false, xlibsWrapper ? null , cupsSupport ? false, cups ? null }: -assert x11Support -> x11 != null; +assert x11Support -> xlibsWrapper != null; assert cupsSupport -> cups != null; let version = "9.15"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec libiconv ] - ++ stdenv.lib.optional x11Support x11 + ++ stdenv.lib.optional x11Support xlibsWrapper ++ stdenv.lib.optional cupsSupport cups # [] # maybe sometimes jpeg2000 support ; diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 3dd3f4378de..29bb9d7d680 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,7 +1,10 @@ { stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile -, python, gettext, flex, perl, bison, pkgconfig, texLive, dblatex +, python, gettext, flex, perl, bison, pkgconfig, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , fetchsvn, makeWrapper, t1utils +, texlive, tex ? texlive.combine { + inherit (texlive) scheme-small lh metafont epsf; + } }: stdenv.mkDerivation rec{ @@ -34,17 +37,19 @@ stdenv.mkDerivation rec{ configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"]; buildInputs = - [ ghostscript texinfo imagemagick texi2html guile dblatex zip netpbm - python gettext flex perl bison pkgconfig texLive fontconfig freetype pango + [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm + python gettext flex perl bison pkgconfig fontconfig freetype pango fontforge help2man groff makeWrapper t1utils ]; - meta = { + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "Music typesetting system"; homepage = http://lilypond.org/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; }; patches = [ ./findlib.patch ]; diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index dca60f55af0..27e26d6d5df 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xlibs}: +{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xorg}: stdenv.mkDerivation rec { name = "electricsheep-2.6.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5"; }; - buildInputs = [pkgconfig expat zlib libpng libjpeg xlibs.xlibs xlibs.libXv]; + buildInputs = [pkgconfig expat zlib libpng libjpeg xorg.xlibsWrapper xorg.libXv]; preInstall = '' installFlags=GNOME_DATADIR=$out diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 56d176a710c..606a4200d0e 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, x11, libXext, mesa, imagemagick, libtiff, bzip2}: +{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, mesa, imagemagick, libtiff, bzip2}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg"; }; - buildInputs = [ pkgconfig mesa x11 imagemagick libtiff bzip2 ]; + buildInputs = [ pkgconfig mesa xlibsWrapper imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index 114d745f140..b40827e7bfb 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, imake, libXScrnSaver, scrnsaverproto}: +{stdenv, fetchurl, xlibsWrapper, imake, libXScrnSaver, scrnsaverproto}: stdenv.mkDerivation rec { @@ -11,5 +11,5 @@ stdenv.mkDerivation rec makeFlags="BINDIR=\${out}/bin MANPATH=\${out}/man"; preBuild = "xmkmf"; installTargets = "install install.man"; - buildInputs = [x11 imake libXScrnSaver scrnsaverproto]; + buildInputs = [xlibsWrapper imake libXScrnSaver scrnsaverproto]; } diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index 16a6622aa22..1f12ffa9301 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python, pkgconfig, x11, pam }: +{ stdenv, fetchgit, python, pkgconfig, xlibsWrapper, pam }: stdenv.mkDerivation { name = "xtrlock-pam-3.4-post-20150909"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "fa8aeedfa2a4e1d813f8cad562bafdd4e2c5130df0a7cde7b2f956a32044e9f8"; }; - buildInputs = [ python pkgconfig x11 pam ]; + buildInputs = [ python pkgconfig xlibsWrapper pam ]; configurePhase = '' substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix index e63f6846002..2aa73f1e0c1 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, gettext, pkgconfig # Build tools , gtk2, kde_workspace, kdelibs # Toolkit dependencies -, libpthreadstubs, libXdmcp, libxcb, xlibs # X11 dependencies +, libpthreadstubs, libXdmcp, libxcb, xorg # X11 dependencies }: stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { libXdmcp libxcb pkgconfig - xlibs.libxshmfence + xorg.libxshmfence ]; patches = [ diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index e9c27629df7..4d25b5b73b2 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -85,7 +85,6 @@ rec { wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; - CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "CSApprox-2013-07-26"; src = fetchgit { @@ -164,11 +163,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2015-09-15"; + name = "Syntastic-2015-09-21"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "8164240f6f0aaed2055dae45fc0e5c6f6ec30b3d"; - sha256 = "51d5d2eb9f1f66784cd85742ebbeb3585835b5c87ddeb64cad21f81d32d262fd"; + rev = "d73d7601ccb79ac94447b3c661ed5de2801d3977"; + sha256 = "64a03f457d008d66ec913296b15bd5590cca9bf339ac149af42318e99157a8d0"; }; dependencies = []; @@ -208,22 +207,22 @@ rec { }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2015-09-12"; + name = "The_NERD_tree-2015-09-18"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "8c7534bc9e1d0c2f18bf94c1440c4ae6b102b5d6"; - sha256 = "dc71561fed68facebeb4162c909afefbb1f415908e2402f98fa500893b193833"; + rev = "0b44415a3302030b56755cc1135ca9ca57dc1ada"; + sha256 = "7841683821e41b65e4aff9222639a43f05d7b24c874b309f1cc3e6407e09343f"; }; dependencies = []; }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2015-09-15"; + name = "UltiSnips-2015-09-20"; src = fetchgit { url = "git://github.com/sirver/ultisnips"; - rev = "ef2c0d6d80d7903bfed4fa0c3a7fe5af5fd0ce55"; - sha256 = "e6d782830c0465af6f23b96c42c59b0f5eb1bd41376dcae008d0ad54981ce182"; + rev = "e1e005a810edc7b1c13b5095fe3ab7ce2600b0cb"; + sha256 = "de2fd5d654fc48021325f5373ca5be741d105a191ba47ad1c5333046a615b745"; }; dependencies = []; @@ -334,11 +333,11 @@ rec { }; ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-2015-08-05"; + name = "ghcmod-2015-09-17"; src = fetchgit { url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "ff8fe7d64d0db35be9a753e2c2a289760ab02dd5"; - sha256 = "db5a932e4604bed9d4a7d6ff06367f9cae93a87424fc79d2fade7c15061ab563"; + rev = "3e012a5b0b904c5c32eeea39071534d492a64a0f"; + sha256 = "e35c4528d08efb85c68fd4faa19283d67f936d915cae780de0cae0cc53131500"; }; dependencies = []; @@ -366,17 +365,6 @@ rec { }; - lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lushtags-2013-12-27"; - src = fetchgit { - url = "git://github.com/bitc/lushtags"; - rev = "429fab3b748ae04ee5de0cbf75d947f15441e798"; - sha256 = "5170019fbe64b15be30a0ba82e6b01364d115ccad6ef690a6df86f73af22a0a7"; - }; - dependencies = []; - - }; - vim-hdevtools = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-hdevtools-2012-12-29"; src = fetchgit { @@ -411,11 +399,11 @@ rec { }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2015-08-28"; + name = "neco-ghc-2015-09-20"; src = fetchgit { url = "git://github.com/eagletmt/neco-ghc"; - rev = "21ba0eba8f9a9787b69c21c45dd286f927220d71"; - sha256 = "62c17fafd98dd1e6357c5c459a38cec2cb622eaad69ab2e8eb5caf2ea593f37b"; + rev = "c5b47167b29ad5887332567edc655433d32642bd"; + sha256 = "c8e7a746cb4b2faba15dd11a6c9da5c478612cd2ec4af221ea20f37c230884d2"; }; dependencies = []; @@ -601,6 +589,17 @@ rec { buildInputs = [ xkb_switch ]; }; + lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "lushtags-2015-06-06"; + src = fetchgit { + url = "git://github.com/mkasa/lushtags"; + rev = "3d7229b07b47ab2fc188d7db63b33dfcd63a1802"; + sha256 = "f5b6eb7b53a5202d0e55c57d6f4fd7b274dfb4224d8d94c91b708096b4fc07b9"; + }; + dependencies = []; + + }; + vim-stylish-haskell = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-stylish-haskell-2015-05-10"; src = fetchgit { @@ -635,11 +634,11 @@ rec { }; racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "racer-2015-09-14"; + name = "racer-2015-09-18"; src = fetchgit { url = "git://github.com/phildawes/racer"; - rev = "89db6bbca107f8e2cf19d3e5f3fac9cdf48fd7b9"; - sha256 = "db11ea7e9f71bec60f6dba8ca4c460a98c2b9cc6490ac467280bfea493965f4c"; + rev = "b9750c373adf75fc28700bce382761ad85a8a2bd"; + sha256 = "a2f2ca5106a0c30ee8e724291559f0f26729ede545ac7b9be3ee973face24444"; }; dependencies = []; buildPhase = '' @@ -682,22 +681,22 @@ rec { }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2015-09-15"; + name = "unite-vim-2015-09-17"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "771f33c201d85602a225045553720d2659bd04e5"; - sha256 = "ccdde79165ff9dd1c1df1a55b2434b8cb59d9b8242c57f0015802c136d5de89b"; + rev = "f24df7733eca3009ee3fac159014aa2001ccadac"; + sha256 = "06f7290cd1e8b1f65f6e6495ac6ac263feed101d804032fd595c0f1b1207ed16"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2015-09-15"; + name = "vimproc-vim-2015-09-20"; src = fetchgit { url = "git://github.com/shougo/vimproc.vim"; - rev = "7190c920c29a3612d9144df4cf9527e016362cef"; - sha256 = "180f6a38959a01014d66470936386c011b0b0cf8e0d84a9d3d2a8362c70454e4"; + rev = "d4939b5bed442e1c30fa9e7f05db0d110b2edce8"; + sha256 = "6e80eae94b3e81951273a44677cfc03bfdeaaefab3ea13e76b1b79eaeb42b03e"; }; dependencies = []; buildInputs = [ which ]; @@ -777,11 +776,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2015-09-16"; + name = "youcompleteme-2015-09-21"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "61a5a9b84b8c0c993d63c20c8698b42db4365f60"; - sha256 = "1adad2e9e21999b4412e613df4861d757712af8650cbb4110d5d374fe249a60e"; + rev = "2816559ee465860a8a5502b7a1d551bdb46d1b24"; + sha256 = "e7b258efd3fcd93dbfa9e326ace5c1ab01cbe868993e2817ab36eba605595a9d"; }; dependencies = []; buildInputs = [ @@ -961,11 +960,11 @@ rec { }; pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen-2014-11-06"; + name = "pathogen-2015-09-20"; src = fetchgit { url = "git://github.com/tpope/vim-pathogen"; - rev = "b9fb0dfd811004010f5f6903edef42d6004ebea2"; - sha256 = "62ec7e9721651aa86aa716d47c2057771f7d093f414c3b98f50a759d210db4c7"; + rev = "b4174e4d1a16e7f0c5c6dfca923269a20a9f50c2"; + sha256 = "703a1d3022cdb03d3d14fbba48be119f4bd7d546ba4bd33185bddaa161bbc63e"; }; dependencies = []; @@ -1027,11 +1026,11 @@ rec { }; snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate-2015-07-23"; + name = "snipmate-2015-09-18"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; - rev = "c86c64508a5b0309040429460c3a13fb90ac708e"; - sha256 = "7cd7dfd4230fd9bb75744a376c0e789c6d734e08158ca055a2ada1298b71360e"; + rev = "e2d294b3962acbe7d8333bade2ebdb0ccde06740"; + sha256 = "856149bc5121845e3f3cd24f74d59e9af722a6ebdc0e050a90639704bfe14ee9"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ae7e86bc749..092c11b405c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -24,7 +24,7 @@ "ghcmod" "github:JagaJaga/vim-addon-vim2nix" "github:ap/vim-css-color" -"github:bitc/lushtags" +"github:mkasa/lushtags" "github:bitc/vim-hdevtools" "github:christoomey/vim-tmux-navigator" "github:eagletmt/neco-ghc" diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 834e798e8d1..bb088885509 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, which, imake +{ stdenv, fetchurl, kernel ? null, which, imake , mesa # for fgl_glxgears , libXxf86vm, xf86vidmodeproto # for fglrx_gamma , xorg, makeWrapper, glibc, patchelf @@ -48,8 +48,8 @@ stdenv.mkDerivation { patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}"; buildInputs = - [ xlibs.libXext xlibs.libX11 xlibs.libXinerama - xlibs.libXrandr which imake makeWrapper + [ xorg.libXext xorg.libX11 xorg.libXinerama + xorg.libXrandr which imake makeWrapper patchelf unzip mesa diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 60bfe093017..b857d5ece45 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -9,7 +9,7 @@ # optional features with extra dependencies , ncursesSupport ? true , ncurses ? null -, x11Support ? true , x11 ? null +, x11Support ? true , xlibsWrapper ? null , xdamageSupport ? x11Support, libXdamage ? null , imlib2Support ? x11Support, imlib2 ? null @@ -29,7 +29,7 @@ assert ncursesSupport -> ncurses != null; -assert x11Support -> x11 != null; +assert x11Support -> xlibsWrapper != null; assert xdamageSupport -> x11Support && libXdamage != null; assert imlib2Support -> x11Support && imlib2 != null; assert luaSupport -> lua != null; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib cmake ] ++ optional ncursesSupport ncurses - ++ optional x11Support x11 + ++ optional x11Support xlibsWrapper ++ optional xdamageSupport libXdamage ++ optional imlib2Support imlib2 ++ optional luaSupport lua diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 7b8a1861365..ef35757fdb2 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -140,7 +140,9 @@ with stdenv.lib; # Video configuration. # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y + ${optionalString (versionOlder version "4.3") '' + DRM_I915_KMS y + ''} # Allow specifying custom EDID on the kernel command line DRM_LOAD_EDID_FIRMWARE y ${optionalString (versionOlder version "3.9") '' @@ -327,6 +329,7 @@ with stdenv.lib; SERIAL_8250 y # 8250/16550 and compatible serial support SLIP_COMPRESSED y # CSLIP compressed headers SLIP_SMART y + HWMON y THERMAL_HWMON y # Hardware monitoring support ${optionalString (versionAtLeast version "3.15") '' UEVENT_HELPER n diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index b26bc1eb34a..a66397f689b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.88"; + version = "3.10.89"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0ayz62v46zmbz43zd36a0zpczv4dyjjcyljcfv1p7mgj3fc9fs4z"; + sha256 = "13697akpdkv7xyyprysb4017q7j1ccynppb6wwllmhz1g2ichpii"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index f49dceac110..da520d13a02 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.47"; + version = "3.12.48"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0mcchrm79zjsnxvwf1v3glhv0zs4dszi9qwhmnws3dqxaj9brgyn"; + sha256 = "1mvvpi2s8avg629y72miak8mdbv0mwb5dz0m7b48aah6dg866hiz"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index fb38e32a4b9..5ea214c9eb3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.52"; + version = "3.14.53"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1sgjxp98wdq4a0044i46970jm2prrgp0xz9jg1q4mfysdz3n3fhv"; + sha256 = "0zqaqa7gs895p521c82jggak9zlmiwmkfarh2ykvh423sxjbvs5i"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index 917e5d6ffee..1a84e00f788 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.7"; + version = "4.1.8"; # Remember to update grsecurity! extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0g1dnvak0pd03d4miy1025bw64wq71w29a058dzspdr6jcf9qwbn"; + sha256 = "1zhck5892c3anbifq3d0ngy40zm9q4c651kgkjk9wf32jjpnngar"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix index aa87249e5c9..d82e567de8f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.2.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.2"; - modDirVersion = "4.2.0"; + version = "4.2.1"; extraMeta.branch = "4.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1syv8n5hwzdbx69rsj4vayyzskfq1w5laalg5jjd523my52f086g"; + sha256 = "1b4dpf3rhr1sb1hpz4qx3h1swlcr1xnbrh6sjybqmj2c6szkbpvz"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 63ea8ee64ba..d13357825a5 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.2-rc5"; - modDirVersion = "4.2.0-rc5"; - extraMeta.branch = "4.2"; + version = "4.3-rc2"; + modDirVersion = "4.3.0-rc2"; + extraMeta.branch = "4.3"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1ir3g5in53qq50ygnwgkzjkl1pzb12ar8k1zvfzcxapddvnhayr0"; + sha256 = "1mgm3r0vz0jbfbqxcjfw0wv5ix6qhwymjz1chh543lvb0729ayb4"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index a14088c81ef..49880e0ecdd 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, nettools, bc, perl, kmod, writeTextFile, ubootChooser }: +{ stdenv, runCommand, nettools, bc, perl, kmod, openssl, writeTextFile, ubootChooser }: let readConfig = configfile: import (runCommand "config.nix" {} '' @@ -221,7 +221,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe enableParallelBuilding = true; - nativeBuildInputs = [ perl bc nettools ] ++ optional (stdenv.platform.uboot != null) + nativeBuildInputs = [ perl bc nettools openssl ] ++ optional (stdenv.platform.uboot != null) (ubootChooser stdenv.platform.uboot); makeFlags = commonMakeFlags ++ [ diff --git a/pkgs/os-specific/linux/nvidia-x11/beta.nix b/pkgs/os-specific/linux/nvidia-x11/beta.nix index dc6af818837..d3111a4f75a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/beta.nix +++ b/pkgs/os-specific/linux/nvidia-x11/beta.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl , gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -43,14 +43,14 @@ stdenv.mkDerivation { dontStrip = true; - glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc]; + allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; gtkPath = optionalString (!libsOnly) (makeLibraryPath [ gtk atk pango glib gdk_pixbuf cairo ] ); - programPath = makeLibraryPath [ xlibs.libXv ]; + programPath = makeLibraryPath [ xorg.libXv ]; buildInputs = [ perl nukeReferences ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 953c8c60125..4390d5bdf3c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl , gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -46,14 +46,14 @@ stdenv.mkDerivation { dontStrip = true; - glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc]; + allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; gtkPath = optionalString (!libsOnly) (makeLibraryPath [ gtk atk pango glib gdk_pixbuf cairo ] ); - programPath = makeLibraryPath [ xlibs.libXv ]; + programPath = makeLibraryPath [ xorg.libXv ]; buildInputs = [ perl nukeReferences ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 432a756b6f6..6bde91d0ffc 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib, gdk_pixbuf}: +{stdenv, fetchurl, kernel, xorg, zlib, gtk, atk, pango, glib, gdk_pixbuf}: let @@ -30,11 +30,11 @@ stdenv.mkDerivation { dontStrip = true; - glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; - programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ]; + programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xorg.libXv ]; meta = { homepage = http://www.nvidia.com/object/unix.html; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index 7f13b6795d4..42e65f927b3 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl , gtk, atk, pango, glib, gdk_pixbuf , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -36,12 +36,12 @@ stdenv.mkDerivation { dontStrip = true; - glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath - [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); + [ gtk atk pango glib gdk_pixbuf xorg.libXv ] ); buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix index a53906ed020..bb974410e37 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl , gtk, atk, pango, glib, gdk_pixbuf , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -46,13 +46,13 @@ stdenv.mkDerivation { dontStrip = true; - glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc]; + allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; programPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); + [ gtk atk pango glib gdk_pixbuf xorg.libXv ] ); buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 88ab08e6c3d..c4e39e45cad 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,27 +1,23 @@ -{ stdenv, fetchurl, kernel}: +{ stdenv, fetchurl }: let - pname = "open-iscsi-2.0-871"; + pname = "open-iscsi-2.0-873"; in stdenv.mkDerivation { - name = "${pname}-${kernel.version}"; + name = "${pname}"; src = fetchurl { url = "http://www.open-iscsi.org/bits/${pname}.tar.gz"; - sha256 = "1jvx1agybaj4czhz41bz37as076spicsmlh5pjksvwl2mr38gsmw"; + sha256 = "1nbwmj48xzy45h52917jbvyqpsfg9zm49nm8941mc5x4gpwz5nbx"; }; - KSRC = "${kernel.dev}/lib/modules/*/build"; DESTDIR = "$(out)"; preConfigure = '' sed -i 's|/usr/|/|' Makefile ''; - patches = [./kernel.patch]; - meta = { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.open-iscsi.org; - broken = true; }; } diff --git a/pkgs/os-specific/linux/open-iscsi/kernel.patch b/pkgs/os-specific/linux/open-iscsi/kernel.patch deleted file mode 100644 index 48dfa195400..00000000000 --- a/pkgs/os-specific/linux/open-iscsi/kernel.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** open-iscsi-2.0-871/kernel/Makefile 2009-07-11 05:55:58.000000000 +0200 ---- open-iscsi-2.0-871-new/kernel/Makefile 2010-08-30 11:37:56.000000000 +0200 -*************** -*** 101,106 **** ---- 101,107 ---- - linux_2_6_29: $(unpatch_code) - - linux_2_6_30: $(unpatch_code) -+ linux_2_6_32: $(unpatch_code) - - - do_unpatch_code: diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix index 2cebb8d9dcc..5bb757a73a0 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix +++ b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix @@ -6,11 +6,11 @@ # Of course, use of the driver in /usr/lib is highly impure. But it # might actually work ;-) -{stdenv, xlibs, expat, libdrm}: +{stdenv, xorg, expat, libdrm}: stdenv.mkDerivation { name = "xorg-sys-opengl-3"; builder = ./builder.sh; - neededLibs = [xlibs.libXxf86vm xlibs.libXext expat libdrm stdenv.cc.cc]; + neededLibs = [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc]; } diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 458d171ec68..ecffa7bec59 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -1,16 +1,23 @@ -{ pkgs, fetchurl, stdenv }: +{ stdenv, fetchurl, pkgconfig, libu2f-host, libu2f-server, pam }: + stdenv.mkDerivation rec { name = "pam_u2f-${version}"; - version = "0.0.1"; + version = "1.0.1"; + src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; - sha256 = "0p1wia4nfw5h0pmy1lcgwsbrlm7z39v1n37692lgqfzyg1kmpv7l"; + sha256 = "08lmc2il877k7djkjmza3k0n6ij8b4hx4x9dl6wwfdjqsr8d2zfp"; }; - buildInputs = with pkgs; [ asciidoc autoconf automake docbook_xml_dtd_45 libtool libu2f-host libu2f-server libxml2 libxslt pkgconfig pam ]; - installFlags = [ - "PAMDIR=$(out)/lib/security" - ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libu2f-host libu2f-server pam ]; + + # Fix the broken include in 1.0.1 + CFLAGS = "-I${libu2f-host}/include/u2f-host"; + + preConfigure = '' + configureFlagsArray+=("--with-pam-dir=$out/lib/security") + ''; meta = with stdenv.lib; { homepage = https://developers.yubico.com/pam-u2f/; diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index e988e8192fc..e71adba3e57 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -5,7 +5,8 @@ , syslog ? false , moreheaders ? false , echo ? false -, ngx_lua ? false }: +, ngx_lua ? false +, withStream ? false }: with stdenv.lib; @@ -61,8 +62,8 @@ let lua-ext = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; - rev = "v0.9.12"; - sha256 = "0r07q1n3nvi7m3l8zk7nfk0z9kjhqknav61ys9lshh2ylsmz1lf4"; + rev = "v0.9.16"; + sha256 = "0dvdam228jhsrayb22ishljdkgib08bakh8ygn84sq0c2xbidzlp"; }; in @@ -109,6 +110,7 @@ stdenv.mkDerivation rec { ++ optional moreheaders "--add-module=${moreheaders-ext}" ++ optional echo "--add-module=${echo-ext}" ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}" + ++ optional withStream "--with-stream" ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index e018c7790b9..86bcb3e1cec 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook , json_c, libsndfile, libtool -, xlibs, libcap, alsaLib, glib +, xorg, libcap, alsaLib, glib , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat , speexdsp, systemd, webrtc-audio-processing, gconf ? null @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 - ++ lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ] + ++ lib.optionals x11Support [ xorg.xlibsWrapper xorg.libXtst xorg.libXi ] ++ lib.optional useSystemd systemd ++ lib.optionals stdenv.isLinux [ alsaLib udev ] ++ lib.optional airtunesSupport openssl diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 778b3365b47..246ca3696d5 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -138,7 +138,7 @@ let outputs' = outputs ++ - (if separateDebugInfo then [ "debug" ] else []); + (if separateDebugInfo then assert result.isLinux; [ "debug" ] else []); buildInputs' = buildInputs ++ (if separateDebugInfo then [ ../../build-support/setup-hooks/separate-debug-info.sh ] else []); diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 8c3886cebff..556de1bd8e8 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, xrandr, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "arandr-0.1.7.1"; + name = "arandr-0.1.8"; src = fetchurl { url = "http://christian.amsuess.com/tools/arandr/files/${name}.tar.gz"; - sha256 = "1nj84ww1kf024n5xgxwqmzscv8i1gixx7nmg05dbjj2xs28alwxb"; + sha256 = "0d574mbmhaqmh7kivaryj2hpghz6xkvic9ah43s1hf385y7c33kd"; }; buildPhase = '' diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index fb18907c50f..96a4ac16c9b 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit -, x11, mesa +, xlibsWrapper, mesa , nvidia }: let @@ -15,6 +15,6 @@ stdenv.mkDerivation { inherit nvidia mesa; - buildInputs = [ x11 mesa ]; + buildInputs = [ xlibsWrapper mesa ]; builder = ./builder.sh; } diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 167c710dd26..7a18a6a98b6 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibs, libvdpau }: +{ stdenv, fetchurl, pkgconfig, xorg, libvdpau }: stdenv.mkDerivation rec { name = "vdpauinfo-1.0"; diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index cb10718a11b..e7c5c5baf45 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibs }: +{ stdenv, fetchurl, xorg }: stdenv.mkDerivation { @@ -9,13 +9,13 @@ stdenv.mkDerivation { }; buildInputs = [ - xlibs.imake - xlibs.libX11 - xlibs.libXaw - xlibs.libXext - xlibs.libXmu - xlibs.libXpm - xlibs.libXxf86vm + xorg.imake + xorg.libX11 + xorg.libXaw + xorg.libXext + xorg.libXmu + xorg.libXpm + xorg.libXxf86vm ]; configurePhase = "xmkmf"; diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 8f21f6558ff..eda19b7a5bf 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, x11, pkgconfig }: +{ stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { version = "0.7.5"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh --with-gui=X11"; - buildInputs = [ inputproto libXi autoconf automake libtool m4 x11 pkgconfig ]; + buildInputs = [ inputproto libXi autoconf automake libtool m4 xlibsWrapper pkgconfig ]; meta = { homepage = https://github.com/tias/xinput_calibrator; diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index 5158963258c..2f18f678483 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibs, pkgconfig, ncurses }: +{ stdenv, fetchurl, xorg, pkgconfig, ncurses }: stdenv.mkDerivation rec { name = "xrestop-${version}"; @@ -9,5 +9,5 @@ stdenv.mkDerivation rec { sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7"; }; - buildInputs = [ pkgconfig xlibs.libX11 xlibs.libXres xlibs.libXext ncurses ]; + buildInputs = [ pkgconfig xorg.libX11 xorg.libXres xorg.libXext ncurses ]; } diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index a1a091a90cc..22b8a607fd3 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu +{ stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu , libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit xauth fontDirectories perl; gcc = stdenv.cc.cc; - buildInputs = [ x11 zlib libjpeg imake gccmakedep libXmu libXaw + buildInputs = [ xlibsWrapper zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp xauth openssh ]; patchPhase = '' diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index d214a75b441..01c6501f840 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig -, gnome3, avahi, gtk3, libnotify, libpulseaudio, x11}: +, gnome3, avahi, gtk3, libnotify, libpulseaudio, xlibsWrapper}: stdenv.mkDerivation rec { name = "pasystray-0.5.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake makeWrapper pkgconfig gnome3.defaultIconTheme - avahi gtk3 libnotify libpulseaudio x11 ]; + avahi gtk3 libnotify libpulseaudio xlibsWrapper ]; preConfigure = '' aclocal diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index b217b43524b..d0fac3c93c9 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.2"; in +let version = "4.2.1"; 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 = "1glglnglwz1rz6zy54xwdm601n5csbd1g73lx0rz8ay5jhz3q8r5"; + sha256 = "1nzyyfj84q98n7lf798k6695pbsd02hg2ffd1kgn8g3qcbwqhwar"; }; buildInputs = [ diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix index ef9330a510b..5b44a7d20f8 100644 --- a/pkgs/tools/filesystems/ceph/git.nix +++ b/pkgs/tools/filesystems/ceph/git.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-09-11"; + version = "2015-09-22"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; - rev = "78de6fd61d5c0422f18c2f683b2cc489f3cbb4d3"; - sha256 = "1kbrsr6vzvprcdq0hg7cgcmvqc61w3i1yzgrmjdmy3jcsmc979xi"; + rev = "f1ead76f80cc3d078778080c35a6427256874062"; + sha256 = "16c01b9v04slp80dlgw8n9a5ndjqxi6lv0pnklh1ykh4xb248gjh"; }; patches = [ ./fix-pythonpath.patch ]; diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 81be62b5159..8f090c29781 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -1,80 +1,65 @@ -x@{builderDefsPackage - , boost, fuse, openssl, cmake, attr, jdk, ant, which, python, file - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python +, fetchurl, lib, valgrind, makeWrapper, fetchFromGitHub }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="XtreemFS"; - version="1.4"; - name="${baseName}-${version}"; - url="http://xtreemfs.googlecode.com/files/${name}.tar.gz"; - hash="1hzd6anplxdcl4cg6xwriqk9b34541r7ah1ab2xavv149a2ll25s"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + src = fetchFromGitHub { + # using unstable release because stable (v1.5.1) has broken repl java plugin + rev = "7ddcb081aa125b0cfb008dc98addd260b8353ab3"; + owner = "xtreemfs"; + repo = "xtreemfs"; + sha256 = "1hjmd32pla27zf98ghzz6r5ml8ry86m9dsryv1z01kxv5l95b3m0"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + name = "XtreemFS-${version}"; + version = "1.5.1.81"; - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "fixMakefile" "doMakeInstall" "fixInterpreterBin" - "fixInterpreterEtc" - "usrIsOut"]; + buildInputs = [ which attr makeWrapper python ]; - setVars = a.noDepEntry '' - export JAVA_HOME="${jdk}" - export ANT_HOME="${ant}" - export CMAKE_HOME=${cmake} + preConfigure = '' + export JAVA_HOME=${jdk} + export ANT_HOME=${ant} + + export BOOST_INCLUDEDIR=${boost.dev}/include + export BOOST_LIBRARYDIR=${boost.lib}/lib + export OPENSSL_ROOT_DIR=${openssl} + + substituteInPlace cpp/cmake/FindValgrind.cmake \ + --replace "/usr/local" "${valgrind}" + + substituteInPlace cpp/CMakeLists.txt \ + --replace '"/lib64" "/usr/lib64"' '"${attr}/lib" "${fuse}/lib"' + + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${fuse}/include" + export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L${fuse}/lib" + + export DESTDIR=$out + + substituteInPlace Makefile \ + --replace "/usr/share/" "/share/" \ + --replace 'BIN_DIR=$(DESTDIR)/usr/bin' "BIN_DIR=$out/bin" + + substituteInPlace etc/init.d/generate_initd_scripts.sh \ + --replace "/bin/bash" "${stdenv.shell}" + + # do not put cmake into buildInputs + export PATH="$PATH:${cmake}/bin" ''; - fixMakefile = a.fullDepEntry '' - sed -e 's@DESTDIR)/usr@DESTDIR)@g' -i Makefile + preBuild = '' + substituteInPlace configure \ + --replace "/usr/bin/file" "${file}/bin/file" + ''; - sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/protobuf-*/configure - sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/protobuf-*/gtest/configure - sed -e 's@/usr/bin/@@g' -i cpp/thirdparty/gtest-*/configure - '' ["doUnpack" "minInit"]; + doCheck = false; - fixInterpreterBin = a.doPatchShebangs "$out/bin"; - fixInterpreterEtc = a.doPatchShebangs "$out/etc/xos/xtreemfs"; + postInstall = '' + rm -r $out/sbin + ''; - usrIsOut = a.fullDepEntry '' - sed -e "s@/usr/@$out/@g" -i \ - "$out"/{bin/xtfs_*,etc/xos/xtreemfs/*.*,etc/xos/xtreemfs/*/*,etc/init.d/*} - sed -e "s@JAVA_HOME=/usr@JAVA_HOME=${jdk}@g" -i \ - "$out"/{bin/xtfs_*,etc/init.d/*} - '' ["minInit"]; - - makeFlags = [ - ''DESTDIR="$out"'' - ''SHELL="${a.stdenv.shell}"'' - ]; - meta = { description = "A distributed filesystem"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.bsd3; - broken = true; + maintainers = with lib.maintainers; [ raskin matejc ]; + platforms = lib.platforms.linux; + license = lib.licenses.bsd3; }; - passthru = { - updateInfo = { - downloadPage = "http://xtreemfs.org/download_sources.php"; - }; - }; -}) x - +} diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 97fcd1addd0..12ae9b6d89b 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xlibs, libX11, mesa, libdrm, python27 }: +{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xorg, libX11, mesa, libdrm, python27 }: stdenv.mkDerivation rec { name = "glmark2-${version}"; version = "2014.03"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig libjpeg libpng12 xlibs.libxcb libX11 mesa libdrm python27 + pkgconfig libjpeg libpng12 xorg.libxcb libX11 mesa libdrm python27 ]; buildPhase = '' diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index d0235c5bade..35bc1e610de 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, mesa}: +{stdenv, fetchurl, xlibsWrapper, mesa}: let version = "8.1.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0a58hw5850731p4smz4zqsbvyxvgjf7n5xdbs9l1wamk8q3gl0wp"; }; - buildInputs = [x11 mesa]; + buildInputs = [xlibsWrapper mesa]; configurePhase = "true"; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index fcc06871ef1..04fff805381 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw , yacc, libtool, fontconfig, pango, gd }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; }; - buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; + buildInputs = [pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; configureFlags = [ "--with-pngincludedir=${libpng}/include" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--with-expatincludedir=${expat}/include" "--with-expatlibdir=${expat}/lib" ] - ++ stdenv.lib.optional (x11 == null) "--without-x"; + ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; meta = { description = "A program for visualising graphs"; diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 80179539701..2743bd78aa7 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext, cairo +, yacc, libtool, fontconfig, pango, gd, xorg, gts, gettext, cairo }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig pango gd gts - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ] + ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--with-cgraph=no" "--with-sparse=no" ] - ++ stdenv.lib.optional (xlibs == null) "--without-x"; + ++ stdenv.lib.optional (xorg == null) "--without-x"; preBuild = '' sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 2fcea02519a..fbf1c114d0a 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, xlibs, gts, libdevil, gettext, cairo +, yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo , flex }: @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender pango libXaw ] + ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender pango libXaw ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; - CPPFLAGS = stdenv.lib.optionalString (xlibs != null && stdenv.system == "x86_64-darwin") + CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo"; configureFlags = @@ -36,14 +36,14 @@ stdenv.mkDerivation rec { "--with-expatincludedir=${expat}/include" "--with-expatlibdir=${expat}/lib" ] - ++ stdenv.lib.optional (xlibs == null) "--without-x"; + ++ stdenv.lib.optional (xorg == null) "--without-x"; preBuild = '' sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile ''; # "command -v" is POSIX, "which" is not - postInstall = stdenv.lib.optionalString (xlibs != null) '' + postInstall = stdenv.lib.optionalString (xorg != null) '' sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty sed -i 's|which|command -v|' $out/bin/vimdot ''; diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index 425fa5fb6cd..fe812eac7d4 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "maim-${version}"; - version = "3.3.41"; + version = "3.4.46"; src = fetchurl { url = "https://github.com/naelstrof/maim/archive/v${version}.tar.gz"; - sha256 = "12p9zd4skxds26hicy6hrxkxnhbqv1c5ys1h6jchaypvwdggcgnc"; + sha256 = "04gb858g0rrvdiva2dxwsfd7dmq62r67irnc8cpd0r02hr92dr6n"; }; buildInputs = [ cmake gengetopt imlib2 libXrandr libXfixes ] diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 411e2fb45c8..aa8958bb63d 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, giblib, x11 }: +{ stdenv, fetchurl, giblib, xlibsWrapper }: stdenv.mkDerivation rec { name = "scrot-0.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1"; }; - buildInputs = [ giblib x11 ]; + buildInputs = [ giblib xlibsWrapper ]; meta = { homepage = http://linuxbrit.co.uk/scrot/; diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 1cf3cfa00af..4ac3c02d410 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibs, xorgserver, qt4, mesa, geis }: +{ stdenv, fetchurl, xorg, xorgserver, qt4, mesa, geis }: stdenv.mkDerivation rec { name = "touchegg-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038"; }; - buildInputs = [ xorgserver mesa xlibs.libX11 xlibs.libXtst xlibs.libXext qt4 geis ]; + buildInputs = [ xorgserver mesa xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ]; configurePhase = '' sed -e "s@/usr/@$out/@g" -i $(find . -name touchegg.pro) diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix index 80791756e65..a2eed913930 100644 --- a/pkgs/tools/misc/antimicro/default.nix +++ b/pkgs/tools/misc/antimicro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkgconfig, SDL2, qt5, xlibs, fetchzip }: +{ stdenv, cmake, pkgconfig, SDL2, qt5, xorg, fetchzip }: stdenv.mkDerivation rec { name = "antimicro-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake pkgconfig SDL2 qt5.base qt5.tools xlibs.libXtst + cmake pkgconfig SDL2 qt5.base qt5.tools xorg.libXtst ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index 7ee6089c249..21786f3f15f 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xlibs, freetype, fontconfig, mesa, glibc, makeWrapper }: +{ fetchurl, stdenv, xorg, freetype, fontconfig, mesa, glibc, makeWrapper }: let system = if stdenv.system == "x86_64-linux" then "linux64" else "linux32"; @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; libPath = stdenv.lib.makeLibraryPath [ - xlibs.libX11 - xlibs.libxcb + xorg.libX11 + xorg.libxcb freetype fontconfig - xlibs.libXext - xlibs.libXi - xlibs.libXrender + xorg.libXext + xorg.libXi + xorg.libXrender stdenv.cc.cc glibc mesa diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 89459eb281b..40f441e065d 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xlibs +{ stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xorg , gnupg, gcc_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr }: @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f"; }; - buildInputs = [ wine_custom xlibs.libX11 gcc_multi mesa curl ]; + buildInputs = [ wine_custom xorg.libX11 gcc_multi mesa curl ]; propagatedbuildInputs = [ curl cabextract ]; patches = [ ./pipelight.patch ]; diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 62ec5ab2d63..800fad3b564 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "slop-${version}"; - version = "4.1.15"; + version = "4.1.16"; src = fetchurl { url = "https://github.com/naelstrof/slop/archive/v${version}.tar.gz"; - sha256 = "e20fd47de898abcb537c8100faed859eef4955d7784dbc52470570dae403f02e"; + sha256 = "0679ax0jr97x91hmp9qrspdka8cvl3xa77z92k4qgicbnb6hr7y2"; }; buildInputs = [ cmake gengetopt libX11 libXext ] diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index d97ba727bae..00f08ee0742 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11}: +{stdenv, fetchurl, xlibsWrapper}: stdenv.mkDerivation { name = "unclutter-8"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; - buildInputs = [x11]; + buildInputs = [xlibsWrapper]; installPhase = '' mkdir -pv "$out/bin" diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 589f7d9a94b..59153e68a56 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,31 +1,33 @@ { stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison -, flex, fetchgit, makeWrapper +, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline +, python3 +, svfSupport ? false +, bsdlSupport ? false +, staplSupport ? false , jedecSupport ? false -, pythonBindings ? false -, python3 ? null }: stdenv.mkDerivation rec { version = "0.10"; name = "urjtag-${version}"; - src = fetchgit { - url = "git://git.code.sf.net/p/urjtag/git"; - rev = "7ba12da7845af7601e014a2a107670edc5d6997d"; - sha256 = "834401d851728c48f1c055d24dc83b6173c701bf352d3a964ec7ff1aff3abf6a"; + src = fetchsvn { + url = "svn://svn.code.sf.net/p/urjtag/svn/trunk/urjtag"; + rev = "2051"; + sha256 = "0pyl0y27136nr8mmjdml7zjnfnpbjmgqzkjk99j3hvj38k10wq7f"; }; - buildInputs = [ gettext pkgconfig autoconf automake libtool makeWrapper ] - ++ stdenv.lib.optional pythonBindings python3; + buildInputs = [ gettext pkgconfig autoconf automake libtool bison flex which + subversion makeWrapper readline libftdi libusb python3 ]; configureFlags = '' - --prefix=/ + ${if svfSupport then "--enable-svf" else "--disable-svf"} + ${if bsdlSupport then "--enable-bsdl" else "--disable-bsdl"} + ${if staplSupport then "--enable-stapl" else "--disable-stapl"} ${if jedecSupport then "--enable-jedec-exp" else "--disable-jedec-exp"} - ${if pythonBindings then "--enable-python" else "--disable-python"} ''; - preConfigure = "cd urjtag; ./autogen.sh"; - makeFlags = [ "DESTDIR=$(out)" ]; + preConfigure = "./autogen.sh"; meta = { description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 20d5e66cfa2..3f616fdad68 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, x11, libXmu, autoconf, automake, libtool }: +{ stdenv, fetchsvn, xlibsWrapper, libXmu, autoconf, automake, libtool }: stdenv.mkDerivation rec { # The last release from 2012, 0.12, lacks '-targets' @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -vfi"; - buildInputs = [ x11 libXmu autoconf automake libtool ]; + buildInputs = [ xlibsWrapper libXmu autoconf automake libtool ]; meta = { description = "Tool to access the X clipboard from a console application"; diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 74eadaf5e2e..3fe0f409f29 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11}: +{stdenv, fetchurl, xlibsWrapper}: stdenv.mkDerivation { name = "xsel-1.2.0"; @@ -7,5 +7,5 @@ stdenv.mkDerivation { sha256 = "070lbcpw77j143jrbkh0y1v10ppn1jwmjf92800w7x42vh4cw9xr"; }; - buildInputs = [x11]; + buildInputs = [xlibsWrapper]; } diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index f6b14635d29..c109903e6ee 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -2,14 +2,15 @@ stdenv.mkDerivation rec { name = "yubikey-personalization-${version}"; - version = "1.17.1"; + version = "1.17.2"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz"; - sha256 = "1i399z23skvyfdr3fp7a340qi3ynfcwdqr1y540swjy9pg1awssm"; + sha256 = "1z6ybpdhl74phwzg2lhxhipqf7xnfhg52dykkzb3fbx21m0i4jkh"; }; - buildInputs = [ pkgconfig libusb libyubikey json_c ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb libyubikey json_c ]; configureFlags = [ "--with-backend=libusb-1.0" diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 6cc841bc837..a0ae90da446 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: +let version = "1.9.20150430"; in stdenv.mkDerivation rec { - name = "miniupnpc-1.9.20150917"; + name = "miniupnpc-${version}"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1nhiixfmlagcv9srni19r95n1v069rlq98fn8x4xpsf154lw71rh"; + sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn"; name = "${name}.tar.gz"; }; @@ -14,6 +15,7 @@ stdenv.mkDerivation rec { installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; meta = { + inherit version; homepage = http://miniupnp.free.fr/; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index 5088d92a8c7..88e7f1aec5a 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, x11, imake}: +{stdenv, fetchurl, xlibsWrapper, imake}: stdenv.mkDerivation { name = "x11-ssh-askpass-1.2.4.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildPhase = "xmkmf; make includes; make"; - buildInputs = [x11 imake]; + buildInputs = [xlibsWrapper imake]; meta = { homepage = "http://www.jmknoble.net/software/x11-ssh-askpass/"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 8a301f912b8..71c47c97d60 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -43,8 +43,6 @@ let doInstallCheck = false; - separateDebugInfo = true; - crossAttrs = { postUnpack = '' export CPATH="${bzip2.crossDrv}/include" diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 8f96a5067d1..216ce3d2336 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,5 +1,10 @@ -{ stdenv, fetchurl, pam }: +{ stdenv, fetchurl, pam, xmlsec }: +let + securityDependency = + if stdenv.isDarwin then xmlsec + else pam; +in stdenv.mkDerivation rec { name = "oath-toolkit-2.4.1"; @@ -8,11 +13,12 @@ stdenv.mkDerivation rec { sha256 = "094vbq66sn5f2dsy14hajpsfdnaivjxf70xzs91nrsq0q75l5ylv"; }; - buildInputs = [ pam ]; + + buildInputs = [ securityDependency ]; meta = { homepage = http://www.nongnu.org/oath-toolkit/; description = "Components for building one-time password authentication systems"; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 61ba63862af..18997abb678 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,34 +1,46 @@ -{ stdenv, fetchurl, iptables, python, pythonPackages }: +{ stdenv, fetchFromGitHub, makeWrapper, pandoc +, coreutils, iptables, nettools, openssh, procps, python }: +let version = "0.71"; in stdenv.mkDerivation rec { name = "sshuttle-${version}"; - version = "0.61"; - src = fetchurl { - url = "https://github.com/apenwarr/sshuttle/archive/sshuttle-0.61.tar.gz"; - sha256 = "1v2v1kbwnmx6ygzhbgqcmyafx914s2p7vjp7l0pf52sa7qkliy9b"; + src = fetchFromGitHub { + sha256 = "0yr8nih97jg6azfj3k7064lfbh3g36l6vwyjlngl4ph6mgcki1cm"; + rev = name; + repo = "sshuttle"; + owner = "sshuttle"; }; - preBuild = '' - substituteInPlace Documentation/all.do --replace "/bin/ls" "$(type -tP ls)"; - substituteInPlace Documentation/md2man.py --replace "/usr/bin/env python" "${python}/bin/python" - ''; + nativeBuildInputs = [ makeWrapper pandoc ]; + buildInputs = [ coreutils iptables nettools openssh procps python ]; - phases = "unpackPhase installPhase"; + preConfigure = '' + cd src + ''; installPhase = '' + mkdir -p $out/share/sshuttle + cp -R sshuttle *.py compat $out/share/sshuttle + mkdir -p $out/bin - cp -R . $out - ln -s $out/sshuttle $out/bin/sshuttle + ln -s $out/share/sshuttle/sshuttle $out/bin + wrapProgram $out/bin/sshuttle --prefix PATH : \ + "${stdenv.lib.concatStringsSep ":" (map (x: "${x}/bin") buildInputs)}" + + install -Dm644 sshuttle.8 $out/share/man/man8/sshuttle.8 ''; - - buildInputs = [ iptables python pythonPackages.markdown pythonPackages.beautifulsoup ]; - meta = with stdenv.lib; { - homepage = https://github.com/apenwarr/sshuttle; + inherit version; + inherit (src.meta) homepage; description = "Transparent proxy server that works as a poor man's VPN"; - maintainers = with maintainers; [ iElectric ]; + longDescription = '' + Forward connections over SSH, without requiring administrator access to the + target network (though it does require Python 2 at both ends). + Works with Linux and Mac OS and supports DNS tunneling. + ''; + maintainers = with maintainers; [ iElectric nckx ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index aa85793be18..bd7531af18f 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv -, xlibs, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib}: let bits = if stdenv.system == "x86_64-linux" then "64" @@ -10,8 +10,8 @@ let name = "tor-env"; paths = [ stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype - fontconfig gdk_pixbuf cairo xlibs.libXrender xlibs.libX11 xlibs.libXext - xlibs.libXt + fontconfig gdk_pixbuf cairo xorg.libXrender xorg.libX11 xorg.libXext + xorg.libXt ]; }; diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix new file mode 100644 index 00000000000..300fe59a97d --- /dev/null +++ b/pkgs/tools/system/iops/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "iops-${version}"; + version = "0.1"; + + src = fetchurl { + url = "http://www.vanheusden.com/iops/${name}.tgz"; + sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz"; + }; + + installPhase = '' + mkdir -p $out/bin + cp iops $out/bin + ''; + + meta = with stdenv.lib; { + description = "Measure I/O operations per second of a storage device"; + longDescription = '' + Iops lets you measure how many I/O operations per second a storage device can perform. + Usefull for determing e.g. the best RAID-setting of your storage device. + ''; + homepage = http://www.vanheusden.com/iops/; + license = licenses.gpl2; + maintainers = with maintainers; davidak; + platforms = with platforms; unix; + }; +} + diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index a0d99f2b7d7..58f6f81da31 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, attr, keyutils }: let - version = "0.04.19"; + version = "0.04.20"; name = "stress-ng-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { - sha256 = "12qgrr0wd3ppaawn5br0i7q26iy88pxfwg9wiqxf4cav89591syc"; + sha256 = "0zzlnqmld804h08iabhcrj3ggm5wiry9g2jrdr33cqp44lrw402v"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index a68ab2d01b9..408ef8ae263 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,5 +1,14 @@ -{ stdenv, fetchurl, python, libxslt, tetex -, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null }: +{ stdenv, fetchurl, python, libxslt, texlive +, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null + +, tex ? texlive.combine { # satisfy all packages that ./configure mentions + inherit (texlive) scheme-basic epstopdf anysize appendix changebar + fancybox fancyvrb float footmisc listings jknapltx/*for mathrsfs.sty*/ + multirow overpic pdfpages rotating stmaryrd subfigure titlesec wasysym + # pkgs below don't seem requested by dblatex, but our manual fails without them + ec zapfding symbol eepic times rsfs cs tex4ht courier helvetic ly1; + } +}: # NOTE: enableAllFeatures just purifies the expression, it doesn't actually # enable any extra features. @@ -12,14 +21,14 @@ assert enableAllFeatures -> ghostscript != null; stdenv.mkDerivation rec { - name = "dblatex-0.3.4"; + name = "dblatex-0.3.7"; src = fetchurl { url = "mirror://sourceforge/dblatex/${name}.tar.bz2"; - sha256 = "120w3wm07qx0k1grgdhjwm2vpwil71icshjvqznskp1f6ggch290"; + sha256 = "0bkjgrn03dy5c7438s429wnv6z5ynxkr4pbhp2z49kynskgkzkjr"; }; - buildInputs = [ python libxslt tetex ] + buildInputs = [ python libxslt tex ] ++ stdenv.lib.optionals enableAllFeatures [ imagemagick transfig ]; # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have @@ -31,11 +40,11 @@ stdenv.mkDerivation rec { sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt}/bin/xsltproc|g' \ -e 's|Popen(\["xsltproc|Popen(\["${libxslt}/bin/xsltproc|g' \ -e 's|cmd = \["texindy|cmd = ["nixpkgs_is_missing_texindy|g' \ - -e 's|cmd = "epstopdf|cmd = "${tetex}/bin/epstopdf|g' \ - -e 's|cmd = \["makeindex|cmd = ["${tetex}/bin/makeindex|g' \ - -e 's|doc.program = "pdflatex"|doc.program = "${tetex}/bin/pdflatex"|g' \ - -e 's|self.program = "latex"|self.program = "${tetex}/bin/latex"|g' \ - -e 's|Popen("pdflatex|Popen("${tetex}/bin/pdflatex|g' \ + -e 's|cmd = "epstopdf|cmd = "${tex}/bin/epstopdf|g' \ + -e 's|cmd = \["makeindex|cmd = ["${tex}/bin/makeindex|g' \ + -e 's|doc.program = "pdflatex"|doc.program = "${tex}/bin/pdflatex"|g' \ + -e 's|self.program = "latex"|self.program = "${tex}/bin/latex"|g' \ + -e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \ -e 's|"fc-match"|"${fontconfig}/bin/fc-match"|g' \ -e 's|"fc-list"|"${fontconfig}/bin/fc-list"|g' \ -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \ @@ -47,11 +56,13 @@ stdenv.mkDerivation rec { ''; buildPhase = "true"; - + installPhase = '' python ./setup.py install --prefix="$out" --use-python-path --verbose ''; + passthru = { inherit tex; }; + meta = { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; homepage = http://dblatex.sourceforge.net/; diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index ab3d49c6b11..8d6c88a0004 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { homepage = http://www.tug.org/tetex/; matintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; - hydraPlatforms = platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72e95ee9d97..a5f1f09c355 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -181,17 +181,6 @@ let path = ../..; - ### Symbolic names. - - x11 = xlibsWrapper; - - # `xlibs' is the set of X library components. This used to be the - # old modular X libraries project (called `xlibs') but now it's just - # the set of packages in the modular X.org tree (which also includes - # non-library components like the server, drivers, fonts, etc.). - xlibs = xorg // {xlibs = xlibsWrapper;}; - - ### Helper functions. inherit lib config stdenvAdapters; @@ -814,6 +803,8 @@ let ddate = callPackage ../tools/misc/ddate { }; + deis = goPackages.deis.bin // { outputs = [ "bin" ]; }; + dfilemanager = callPackage ../applications/misc/dfilemanager { }; diagrams-builder = callPackage ../tools/graphics/diagrams-builder { @@ -1585,6 +1576,8 @@ let gitfs = callPackage ../tools/filesystems/gitfs { }; + gitinspector = callPackage ../applications/version-management/gitinspector { }; + gitlab = callPackage ../applications/version-management/gitlab { ruby = ruby_2_1_3; }; @@ -1674,7 +1667,7 @@ let graphviz = callPackage ../tools/graphics/graphviz { }; graphviz-nox = callPackage ../tools/graphics/graphviz { - xlibs = null; + xorg = null; libdevil = libdevil-nox; }; @@ -1877,9 +1870,11 @@ let inetutils = callPackage ../tools/networking/inetutils { }; - innoextract = callPackage ../tools/archivers/innoextract {}; + innoextract = callPackage ../tools/archivers/innoextract { }; - ioping = callPackage ../tools/system/ioping {}; + ioping = callPackage ../tools/system/ioping { }; + + iops = callPackage ../tools/system/iops { }; iodine = callPackage ../tools/networking/iodine { }; @@ -3410,8 +3405,10 @@ let uptimed = callPackage ../tools/system/uptimed { }; urjtag = callPackage ../tools/misc/urjtag { + svfSupport = true; + bsdlSupport = true; + staplSupport = true; jedecSupport = true; - pythonBindings = true; }; urlwatch = callPackage ../tools/networking/urlwatch { }; @@ -3900,7 +3897,7 @@ let inherit zip unzip zlib boehmgc gettext pkgconfig perl; inherit gtk; inherit (gnome) libart_lgpl; - inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender + inherit (xorg) libX11 libXt libSM libICE libXtst libXi libXrender libXrandr xproto renderproto xextproto inputproto randrproto; }); @@ -4671,10 +4668,12 @@ let rustPlatform = rustStable; rustStable = recurseIntoAttrs (makeRustPlatform rustc cargo rustStable); - rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster cargo rustUnstable); + rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster + (cargo.override { rustPlatform = rustUnstableCargoPlatform; }) rustUnstable); # rust platform to build cargo itself (with cargoSnapshot) rustCargoPlatform = makeRustPlatform rustc cargoSnapshot.cargo rustCargoPlatform; + rustUnstableCargoPlatform = makeRustPlatform rustcMaster cargoSnapshot.cargo rustUnstableCargoPlatform; makeRustPlatform = rustc: cargo: self: let @@ -5520,6 +5519,8 @@ let gob2 = callPackage ../development/tools/misc/gob2 { }; + gotty = goPackages.gotty.bin // { outputs = [ "bin" ]; }; + gradle = callPackage ../development/tools/build-managers/gradle { }; gperf = callPackage ../development/tools/misc/gperf { }; @@ -6028,6 +6029,8 @@ let ctl = callPackage ../development/libraries/ctl { }; + ctpp2 = callPackage ../development/libraries/ctpp2 { }; + cpp-netlib = callPackage ../development/libraries/cpp-netlib { }; cppunit = callPackage ../development/libraries/cppunit { }; @@ -8383,11 +8386,12 @@ let xercesc = callPackage ../development/libraries/xercesc {}; + # Avoid using this. It isn't really a wrapper anymore, but we keep the name. xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper { packages = [ - freetype fontconfig xlibs.xproto xlibs.libX11 xlibs.libXt - xlibs.libXft xlibs.libXext xlibs.libSM xlibs.libICE - xlibs.xextproto + freetype fontconfig xorg.xproto xorg.libX11 xorg.libXt + xorg.libXft xorg.libXext xorg.libSM xorg.libICE + xorg.xextproto ]; }; @@ -9267,7 +9271,7 @@ let mesa = mesa_noglu; udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; - }); + } // { inherit xlibsWrapper; } ); xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { }; @@ -9581,6 +9585,8 @@ let linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; + openiscsi = callPackage ../os-specific/linux/open-iscsi { }; + # -- Linux kernel expressions ------------------------------------------------ linuxHeaders = linuxHeaders_3_12; @@ -9761,8 +9767,6 @@ let openafsClient = callPackage ../servers/openafs-client { }; - openiscsi = callPackage ../os-specific/linux/open-iscsi { }; - wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { }; kernelHeaders = callPackage ../os-specific/linux/kernel-headers { }; @@ -10751,6 +10755,8 @@ let bristol = callPackage ../applications/audio/bristol { }; + bs1770gain = callPackage ../applications/audio/bs1770gain { }; + bspwm = callPackage ../applications/window-managers/bspwm { }; bvi = callPackage ../applications/editors/bvi { }; @@ -11008,7 +11014,7 @@ let emacs24 = callPackage ../applications/editors/emacs-24 { # use override to enable additional features - libXaw = xlibs.libXaw; + libXaw = xorg.libXaw; Xaw3d = null; gconf = null; alsaLib = null; @@ -11589,7 +11595,7 @@ let inherit (gnome) gnome_python; }; - hello = callPackage ../applications/misc/hello/ex-2 { }; + hello = callPackage ../applications/misc/hello { }; helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; @@ -13126,7 +13132,7 @@ let ++ lib.optional (cfg.enableBluejeans or false) bluejeans ); libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) - (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) + (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or false) libpulseaudio; gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ]; @@ -14357,6 +14363,8 @@ let ocaml_mysql ocamlnet ulex08 camlzip ocaml_pcre; }); + metis-prover = callPackage ../applications/science/logic/metis-prover { }; + minisat = callPackage ../applications/science/logic/minisat {}; opensmt = callPackage ../applications/science/logic/opensmt { }; @@ -14910,7 +14918,7 @@ let vbam = callPackage ../misc/emulators/vbam {}; vice = callPackage ../misc/emulators/vice { - libX11 = xlibs.libX11; + libX11 = xorg.libX11; giflib = giflib_4_1; }; @@ -15047,8 +15055,12 @@ let mg = callPackage ../applications/editors/mg { }; +}; # self_ = - # Attributes for backward compatibility. + + ### Deprecated aliases - for backward compatibility + +aliases = with self; rec { adobeReader = adobe-reader; arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 @@ -15076,8 +15088,17 @@ let rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 + x11 = xlibsWrapper; # added 2015-09 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 + xlibs = xorg; # added 2015-09 youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 youtubeDL = youtube-dl; # added 2014-10-26 +}; + +tweakAlias = _n: alias: with lib; + if alias.recurseForDerivations or false then + removeAttrs alias ["recurseForDerivations"] + else alias; + +in lib.mapAttrs tweakAlias aliases // self; in pkgs -}; in self; in pkgs diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 6264a6fb4fa..056d8d8fb3f 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -490,6 +490,20 @@ let }; }; + deis = buildFromGitHub { + rev = "v1.10.0"; + owner = "deis"; + repo = "deis"; + sha256 = "0qji0dcfqgvjrfn5fjagjib606n24iy9qank2ckh202s75rxx5w9"; + subPackages = [ "client" ]; + buildInputs = [ docopt-go crypto yaml-v2 ]; + postInstall = '' + if [ -f "$bin/bin/client" ]; then + mv "$bin/bin/client" "$bin/bin/deis" + fi + ''; + }; + dns = buildFromGitHub { rev = "e59f851c912767b1db587dcabee6e6652e495c75"; date = "2015-07-22"; @@ -796,6 +810,22 @@ let sha256 = "0yg1jpr7lcaqh6i8n9wbs9r128kk541qjv06r9a6fp9vj56rqr3m"; }; + gotty = buildFromGitHub { + rev = "v0.0.10"; + owner = "yudai"; + repo = "gotty"; + sha256 = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09"; + + buildInputs = [ cli-go go manners go-bindata-assetfs go-multierror structs websocket hcl pty ]; + + meta = with stdenv.lib; { + description = "Share your terminal as a web application"; + homepage = "https://github.com/yudai/gotty"; + maintainers = with maintainers; [ matthiasbeyer ]; + license = licenses.mit; + }; + }; + govers = buildFromGitHub { rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9"; date = "2015-01-09"; @@ -989,6 +1019,22 @@ let }; }; + go-bindata-assetfs = buildFromGitHub { + rev = "d5cac425555ca5cf00694df246e04f05e6a55150"; + owner = "elazarl"; + repo = "go-bindata-assetfs"; + sha256 = "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17"; + + date = "2015-08-13"; + + meta = with stdenv.lib; { + description = "Serves embedded files from jteeuwen/go-bindata with net/http"; + homepage = "https://github.com/elazarl/go-bindata-assetfs"; + maintainers = with maintainers; [ matthiasbeyer ]; + license = licenses.bsd2; + }; + }; + pmylund.go-cache = buildGoPackage rec { rev = "93d85800f2fa6bd0a739e7bd612bfa3bc008b72d"; name = "go-cache-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1676,6 +1722,20 @@ let ''; }; + manners = buildFromGitHub { + rev = "0.4.0"; + owner = "braintree"; + repo = "manners"; + sha256 = "07985pbfhwlhbglr9zwh2wx8kkp0wzqr1lf0xbbxbhga4hn9q3ak"; + + meta = with stdenv.lib; { + description = "A polite Go HTTP server that shuts down gracefully"; + homepage = "https://github.com/braintree/manners"; + maintainers = with maintainers; [ matthiasbeyer ]; + license = licenses.mit; + }; + }; + mapstructure = buildFromGitHub { rev = "281073eb9eb092240d33ef253c404f1cca550309"; owner = "mitchellh"; @@ -2745,8 +2805,9 @@ let sha256 = "1l7nw00pazp317n5nprrxwhcq56kdblc774lsznxmbb30xcp8nmf"; }; - syncthing = buildFromGitHub { - rev = "v0.11.25"; + syncthing = buildFromGitHub rec { + version = "0.11.25"; + rev = "v${version}"; owner = "syncthing"; repo = "syncthing"; sha256 = "17phkj0dxzc1j755ddpf15rq34yp52pw2lx9kpg7gyc9qp0pzacl"; @@ -2755,6 +2816,10 @@ let go-lz4 du luhn xdr snappy ratelimit osext syncthing-protocol relaysrv goleveldb suture qart crypto net text ]; + postPatch = '' + # Mostly a costmetic change + sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go + ''; }; syncthing-lib = buildFromGitHub { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6140137accb..f84cccb898c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -311,5 +311,9 @@ rec { packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.5.nix { }; }; + lts-3_6 = packages.ghc7102.override { + packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.6.nix { }; + }; + }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d73f8210941..83258a70df3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3739,10 +3739,10 @@ let self = _self // overrides; _self = with self; { }; EmailAddress = buildPerlPackage { - name = "Email-Address-1.901"; + name = "Email-Address-1.908"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.901.tar.gz; - sha256 = "00svsmv2hk35ybpd7jxcsn7k54i0q9ph5lf8ksv9nkh1abraprkz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.908.tar.gz; + sha256 = "0i6ljdvpy279hpbqf6lgv4figr376rb2sh4yphj86xkdzsyn1y75"; }; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; @@ -4767,7 +4767,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype - pkgs.libpng pkgs.fontconfig pkgs.xlibs.libXpm GetoptLong ]; + pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm GetoptLong ]; # Patch needed to get arguments past the first GetOptions call # and to specify libfontconfig search path. @@ -4777,7 +4777,7 @@ let self = _self // overrides; _self = with self; { # tests fail doCheck = false; - makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xlibs.libXpm}"; + makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xorg.libXpm}"; }; GDSecurityImage = buildPerlPackage { @@ -5621,10 +5621,10 @@ let self = _self // overrides; _self = with self; { }; IOSocketSSL = buildPerlPackage { - name = "IO-Socket-SSL-2.016"; + name = "IO-Socket-SSL-2.020"; src = fetchurl { - url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.016.tar.gz; - sha256 = "0hgyggdbw16nm85fds48m79lxy5318panqhpkh7r192jq6rnhqlk"; + url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.020.tar.gz; + sha256 = "1nqjwnyd8iy0whisa352a97ihxw2zc78cmbxa0ccs4547bljr3js"; }; propagatedBuildInputs = [ URI NetSSLeay ]; meta = { @@ -8376,7 +8376,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0k2k8zg84qj1ry77i9dvmfdfpg13s6117wy5bc4nvnzv37qcvy32"; }; - buildInputs = with pkgs; [ mesa mesa_glu freeglut xlibs.libX11 xlibs.libXi xlibs.libXmu xlibs.libXext xdummy ]; + buildInputs = with pkgs; [ mesa mesa_glu freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ]; patches = [ ../development/perl-modules/perl-opengl.patch ]; @@ -11876,8 +11876,8 @@ let self = _self // overrides; _self = with self; { url = "http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/${name}.tar.gz"; sha256 = "10fsvyr56gm59chc8b70n6bvhd3lh9c05sp8m4arcahid0rpgbwa"; }; - makeMakerFlags = "X11LIB=${pkgs.xlibs.libX11}/lib"; - buildInputs = with pkgs; [ xlibs.libX11 libpng ]; + makeMakerFlags = "X11LIB=${pkgs.xorg.libX11}/lib"; + buildInputs = with pkgs; [ xorg.libX11 libpng ]; configurePhase = '' perl Makefile.PL PREFIX=$out $makeMakerFlags ''; @@ -12302,9 +12302,9 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/A/AW/AWENDT/${name}.tar.gz"; sha256 = "0j27cb9yy9ymni8cbiyxplbg086b8lv6b330nwqyx0briq3xrzfq"; }; - buildInputs = [ pkgs.xlibs.libXext pkgs.xlibs.libXScrnSaver pkgs.xlibs.libX11 ]; + buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ]; propagatedBuildInputs = [ InlineC ]; - patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xlibs.libX11}/lib/ -L${pkgs.xlibs.libXext}/lib/ -L${pkgs.xlibs.libXScrnSaver}/lib/,' IdleTime.pm''; + patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; meta = { description = "Get the idle time of X11"; }; @@ -12316,7 +12316,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SM/SMCCAM/${name}.tar.gz"; sha256 = "1dq89bh6fqv7l5mbffqcismcljpq5f869bx7g8lg698zgindv5ny"; }; - buildInputs = [pkgs.x11]; + buildInputs = [pkgs.xlibsWrapper]; NIX_CFLAGS_LINK = "-lX11"; doCheck = false; # requires an X server }; @@ -12327,7 +12327,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/C/CT/CTRONDLP/${name}.tar.gz"; sha256 = "0jznws68skdzkhgkgcgjlj40qdyh9i75r7fw8bqzy406f19xxvnw"; }; - buildInputs = [pkgs.x11 pkgs.xorg.libXtst pkgs.xorg.libXi]; + buildInputs = [pkgs.xlibsWrapper pkgs.xorg.libXtst pkgs.xorg.libXi]; NIX_CFLAGS_LINK = "-lX11 -lXext -lXtst"; doCheck = false; # requires an X server }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b08a4f3a6f2..b9e99efb3f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7979,7 +7979,7 @@ let md5 = "f93d8462ff7646397a9f77a2fe602d17"; }; - buildInputs = with self; [ pkgs.swig pkgs.openssl ]; + buildInputs = with self; [ pkgs.swig2 pkgs.openssl ]; preBuild = "${python}/bin/${python.executable} setup.py build_ext --openssl=${pkgs.openssl}"; @@ -9397,6 +9397,24 @@ let }; }); + numpydoc = buildPythonPackage rec { + name = "numpydoc-${version}"; + version = "0.5"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/numpydoc/${name}.tar.gz"; + sha256 = "0d4dnifaxkll50jx6czj05y8cb4ny60njd2wz299sj2jxfy51w4k"; + }; + + buildInputs = [ self.nose ]; + propagatedBuildInputs = [ self.sphinx self.matplotlib ]; + + meta = { + description = "Sphinx extension to support docstrings in Numpy format"; + homepage = "https://github.com/numpy/numpydoc"; + license = licenses.free; + }; + }; nwdiag = buildPythonPackage rec { name = "nwdiag-1.0.3"; @@ -10405,7 +10423,7 @@ let buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl nose ] ++ optionals (isPy26 || isPy27 || isPy33 || isPyPy) [ pkgs.lcms2 ] - ++ optionals (isPyPy) [ pkgs.tk pkgs.xlibs.libX11 ]; + ++ optionals (isPyPy) [ pkgs.tk pkgs.xorg.libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. preConfigure = '' @@ -11335,7 +11353,7 @@ let }; patchPhase = let - libs = [ pkgs.mesa pkgs.xlibs.libX11 pkgs.freetype pkgs.fontconfig ]; + libs = [ pkgs.mesa pkgs.xorg.libX11 pkgs.freetype pkgs.fontconfig ]; paths = concatStringsSep "," (map (l: "\"${l}/lib\"") libs); in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py"; @@ -12251,12 +12269,12 @@ let }); - pysvn = pkgs.stdenv.mkDerivation { - name = "pysvn-1.7.8"; + pysvn = pkgs.stdenv.mkDerivation rec { + name = "pysvn-1.8.0"; src = pkgs.fetchurl { - url = "http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.8.tar.gz"; - sha256 = "1qk7af0laby1f79bd07l9p0dxn5xmcmfwlcb9l1hk29zwwq6x4v0"; + url = "http://pysvn.barrys-emacs.org/source_kits/${name}.tar.gz"; + sha256 = "0srjr2qgxfs69p65d9vvdib2lc142x10w8afbbdrqs7dhi46yn9r"; }; buildInputs = with self; [ python pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ] @@ -12411,6 +12429,43 @@ let }; }); + PyXAPI = stdenv.mkDerivation rec { + name = "PyXAPI-0.1"; + + src = pkgs.fetchurl { + url = "http://www.pps.univ-paris-diderot.fr/~ylg/PyXAPI/${name}.tar.gz"; + sha256 = "19lblwfq24bgsgfy7hhqkxdf4bxl40chcxdlpma7a0wfa0ngbn26"; + }; + + buildInputs = [ self.python ]; + + installPhase = '' + mkdir -p "$out/lib/${python.libPrefix}/site-packages" + + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --prefix="$out" + ''; + + meta = with stdenv.lib; { + description = "Python socket module extension & RFC3542 IPv6 Advanced Sockets API"; + longDescription = '' + PyXAPI consists of two modules: `socket_ext' and `rfc3542'. + `socket_ext' extends the Python module `socket'. `socket' objects have + two new methods: `recvmsg' and `sendmsg'. It defines `ancillary data' + objects and some functions related to. `socket_ext' module also provides + functions to manage interfaces indexes defined in RFC3494 and not + available from standard Python module `socket'. + `rfc3542' is a full implementation of RFC3542 (Advanced Sockets + Application Program Interface (API) for IPv6). + ''; + homepage = http://www.pps.univ-paris-diderot.fr/~ylg/PyXAPI/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ nckx ]; + }; + }; pyxattr = buildPythonPackage (rec { name = "pyxattr-0.5.1"; @@ -13345,7 +13400,7 @@ let sha256 = "0l70pqwg88imbylcd831vg8nj8ipy4zr331f6qjccss7vn56i2h5"; }; - buildInputs = with self; [pkgs.xlibs.libX11]; + buildInputs = with self; [pkgs.xorg.libX11]; # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some # absolute paths. Replaced by relative path so it is found when used in nix. @@ -13359,7 +13414,7 @@ let patchPhase = '' cp "${x_ignore_nofocus}/cpp/linux-specific/"* . - substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xlibs.libX11}/lib/libX11.so.6" + substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xorg.libX11}/lib/libX11.so.6" gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o gcc -shared \ -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ @@ -13946,7 +14001,7 @@ let # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = with self; [ pkgs.xlibs.libX11 pkgs.pythonDBus pygobject ]; + propagatedBuildInputs = with self; [ pkgs.xorg.libX11 pkgs.pythonDBus pygobject ]; meta = { description = "High-level, platform independent Skype API wrapper for Python"; @@ -14573,7 +14628,7 @@ let # I don't know why I need to add these libraries. Shouldn't they # be part of wxPython? postInstall = '' - libspaths=${pkgs.xlibs.libSM}/lib:${pkgs.xlibs.libXScrnSaver}/lib + libspaths=${pkgs.xorg.libSM}/lib:${pkgs.xorg.libXScrnSaver}/lib wrapProgram $out/bin/taskcoach.py \ --prefix LD_LIBRARY_PATH : $libspaths ''; @@ -15716,7 +15771,7 @@ let # Tests require `pyutil' so disable them to avoid circular references. doCheck = false; - propagatedBuildInputs = with self; [ pkgs.xlibs.libX11 ]; + propagatedBuildInputs = with self; [ pkgs.xorg.libX11 ]; meta = { description = "Fully functional X client library for Python programs"; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 7c3f516c494..4978c2e41b0 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -158,7 +158,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; sysvtools = linux; tcl = linux; tcpdump = linux; - tetex = linux; texLive = linux; texLiveBeamer = linux; texLiveExtra = linux;